FFmpeg 8.0 support

Closes #244. Signed-off-by: Zhiming Wang <i@zhimingwang.org>

Author: AdrianEddy

.github/workflows/build.yml

@@ -11,14 +11,14 @@ 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", "7.0"]
+ ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1", "6.0"]
  fail-fast: false
  steps:
  - uses: actions/checkout@v2
  - name: Install dependencies
  run: |
  apt update
- apt install -y --no-install-recommends clang curl pkg-config
+ apt install -y --no-install-recommends clang curl pkg-config ca-certificates
  - name: Set up Rust
  uses: actions-rs/toolchain@v1
  with:
@@ -106,22 +106,24 @@ jobs:
  - name: Check format
  run: |
  cargo fmt -- --check
- # Added only because there is no ffmpeg7.1 docker image here yet
+ # Added only because there is no ffmpeg8.0 docker image here yet
  # https://github.com/jrottenberg/ffmpeg
- build-test-lint-7-1:
- name: FFmpeg 7.1 - build, test and lint
+ build-test-lint-8-0:
+ name: FFmpeg${{ matrix.ffmpeg_version }} - build, test and lint
  runs-on: ubuntu-latest
  strategy:
  fail-fast: false
+ matrix:
+ ffmpeg_version: ["6.1", "7.0", "7.1", "8.0"]
  env:
- FFMPEG_DIR: /home/runner/work/rust-ffmpeg/rust-ffmpeg/ffmpeg-7.1-linux-clang-default
+ FFMPEG_DIR: /home/runner/work/rust-ffmpeg/rust-ffmpeg/ffmpeg-${{ matrix.ffmpeg_version }}-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.1-linux-clang-default.tar.xz/download -o ffmpeg.tar.xz
+ sudo apt install -y --no-install-recommends clang curl pkg-config xz-utils libxv-dev libc++-dev
+ curl -L https://sourceforge.net/projects/avbuild/files/linux/ffmpeg-${{ matrix.ffmpeg_version }}-linux-clang-default.tar.xz/download -o ffmpeg.tar.xz
  tar -xf ffmpeg.tar.xz
  - name: Set up Rust
  uses: actions-rs/toolchain@v1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ffmpeg-next"
-version = "7.1.0"
+version = "8.0.0"
 build = "build.rs"
 
 authors = ["meh. <meh@schizofreni.co>", "Zhiming Wang <i@zhimingwang.org>"]
@@ -107,12 +107,12 @@ rpi = []
 
 [dependencies]
 libc = "0.2"
-bitflags = "2.6"
+bitflags = "2.9"
 
 [dependencies.image]
 version = "0.25"
 optional = true
 
 [dependencies.ffmpeg-sys-next]
-version = "7.1.0"
+version = "8.0.0"
 default-features = false

README.md

@@ -5,7 +5,7 @@
 This is a fork of the abandoned [ffmpeg](https://crates.io/crates/ffmpeg) crate by [meh.](https://github.com/meh/rust-ffmpeg).
 
 This crate is currently in maintenance mode, and aims to be compatible with all of FFmpeg's versions from 3.4
-(currently from 3.4 til 7.0)
+(currently from 3.4 til 8.0)
 
 Build instructions can be found on the [wiki](https://github.com/zmwangx/rust-ffmpeg/wiki/Notes-on-building).
 

src/codec/capabilities.rs

@@ -12,6 +12,7 @@ bitflags! {
  const SMALL_LAST_FRAME = AV_CODEC_CAP_SMALL_LAST_FRAME;
  #[cfg(not(feature = "ffmpeg_4_0"))]
  const HWACCEL_VDPAU = AV_CODEC_CAP_HWACCEL_VDPAU;
+ #[cfg(not(feature = "ffmpeg_8_0"))]
  const SUBFRAMES = AV_CODEC_CAP_SUBFRAMES;
  const EXPERIMENTAL = AV_CODEC_CAP_EXPERIMENTAL;
  const CHANNEL_CONF = AV_CODEC_CAP_CHANNEL_CONF;

src/codec/decoder/opened.rs

@@ -95,6 +95,7 @@ impl Opened {
 
 impl Drop for Opened {
  fn drop(&mut self) {
+ #[cfg(not(feature = "ffmpeg_8_0"))]
  unsafe {
  avcodec_close(self.as_mut_ptr());
  }

src/codec/id.rs

@@ -670,6 +670,27 @@ pub enum Id {
  LC3,
  #[cfg(feature = "ffmpeg_7_1")]
  LCEVC,
+
+ #[cfg(feature = "ffmpeg_8_0")]
+ JPEGXL_ANIM,
+ #[cfg(feature = "ffmpeg_8_0")]
+ PRORES_RAW,
+ #[cfg(feature = "ffmpeg_8_0")]
+ SMPTE_436M_ANC,
+ #[cfg(feature = "ffmpeg_8_0")]
+ DNXUC,
+ #[cfg(feature = "ffmpeg_8_0")]
+ RV60,
+ #[cfg(feature = "ffmpeg_8_0")]
+ APV,
+ #[cfg(feature = "ffmpeg_8_0")]
+ ADPCM_IMA_XBOX,
+ #[cfg(feature = "ffmpeg_8_0")]
+ ADPCM_SANYO,
+ #[cfg(feature = "ffmpeg_8_0")]
+ G728,
+ #[cfg(feature = "ffmpeg_8_0")]
+ IVTV_VBI,
 }
 
 impl Id {
@@ -1347,6 +1368,27 @@ impl From<AVCodecID> for Id {
  AV_CODEC_ID_LC3 => Id::LC3,
  #[cfg(feature = "ffmpeg_7_1")]
  AV_CODEC_ID_LCEVC => Id::LCEVC,
+
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_JPEGXL_ANIM => Id::JPEGXL_ANIM,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_PRORES_RAW => Id::PRORES_RAW,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_SMPTE_436M_ANC => Id::SMPTE_436M_ANC,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_DNXUC => Id::DNXUC,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_RV60 => Id::RV60,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_APV => Id::APV,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_ADPCM_IMA_XBOX => Id::ADPCM_IMA_XBOX,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_ADPCM_SANYO => Id::ADPCM_SANYO,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_G728 => Id::G728,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_CODEC_ID_IVTV_VBI => Id::IVTV_VBI,
  }
  }
 }
@@ -2016,6 +2058,27 @@ impl From<Id> for AVCodecID {
  Id::LC3 => AV_CODEC_ID_LC3,
  #[cfg(feature = "ffmpeg_7_1")]
  Id::LCEVC => AV_CODEC_ID_LCEVC,
+
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::JPEGXL_ANIM => AV_CODEC_ID_JPEGXL_ANIM,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::PRORES_RAW => AV_CODEC_ID_PRORES_RAW,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::SMPTE_436M_ANC => AV_CODEC_ID_SMPTE_436M_ANC,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::DNXUC => AV_CODEC_ID_DNXUC,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::RV60 => AV_CODEC_ID_RV60,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::APV => AV_CODEC_ID_APV,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::ADPCM_IMA_XBOX => AV_CODEC_ID_ADPCM_IMA_XBOX,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::ADPCM_SANYO => AV_CODEC_ID_ADPCM_SANYO,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::G728 => AV_CODEC_ID_G728,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Id::IVTV_VBI => AV_CODEC_ID_IVTV_VBI,
  }
  }
 }

src/codec/packet/borrow.rs

@@ -11,7 +11,7 @@ pub struct Borrow<'a> {
 }
 
 impl<'a> Borrow<'a> {
- pub fn new(data: &[u8]) -> Borrow {
+ pub fn new(data: &[u8]) -> Borrow<'_> {
  unsafe {
  let mut packet: AVPacket = mem::zeroed();
 

src/codec/packet/packet.rs

@@ -54,7 +54,7 @@ impl Packet {
  }
 
  #[inline]
- pub fn borrow(data: &[u8]) -> Borrow {
+ pub fn borrow(data: &[u8]) -> Borrow<'_> {
  Borrow::new(data)
  }
 
@@ -187,7 +187,7 @@ impl Packet {
  }
 
  #[inline]
- pub fn side_data(&self) -> SideDataIter {
+ pub fn side_data(&self) -> SideDataIter<'_> {
  SideDataIter::new(&self.0)
  }
 

src/codec/packet/side_data.rs

@@ -68,6 +68,11 @@ pub enum Type {
  FRAME_CROPPING,
  #[cfg(feature = "ffmpeg_7_1")]
  LCEVC,
+
+ #[cfg(feature = "ffmpeg_8_0")]
+ THREE_D_REFERENCE_DISPLAYS,
+ #[cfg(feature = "ffmpeg_8_0")]
+ RTCP_SR,
 }
 
 impl From<AVPacketSideDataType> for Type {
@@ -134,6 +139,11 @@ impl From<AVPacketSideDataType> for Type {
  AV_PKT_DATA_FRAME_CROPPING => Type::FRAME_CROPPING,
  #[cfg(feature = "ffmpeg_7_1")]
  AV_PKT_DATA_LCEVC => Type::LCEVC,
+
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_PKT_DATA_3D_REFERENCE_DISPLAYS => Type::THREE_D_REFERENCE_DISPLAYS,
+ #[cfg(feature = "ffmpeg_8_0")]
+ AV_PKT_DATA_RTCP_SR => Type::RTCP_SR,
  }
  }
 }
@@ -202,6 +212,11 @@ impl From<Type> for AVPacketSideDataType {
  Type::FRAME_CROPPING => AV_PKT_DATA_FRAME_CROPPING,
  #[cfg(feature = "ffmpeg_7_1")]
  Type::LCEVC => AV_PKT_DATA_LCEVC,
+
+ #[cfg(feature = "ffmpeg_8_0")]
+ Type::THREE_D_REFERENCE_DISPLAYS => AV_PKT_DATA_3D_REFERENCE_DISPLAYS,
+ #[cfg(feature = "ffmpeg_8_0")]
+ Type::RTCP_SR => AV_PKT_DATA_RTCP_SR,
  }
  }
 }

src/codec/subtitle/mod.rs

@@ -88,15 +88,15 @@ impl Subtitle {
  self.0.end_display_time = value;
  }
 
- pub fn rects(&self) -> RectIter {
+ pub fn rects(&self) -> RectIter<'_> {
  RectIter::new(&self.0)
  }
 
- pub fn rects_mut(&mut self) -> RectMutIter {
+ pub fn rects_mut(&mut self) -> RectMutIter<'_> {
  RectMutIter::new(&mut self.0)
  }
 
- pub fn add_rect(&mut self, kind: Type) -> RectMut {
+ pub fn add_rect(&mut self, kind: Type) -> RectMut<'_> {
  unsafe {
  self.0.num_rects += 1;
  self.0.rects = av_realloc(