Skip to content

Commit 3f2fc7d

Browse files
committed
video/external: Bump OpenH264 data to 2.5.0
1 parent 520e7bd commit 3f2fc7d

File tree

3 files changed

+67
-209
lines changed

3 files changed

+67
-209
lines changed

video/external/src/decoder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
// cargo install bindgen-cli
12
// bindgen ../openh264/codec/api/wels/codec_api.h --no-prepend-enum-name \
2-
// --dynamic-loading OpenH264 -o openh264_sys.rs
3+
// --no-layout-tests --dynamic-loading OpenH264 -o openh264_sys.rs
34
#[cfg(feature = "openh264")]
45
#[allow(non_upper_case_globals)]
56
#[allow(non_camel_case_types)]

video/external/src/decoder/openh264.rs

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,52 +43,56 @@ pub struct OpenH264Codec {
4343
}
4444

4545
impl OpenH264Codec {
46-
const VERSION: OpenH264Version = OpenH264Version(2, 4, 1);
46+
const VERSION: OpenH264Version = OpenH264Version(2, 5, 0);
4747

4848
/// Returns the OpenH264 library data for the current platform.
4949
fn get_data() -> Result<OpenH264Data, Box<dyn std::error::Error>> {
5050
const OS: &str = std::env::consts::OS;
5151
const ARCH: &str = std::env::consts::ARCH;
5252

5353
let local_filenames = match OS {
54-
"linux" => vec!["libopenh264.so.7", "libopenh264.so.2.4.1", "libopenh264.so"],
54+
"linux" => vec!["libopenh264.so.7", "libopenh264.so.2.5.0", "libopenh264.so"],
5555
// TODO: investigate other OSes
5656
_ => vec![],
5757
};
5858

59-
// Source: https://github.com/cisco/openh264/releases/tag/v2.4.1
59+
// Source: https://github.com/cisco/openh264/releases/tag/v2.5.0
6060
let (download_filename, download_sha256) = match (OS, ARCH) {
6161
("linux", "x86") => (
62-
"libopenh264-2.4.1-linux32.7.so",
63-
"b7cf0e407f99056d90cbf62787a34820a7595b2129b165319d50766e00a66704",
62+
"libopenh264-2.5.0-linux32.7.so",
63+
"cfa8fcf711114fd174c7e377979bb88a4ef330c8ae6da1b9275f87c5146ba789",
6464
),
6565
("linux", "x86_64") => (
66-
"libopenh264-2.4.1-linux64.7.so",
67-
"1392d21466bc638e68151b716d5b2086d54cd812afd43253f1adb5b6e0185f51",
66+
"libopenh264-2.5.0-linux64.7.so",
67+
"e17f533b41dae28682e118273e368d4c11bff945207a22363188102c28877b3d",
6868
),
6969
("linux", "arm") => (
70-
"libopenh264-2.4.1-linux-arm.7.so",
71-
"fd1dfb27d30bb72e903c9d2b4c650104a4369d2e7ffe8a4a533e8db2e7e9b19e",
70+
"libopenh264-2.5.0-linux-arm.7.so",
71+
"0eb4ef9f3c8c7c1959c1731ce3fd13e43b542c14fdd163154bb92d1836c179ae",
7272
),
7373
("linux", "aarch64") => (
74-
"libopenh264-2.4.1-linux-arm64.7.so",
75-
"e8ea7e42855ceb4a90e7bd0b3abeba0c58b5f97166e8b0a30eefd58e099557a4",
74+
"libopenh264-2.5.0-linux-arm64.7.so",
75+
"a3561cbd04889f38ba82b6f4e4a226f00063863c263bd4ae13e1398b5ca9df80",
7676
),
7777
("macos", "x86_64") => (
78-
"libopenh264-2.4.1-mac-x64.dylib",
79-
"cc0ba518a63791c37571f3c851f0aa03a4fbda5410acc214ecd4f24f8d1c478e",
78+
"libopenh264-2.5.0-mac-x64.dylib",
79+
"83af03a9d9bc816fdced1ecb2aa775416890fe8154c0ef4897da2af1a5af3eab",
8080
),
8181
("macos", "aarch64") => (
82-
"libopenh264-2.4.1-mac-arm64.dylib",
83-
"213ff93831cfa3dd6d7ad0c3a3403a6ceedf4ac1341e1278b5b869d42fefb496",
82+
"libopenh264-2.5.0-mac-arm64.dylib",
83+
"784f1b95d88b1904ceb6d6b2c18f93d250ab6479e62b84c4f79a67d7d6db6ad9",
8484
),
8585
("windows", "x86") => (
86-
"openh264-2.4.1-win32.dll",
87-
"83270149640469c994a62cc32a6d8c0413cd7b802b7f1f2f532159f5bdc1cedd",
86+
"openh264-2.5.0-win32.dll",
87+
"2824a4fbfc4640c2cd94aa208f78aac16304bd49e83529d0fb106a87b165f89a",
8888
),
8989
("windows", "x86_64") => (
90-
"openh264-2.4.1-win64.dll",
91-
"081b0c081480d177cbfddfbc90b1613640e702f875897b30d8de195cde73dd34",
90+
"openh264-2.5.0-win64.dll",
91+
"bf91c488638b32448f7d89611f6bb9c232dce82975d7d2827c78f78fc2a7fb2b",
92+
),
93+
("windows", "aarch64") => (
94+
"openh264-2.5.0-win-arm64.dll",
95+
"6d046ac2f85082fdfebdc54bc53c9c4ff7add4e9383ea52aa0e05b6a0b380b64",
9296
),
9397
(os, arch) => return Err(format!("Unsupported OS/arch: {}/{}", os, arch).into()),
9498
};

0 commit comments

Comments
 (0)