Update to FFmpeg 7.1 (#213)

AdrianEddy · web-flow · commit a7b50dd5f909 · 2024-09-29T20:19:25.000+02:00
* Prepare for ffmpeg 7.1

* Add LCEVC

* Add LCEVC

* Update for 7.1

* Update versions
diff --git a/.github/workflows/build.yml b/.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", "6.1"]
+        ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1", "6.0", "6.1", "7.0"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -106,22 +106,22 @@ jobs:
       - name: Check format
         run: |
           cargo fmt -- --check
-  # Added only because there is no ffmpeg7.0 docker image here yet
+  # Added only because there is no ffmpeg7.1 docker image here yet
   # https://github.com/jrottenberg/ffmpeg
-  build-test-lint-7-0:
-    name: FFmpeg 7.0 - build, test and lint
+  build-test-lint-7-1:
+    name: FFmpeg 7.1 - 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
+      FFMPEG_DIR: /home/runner/work/rust-ffmpeg/rust-ffmpeg/ffmpeg-7.1-linux-clang-default
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
         run: |
           sudo apt update
           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
+          curl -L https://sourceforge.net/projects/avbuild/files/linux/ffmpeg-7.1-linux-clang-default.tar.xz/download -o ffmpeg.tar.xz
           tar -xf ffmpeg.tar.xz
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name    = "ffmpeg-next"
-version = "7.0.4"
+version = "7.1.0"
 build   = "build.rs"
 
 authors = ["meh. <meh@schizofreni.co>", "Zhiming Wang <i@zhimingwang.org>"]
@@ -27,6 +27,7 @@ ffmpeg41 = []
 ffmpeg4 = []
 
 static = ["ffmpeg-sys-next/static"]
+non-exhaustive-enums = ["ffmpeg-sys-next/non-exhaustive-enums"]
 build  = ["static", "ffmpeg-sys-next/build"]
 
 # licensing
@@ -106,12 +107,12 @@ rpi = []
 
 [dependencies]
 libc     = "0.2"
-bitflags = "2.5"
+bitflags = "2.6"
 
 [dependencies.image]
 version  = "0.25"
 optional = true
 
 [dependencies.ffmpeg-sys-next]
-version = "7.0.2"
+version = "7.1.0"
 default-features = false
diff --git a/src/codec/id.rs b/src/codec/id.rs
@@ -665,6 +665,11 @@ pub enum Id {
     QOA,
     #[cfg(feature = "ffmpeg_7_0")]
     LEAD,
+
+    #[cfg(feature = "ffmpeg_7_1")]
+    LC3,
+    #[cfg(feature = "ffmpeg_7_1")]
+    LCEVC,
 }
 
 impl Id {
@@ -1337,6 +1342,11 @@ impl From<AVCodecID> for Id {
             AV_CODEC_ID_QOA => Id::QOA,
             #[cfg(feature = "ffmpeg_7_0")]
             AV_CODEC_ID_LEAD => Id::LEAD,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            AV_CODEC_ID_LC3 => Id::LC3,
+            #[cfg(feature = "ffmpeg_7_1")]
+            AV_CODEC_ID_LCEVC => Id::LCEVC,
         }
     }
 }
@@ -2001,6 +2011,11 @@ impl From<Id> for AVCodecID {
             Id::QOA => AV_CODEC_ID_QOA,
             #[cfg(feature = "ffmpeg_7_0")]
             Id::LEAD => AV_CODEC_ID_LEAD,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            Id::LC3 => AV_CODEC_ID_LC3,
+            #[cfg(feature = "ffmpeg_7_1")]
+            Id::LCEVC => AV_CODEC_ID_LCEVC,
         }
     }
 }
diff --git a/src/codec/packet/side_data.rs b/src/codec/packet/side_data.rs
@@ -63,6 +63,11 @@ pub enum Type {
     IAMF_RECON_GAIN_INFO_PARAM,
     #[cfg(feature = "ffmpeg_7_0")]
     AMBIENT_VIEWING_ENVIRONMENT,
+
+    #[cfg(feature = "ffmpeg_7_1")]
+    FRAME_CROPPING,
+    #[cfg(feature = "ffmpeg_7_1")]
+    LCEVC,
 }
 
 impl From<AVPacketSideDataType> for Type {
@@ -124,6 +129,11 @@ impl From<AVPacketSideDataType> for Type {
             AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM => Type::IAMF_RECON_GAIN_INFO_PARAM,
             #[cfg(feature = "ffmpeg_7_0")]
             AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT => Type::AMBIENT_VIEWING_ENVIRONMENT,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            AV_PKT_DATA_FRAME_CROPPING => Type::FRAME_CROPPING,
+            #[cfg(feature = "ffmpeg_7_1")]
+            AV_PKT_DATA_LCEVC => Type::LCEVC,
         }
     }
 }
@@ -187,6 +197,11 @@ impl From<Type> for AVPacketSideDataType {
             Type::IAMF_RECON_GAIN_INFO_PARAM => AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM,
             #[cfg(feature = "ffmpeg_7_0")]
             Type::AMBIENT_VIEWING_ENVIRONMENT => AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            Type::FRAME_CROPPING => AV_PKT_DATA_FRAME_CROPPING,
+            #[cfg(feature = "ffmpeg_7_1")]
+            Type::LCEVC => AV_PKT_DATA_LCEVC,
         }
     }
 }
diff --git a/src/format/stream/disposition.rs b/src/format/stream/disposition.rs
@@ -18,5 +18,7 @@ bitflags! {
         const CAPTIONS         = AV_DISPOSITION_CAPTIONS;
         const DESCRIPTIONS     = AV_DISPOSITION_DESCRIPTIONS;
         const METADATA         = AV_DISPOSITION_METADATA;
+        #[cfg(feature = "ffmpeg_7_1")]
+        const MULTILAYER       = AV_DISPOSITION_MULTILAYER;
     }
 }
diff --git a/src/util/color/space.rs b/src/util/color/space.rs
@@ -22,6 +22,13 @@ pub enum Space {
     ChromaDerivedNCL,
     ChromaDerivedCL,
     ICTCP,
+
+    #[cfg(feature = "ffmpeg_7_1")]
+    IPT_C2,
+    #[cfg(feature = "ffmpeg_7_1")]
+    YCGCO_RE,
+    #[cfg(feature = "ffmpeg_7_1")]
+    YCGCO_RO,
 }
 
 impl Space {
@@ -59,6 +66,13 @@ impl From<AVColorSpace> for Space {
             AVCOL_SPC_CHROMA_DERIVED_NCL => Space::ChromaDerivedNCL,
             AVCOL_SPC_CHROMA_DERIVED_CL => Space::ChromaDerivedCL,
             AVCOL_SPC_ICTCP => Space::ICTCP,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            AVCOL_SPC_IPT_C2 => Space::IPT_C2,
+            #[cfg(feature = "ffmpeg_7_1")]
+            AVCOL_SPC_YCGCO_RE => Space::YCGCO_RE,
+            #[cfg(feature = "ffmpeg_7_1")]
+            AVCOL_SPC_YCGCO_RO => Space::YCGCO_RO,
         }
     }
 }
@@ -82,6 +96,13 @@ impl From<Space> for AVColorSpace {
             Space::ChromaDerivedNCL => AVCOL_SPC_CHROMA_DERIVED_NCL,
             Space::ChromaDerivedCL => AVCOL_SPC_CHROMA_DERIVED_CL,
             Space::ICTCP => AVCOL_SPC_ICTCP,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            Space::IPT_C2 => AVCOL_SPC_IPT_C2,
+            #[cfg(feature = "ffmpeg_7_1")]
+            Space::YCGCO_RE => AVCOL_SPC_YCGCO_RE,
+            #[cfg(feature = "ffmpeg_7_1")]
+            Space::YCGCO_RO => AVCOL_SPC_YCGCO_RO,
         }
     }
 }
diff --git a/src/util/frame/side_data.rs b/src/util/frame/side_data.rs
@@ -64,6 +64,11 @@ pub enum Type {
 
     #[cfg(feature = "ffmpeg_6_1")]
     VIDEO_HINT,
+
+    #[cfg(feature = "ffmpeg_7_1")]
+    LCEVC,
+    #[cfg(feature = "ffmpeg_7_1")]
+    VIEW_ID,
 }
 
 impl Type {
@@ -132,6 +137,11 @@ impl From<AVFrameSideDataType> for Type {
 
             #[cfg(feature = "ffmpeg_6_1")]
             AV_FRAME_DATA_VIDEO_HINT => Type::VIDEO_HINT,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            AV_FRAME_DATA_LCEVC => Type::LCEVC,
+            #[cfg(feature = "ffmpeg_7_1")]
+            AV_FRAME_DATA_VIEW_ID => Type::VIEW_ID,
         }
     }
 }
@@ -193,6 +203,11 @@ impl From<Type> for AVFrameSideDataType {
 
             #[cfg(feature = "ffmpeg_6_1")]
             Type::VIDEO_HINT => AV_FRAME_DATA_VIDEO_HINT,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            Type::LCEVC => AV_FRAME_DATA_LCEVC,
+            #[cfg(feature = "ffmpeg_7_1")]
+            Type::VIEW_ID => AV_FRAME_DATA_VIEW_ID,
         }
     }
 }
diff --git a/src/util/option/mod.rs b/src/util/option/mod.rs
@@ -28,6 +28,9 @@ pub enum Type {
     FlagArray,
     c_ulong,
     bool,
+
+    #[cfg(feature = "ffmpeg_7_1")]
+    UInt,
 }
 
 impl From<AVOptionType> for Type {
@@ -58,6 +61,9 @@ impl From<AVOptionType> for Type {
             AV_OPT_TYPE_CHLAYOUT => Type::ChannelLayout,
             #[cfg(feature = "ffmpeg_7_0")]
             AV_OPT_TYPE_FLAG_ARRAY => Type::FlagArray,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            AV_OPT_TYPE_UINT => Type::UInt,
         }
     }
 }
@@ -90,6 +96,9 @@ impl From<Type> for AVOptionType {
             Type::ChannelLayout => AV_OPT_TYPE_CHLAYOUT,
             #[cfg(feature = "ffmpeg_7_0")]
             Type::FlagArray => AV_OPT_TYPE_FLAG_ARRAY,
+
+            #[cfg(feature = "ffmpeg_7_1")]
+            Type::UInt => AV_OPT_TYPE_UINT,
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -665,6 +665,11 @@ pub enum Id {`
`665`	`665`	`QOA,`
`666`	`666`	`#[cfg(feature = "ffmpeg_7_0")]`
`667`	`667`	`LEAD,`
	`668`	`+`
	`669`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`670`	`+ LC3,`
	`671`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`672`	`+ LCEVC,`
`668`	`673`	`}`
`669`	`674`
`670`	`675`	`impl Id {`
`@@ -1337,6 +1342,11 @@ impl From<AVCodecID> for Id {`
`1337`	`1342`	`AV_CODEC_ID_QOA => Id::QOA,`
`1338`	`1343`	`#[cfg(feature = "ffmpeg_7_0")]`
`1339`	`1344`	`AV_CODEC_ID_LEAD => Id::LEAD,`
	`1345`	`+`
	`1346`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`1347`	`+ AV_CODEC_ID_LC3 => Id::LC3,`
	`1348`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`1349`	`+ AV_CODEC_ID_LCEVC => Id::LCEVC,`
`1340`	`1350`	`}`
`1341`	`1351`	`}`
`1342`	`1352`	`}`
`@@ -2001,6 +2011,11 @@ impl From<Id> for AVCodecID {`
`2001`	`2011`	`Id::QOA => AV_CODEC_ID_QOA,`
`2002`	`2012`	`#[cfg(feature = "ffmpeg_7_0")]`
`2003`	`2013`	`Id::LEAD => AV_CODEC_ID_LEAD,`
	`2014`	`+`
	`2015`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`2016`	`+ Id::LC3 => AV_CODEC_ID_LC3,`
	`2017`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`2018`	`+ Id::LCEVC => AV_CODEC_ID_LCEVC,`
`2004`	`2019`	`}`
`2005`	`2020`	`}`
`2006`	`2021`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@ pub enum Type {`
`63`	`63`	`IAMF_RECON_GAIN_INFO_PARAM,`
`64`	`64`	`#[cfg(feature = "ffmpeg_7_0")]`
`65`	`65`	`AMBIENT_VIEWING_ENVIRONMENT,`
	`66`	`+`
	`67`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`68`	`+ FRAME_CROPPING,`
	`69`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`70`	`+ LCEVC,`
`66`	`71`	`}`
`67`	`72`
`68`	`73`	`impl From<AVPacketSideDataType> for Type {`
`@@ -124,6 +129,11 @@ impl From<AVPacketSideDataType> for Type {`
`124`	`129`	`AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM => Type::IAMF_RECON_GAIN_INFO_PARAM,`
`125`	`130`	`#[cfg(feature = "ffmpeg_7_0")]`
`126`	`131`	`AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT => Type::AMBIENT_VIEWING_ENVIRONMENT,`
	`132`	`+`
	`133`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`134`	`+ AV_PKT_DATA_FRAME_CROPPING => Type::FRAME_CROPPING,`
	`135`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`136`	`+ AV_PKT_DATA_LCEVC => Type::LCEVC,`
`127`	`137`	`}`
`128`	`138`	`}`
`129`	`139`	`}`
`@@ -187,6 +197,11 @@ impl From<Type> for AVPacketSideDataType {`
`187`	`197`	`Type::IAMF_RECON_GAIN_INFO_PARAM => AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM,`
`188`	`198`	`#[cfg(feature = "ffmpeg_7_0")]`
`189`	`199`	`Type::AMBIENT_VIEWING_ENVIRONMENT => AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,`
	`200`	`+`
	`201`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`202`	`+ Type::FRAME_CROPPING => AV_PKT_DATA_FRAME_CROPPING,`
	`203`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`204`	`+ Type::LCEVC => AV_PKT_DATA_LCEVC,`
`190`	`205`	`}`
`191`	`206`	`}`
`192`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,7 @@ bitflags! {`
`18`	`18`	`const CAPTIONS = AV_DISPOSITION_CAPTIONS;`
`19`	`19`	`const DESCRIPTIONS = AV_DISPOSITION_DESCRIPTIONS;`
`20`	`20`	`const METADATA = AV_DISPOSITION_METADATA;`
	`21`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`22`	`+ const MULTILAYER = AV_DISPOSITION_MULTILAYER;`
`21`	`23`	`}`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,13 @@ pub enum Space {`
`22`	`22`	`ChromaDerivedNCL,`
`23`	`23`	`ChromaDerivedCL,`
`24`	`24`	`ICTCP,`
	`25`	`+`
	`26`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`27`	`+ IPT_C2,`
	`28`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`29`	`+ YCGCO_RE,`
	`30`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`31`	`+ YCGCO_RO,`
`25`	`32`	`}`
`26`	`33`
`27`	`34`	`impl Space {`
`@@ -59,6 +66,13 @@ impl From<AVColorSpace> for Space {`
`59`	`66`	`AVCOL_SPC_CHROMA_DERIVED_NCL => Space::ChromaDerivedNCL,`
`60`	`67`	`AVCOL_SPC_CHROMA_DERIVED_CL => Space::ChromaDerivedCL,`
`61`	`68`	`AVCOL_SPC_ICTCP => Space::ICTCP,`
	`69`	`+`
	`70`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`71`	`+ AVCOL_SPC_IPT_C2 => Space::IPT_C2,`
	`72`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`73`	`+ AVCOL_SPC_YCGCO_RE => Space::YCGCO_RE,`
	`74`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`75`	`+ AVCOL_SPC_YCGCO_RO => Space::YCGCO_RO,`
`62`	`76`	`}`
`63`	`77`	`}`
`64`	`78`	`}`
`@@ -82,6 +96,13 @@ impl From<Space> for AVColorSpace {`
`82`	`96`	`Space::ChromaDerivedNCL => AVCOL_SPC_CHROMA_DERIVED_NCL,`
`83`	`97`	`Space::ChromaDerivedCL => AVCOL_SPC_CHROMA_DERIVED_CL,`
`84`	`98`	`Space::ICTCP => AVCOL_SPC_ICTCP,`
	`99`	`+`
	`100`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`101`	`+ Space::IPT_C2 => AVCOL_SPC_IPT_C2,`
	`102`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`103`	`+ Space::YCGCO_RE => AVCOL_SPC_YCGCO_RE,`
	`104`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`105`	`+ Space::YCGCO_RO => AVCOL_SPC_YCGCO_RO,`
`85`	`106`	`}`
`86`	`107`	`}`
`87`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@ pub enum Type {`
`64`	`64`
`65`	`65`	`#[cfg(feature = "ffmpeg_6_1")]`
`66`	`66`	`VIDEO_HINT,`
	`67`	`+`
	`68`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`69`	`+ LCEVC,`
	`70`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`71`	`+ VIEW_ID,`
`67`	`72`	`}`
`68`	`73`
`69`	`74`	`impl Type {`
`@@ -132,6 +137,11 @@ impl From<AVFrameSideDataType> for Type {`
`132`	`137`
`133`	`138`	`#[cfg(feature = "ffmpeg_6_1")]`
`134`	`139`	`AV_FRAME_DATA_VIDEO_HINT => Type::VIDEO_HINT,`
	`140`	`+`
	`141`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`142`	`+ AV_FRAME_DATA_LCEVC => Type::LCEVC,`
	`143`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`144`	`+ AV_FRAME_DATA_VIEW_ID => Type::VIEW_ID,`
`135`	`145`	`}`
`136`	`146`	`}`
`137`	`147`	`}`
`@@ -193,6 +203,11 @@ impl From<Type> for AVFrameSideDataType {`
`193`	`203`
`194`	`204`	`#[cfg(feature = "ffmpeg_6_1")]`
`195`	`205`	`Type::VIDEO_HINT => AV_FRAME_DATA_VIDEO_HINT,`
	`206`	`+`
	`207`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`208`	`+ Type::LCEVC => AV_FRAME_DATA_LCEVC,`
	`209`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`210`	`+ Type::VIEW_ID => AV_FRAME_DATA_VIEW_ID,`
`196`	`211`	`}`
`197`	`212`	`}`
`198`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ pub enum Type {`
`28`	`28`	`FlagArray,`
`29`	`29`	`c_ulong,`
`30`	`30`	`bool,`
	`31`	`+`
	`32`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`33`	`+ UInt,`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`impl From<AVOptionType> for Type {`
`@@ -58,6 +61,9 @@ impl From<AVOptionType> for Type {`
`58`	`61`	`AV_OPT_TYPE_CHLAYOUT => Type::ChannelLayout,`
`59`	`62`	`#[cfg(feature = "ffmpeg_7_0")]`
`60`	`63`	`AV_OPT_TYPE_FLAG_ARRAY => Type::FlagArray,`
	`64`	`+`
	`65`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`66`	`+ AV_OPT_TYPE_UINT => Type::UInt,`
`61`	`67`	`}`
`62`	`68`	`}`
`63`	`69`	`}`
`@@ -90,6 +96,9 @@ impl From<Type> for AVOptionType {`
`90`	`96`	`Type::ChannelLayout => AV_OPT_TYPE_CHLAYOUT,`
`91`	`97`	`#[cfg(feature = "ffmpeg_7_0")]`
`92`	`98`	`Type::FlagArray => AV_OPT_TYPE_FLAG_ARRAY,`
	`99`	`+`
	`100`	`+ #[cfg(feature = "ffmpeg_7_1")]`
	`101`	`+ Type::UInt => AV_OPT_TYPE_UINT,`
`93`	`102`	`}`
`94`	`103`	`}`
`95`	`104`	`}`