Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

video/external: Bump OpenH264 to 2.5.0 #18581

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
video/external: Arc<OpenH264> -> Rc<OpenH264>
There's no multithreaded access to this anyway.
torokati44 committed Jan 15, 2025

Verified

This commit was signed with the committer’s verified signature.
AndyScherzinger Andy Scherzinger
commit 2d755560dd75454d927ea108c9bca959bc850e6d
8 changes: 4 additions & 4 deletions video/external/src/decoder/openh264.rs
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ use std::fs::File;
use std::io::copy;
use std::path::{Path, PathBuf};
use std::ptr;
use std::sync::Arc;
use std::rc::Rc;

use crate::decoder::openh264_sys::{self, videoFormatI420, ISVCDecoder, OpenH264};
use crate::decoder::VideoDecoder;
@@ -39,7 +39,7 @@ pub enum OpenH264Error {

/// OpenH264 codec representation.
pub struct OpenH264Codec {
openh264: Arc<OpenH264>,
openh264: Rc<OpenH264>,
}

impl OpenH264Codec {
@@ -163,7 +163,7 @@ impl OpenH264Codec {
}

Ok(Self {
openh264: Arc::new(openh264),
openh264: Rc::new(openh264),
})
}

@@ -197,7 +197,7 @@ pub struct H264Decoder {
/// How many bytes are used to store the length of the NALU (1, 2, 3, or 4).
length_size: u8,

openh264: Arc<OpenH264>,
openh264: Rc<OpenH264>,
decoder: *mut ISVCDecoder,
}