Add support for FFmpeg 7.0 (zmwangx#178)

* FFmpeg 7.0 support

* Update CI

* Add ability to open decoder when `new_with_codec` was used

* Add ability to open audio decoder when `new_with_codec` was used

Author: AdrianEddy

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     container: jrottenberg/ffmpeg:${{ matrix.ffmpeg_version }}-ubuntu
     strategy:
       matrix:
-        ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1", "6.0"]
+        ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1", "6.0", "6.1"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -106,22 +106,23 @@ jobs:
       - name: Check format
         run: |
           cargo fmt -- --check
-  # Added only because there is no ffmpeg6.1 docker image here yet
+  # Added only because there is no ffmpeg7.0 docker image here yet
   # https://github.com/jrottenberg/ffmpeg
-  build-test-lint-latest:
-    name: FFmpeg Latest - build, test and lint
+  build-test-lint-7-0:
+    name: FFmpeg 7.0 - build, test and lint
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+    env:
+      FFMPEG_DIR: /home/runner/work/rust-ffmpeg/rust-ffmpeg/ffmpeg-7.0-linux-clang-default
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
         run: |
           sudo apt update
-          sudo apt install -y software-properties-common
-          sudo add-apt-repository ppa:ubuntuhandbook1/ffmpeg6
-          sudo apt update
-          sudo apt install -y --no-install-recommends clang curl pkg-config ffmpeg libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libavfilter-dev libavdevice-dev libswresample-dev
+          sudo apt install -y --no-install-recommends clang curl pkg-config xz-utils libxv-dev
+          curl -L https://sourceforge.net/projects/avbuild/files/linux/ffmpeg-7.0-linux-clang-default.tar.xz/download -o ffmpeg.tar.xz
+          tar -xf ffmpeg.tar.xz
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name    = "ffmpeg-next"
-version = "6.1.1"
+version = "7.0.0"
 build   = "build.rs"
 
 authors = ["meh. <[email protected]>", "Zhiming Wang <[email protected]>"]
@@ -106,12 +106,12 @@ rpi = []
 
 [dependencies]
 libc     = "0.2"
-bitflags = "1.2"
+bitflags = "2.5"
 
 [dependencies.image]
-version  = "0.23"
+version  = "0.25"
 optional = true
 
 [dependencies.ffmpeg-sys-next]
-version = "6.1.0"
+version = "7.0.0"
 default-features = false

examples/transcode-audio.rs

@@ -99,7 +99,10 @@ fn transcoder<P: AsRef<Path> + ?Sized>(
 
     encoder.set_rate(decoder.rate() as i32);
     encoder.set_channel_layout(channel_layout);
-    encoder.set_channels(channel_layout.channels());
+    #[cfg(not(feature = "ffmpeg_7_0"))]
+    {
+        encoder.set_channels(channel_layout.channels());
+    }
     encoder.set_format(
         codec
             .formats()

src/codec/audio.rs

@@ -38,12 +38,16 @@ impl Audio {
 
     pub fn channel_layouts(&self) -> Option<ChannelLayoutIter> {
         unsafe {
-            if (*self.codec.as_ptr()).channel_layouts.is_null() {
+            #[cfg(not(feature = "ffmpeg_7_0"))]
+            let ptr = (*self.codec.as_ptr()).channel_layouts;
+
+            #[cfg(feature = "ffmpeg_7_0")]
+            let ptr = (*self.codec.as_ptr()).ch_layouts;
+
+            if ptr.is_null() {
                 None
             } else {
-                Some(ChannelLayoutIter::new(
-                    (*self.codec.as_ptr()).channel_layouts,
-                ))
+                Some(ChannelLayoutIter::new(ptr))
             }
         }
     }
@@ -111,18 +115,23 @@ impl Iterator for FormatIter {
     }
 }
 
+#[cfg(not(feature = "ffmpeg_7_0"))]
+type ChannelLayoutType = u64;
+#[cfg(feature = "ffmpeg_7_0")]
+type ChannelLayoutType = AVChannelLayout;
+
 pub struct ChannelLayoutIter {
-    ptr: *const u64,
+    ptr: *const ChannelLayoutType,
 }
 
 impl ChannelLayoutIter {
-    pub fn new(ptr: *const u64) -> Self {
+    pub fn new(ptr: *const ChannelLayoutType) -> Self {
         ChannelLayoutIter { ptr }
     }
 
     pub fn best(self, max: i32) -> ChannelLayout {
         self.fold(ChannelLayout::MONO, |acc, cur| {
-            if cur.channels() > acc.channels() && cur.channels() <= max {
+            if cur.channels() > acc.channels() && cur.channels() <= max as _ {
                 cur
             } else {
                 acc
@@ -136,11 +145,22 @@ impl Iterator for ChannelLayoutIter {
 
     fn next(&mut self) -> Option<<Self as Iterator>::Item> {
         unsafe {
+            #[cfg(not(feature = "ffmpeg_7_0"))]
             if *self.ptr == 0 {
                 return None;
             }
 
+            #[cfg(feature = "ffmpeg_7_0")]
+            if self.ptr.is_null() || (*self.ptr).u.mask == 0 {
+                return None;
+            }
+
+            #[cfg(not(feature = "ffmpeg_7_0"))]
             let layout = ChannelLayout::from_bits_truncate(*self.ptr);
+
+            #[cfg(feature = "ffmpeg_7_0")]
+            let layout = ChannelLayout::from(*self.ptr);
+
             self.ptr = self.ptr.offset(1);
 
             Some(layout)

src/codec/capabilities.rs

@@ -2,6 +2,7 @@ use ffi::*;
 use libc::c_uint;
 
 bitflags! {
+    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
     pub struct Capabilities: c_uint {
         const DRAW_HORIZ_BAND     = AV_CODEC_CAP_DRAW_HORIZ_BAND;
         const DR1                 = AV_CODEC_CAP_DR1;

src/codec/debug.rs

@@ -2,6 +2,7 @@ use ffi::*;
 use libc::c_int;
 
 bitflags! {
+    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
     pub struct Debug: c_int {
         const PICT_INFO   = FF_DEBUG_PICT_INFO;
         const RC          = FF_DEBUG_RC;

src/codec/decoder/audio.rs

@@ -48,7 +48,15 @@ impl Audio {
     }
 
     pub fn channels(&self) -> u16 {
-        unsafe { (*self.as_ptr()).channels as u16 }
+        #[cfg(not(feature = "ffmpeg_7_0"))]
+        unsafe {
+            (*self.as_ptr()).channels as u16
+        }
+
+        #[cfg(feature = "ffmpeg_7_0")]
+        {
+            self.channel_layout().channels() as u16
+        }
     }
 
     pub fn format(&self) -> format::Sample {
@@ -62,23 +70,48 @@ impl Audio {
     }
 
     pub fn frames(&self) -> usize {
-        unsafe { (*self.as_ptr()).frame_number as usize }
+        #[cfg(not(feature = "ffmpeg_7_0"))]
+        unsafe {
+            (*self.as_ptr()).frame_number as usize
+        }
+
+        #[cfg(feature = "ffmpeg_7_0")]
+        unsafe {
+            (*self.as_ptr()).frame_num as usize
+        }
     }
 
     pub fn align(&self) -> usize {
         unsafe { (*self.as_ptr()).block_align as usize }
     }
 
     pub fn channel_layout(&self) -> ChannelLayout {
-        unsafe { ChannelLayout::from_bits_truncate((*self.as_ptr()).channel_layout) }
+        #[cfg(not(feature = "ffmpeg_7_0"))]
+        unsafe {
+            ChannelLayout::from_bits_truncate((*self.as_ptr()).channel_layout)
+        }
+
+        #[cfg(feature = "ffmpeg_7_0")]
+        unsafe {
+            ChannelLayout::from((*self.as_ptr()).ch_layout)
+        }
     }
 
     pub fn set_channel_layout(&mut self, value: ChannelLayout) {
         unsafe {
-            (*self.as_mut_ptr()).channel_layout = value.bits();
+            #[cfg(not(feature = "ffmpeg_7_0"))]
+            {
+                (*self.as_mut_ptr()).channel_layout = value.bits();
+            }
+
+            #[cfg(feature = "ffmpeg_7_0")]
+            {
+                (*self.as_mut_ptr()).ch_layout = value.into();
+            }
         }
     }
 
+    #[cfg(not(feature = "ffmpeg_7_0"))]
     pub fn request_channel_layout(&mut self, value: ChannelLayout) {
         unsafe {
             (*self.as_mut_ptr()).request_channel_layout = value.bits();

src/codec/decoder/check.rs

@@ -2,6 +2,7 @@ use ffi::*;
 use libc::c_int;
 
 bitflags! {
+    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
     pub struct Check: c_int {
         const CRC      = AV_EF_CRCCHECK;
         const BISTREAM = AV_EF_BITSTREAM;

src/codec/decoder/conceal.rs

@@ -2,6 +2,7 @@ use ffi::*;
 use libc::c_int;
 
 bitflags! {
+    #[derive(Copy, Clone, Debug, PartialEq, Eq)]
     pub struct Conceal: c_int {
         const GUESS_MVS   = FF_EC_GUESS_MVS;
         const DEBLOCK     = FF_EC_DEBLOCK;

src/codec/decoder/decoder.rs

@@ -54,15 +54,19 @@ impl Decoder {
     }
 
     pub fn video(self) -> Result<Video, Error> {
-        if let Some(codec) = super::find(self.id()) {
+        if let Some(codec) = self.codec() {
+            self.open_as(codec).and_then(|o| o.video())
+        } else if let Some(codec) = super::find(self.id()) {
             self.open_as(codec).and_then(|o| o.video())
         } else {
             Err(Error::DecoderNotFound)
         }
     }
 
     pub fn audio(self) -> Result<Audio, Error> {
-        if let Some(codec) = super::find(self.id()) {
+        if let Some(codec) = self.codec() {
+            self.open_as(codec).and_then(|o| o.audio())
+        } else if let Some(codec) = super::find(self.id()) {
             self.open_as(codec).and_then(|o| o.audio())
         } else {
             Err(Error::DecoderNotFound)