From 2c5abbfe33ba7fc33077f6dc5534b3a057116738 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <i@zhimingwang.org>
Date: Mon, 10 Sep 2018 16:21:43 -0400
Subject: [PATCH] Add missing macros (FFmpeg 4.0.2)

---
 src/codec/id.rs               | 12 ++++++++++++
 src/codec/packet/side_data.rs |  6 ++++++
 src/util/format/pixel.rs      |  3 +++
 src/util/frame/side_data.rs   |  9 +++++++++
 4 files changed, 30 insertions(+)

diff --git a/src/codec/id.rs b/src/codec/id.rs
index 2f433b7..240ec44 100644
--- a/src/codec/id.rs
+++ b/src/codec/id.rs
@@ -397,6 +397,7 @@ pub enum Id {
     ON2AVC,
     DSS_SP,
 
+    CODEC2,
     FFWAVESYNTH,
     SONIC,
     SONIC_LS,
@@ -480,6 +481,9 @@ pub enum Id {
     FITS,
     GREMLIN_DPCM,
     DOLBY_E,
+    APTX,
+    APTX_HD,
+    SBC,
 }
 
 impl Id {
@@ -882,6 +886,7 @@ impl From<AVCodecID> for Id {
             AV_CODEC_ID_ON2AVC => Id::ON2AVC,
             AV_CODEC_ID_DSS_SP => Id::DSS_SP,
 
+            AV_CODEC_ID_CODEC2 => Id::CODEC2,
             AV_CODEC_ID_FFWAVESYNTH => Id::FFWAVESYNTH,
             AV_CODEC_ID_SONIC => Id::SONIC,
             AV_CODEC_ID_SONIC_LS => Id::SONIC_LS,
@@ -964,6 +969,9 @@ impl From<AVCodecID> for Id {
             AV_CODEC_ID_FITS => Id::FITS,
             AV_CODEC_ID_GREMLIN_DPCM => Id::GREMLIN_DPCM,
             AV_CODEC_ID_DOLBY_E => Id::DOLBY_E,
+            AV_CODEC_ID_APTX => Id::APTX,
+            AV_CODEC_ID_APTX_HD => Id::APTX_HD,
+            AV_CODEC_ID_SBC => Id::SBC,
         }
     }
 }
@@ -1360,6 +1368,7 @@ impl Into<AVCodecID> for Id {
             Id::ON2AVC => AV_CODEC_ID_ON2AVC,
             Id::DSS_SP => AV_CODEC_ID_DSS_SP,
 
+            Id::CODEC2 => AV_CODEC_ID_CODEC2,
             Id::FFWAVESYNTH => AV_CODEC_ID_FFWAVESYNTH,
             Id::SONIC => AV_CODEC_ID_SONIC,
             Id::SONIC_LS => AV_CODEC_ID_SONIC_LS,
@@ -1443,6 +1452,9 @@ impl Into<AVCodecID> for Id {
             Id::FITS => AV_CODEC_ID_FITS,
             Id::GREMLIN_DPCM => AV_CODEC_ID_GREMLIN_DPCM,
             Id::DOLBY_E => AV_CODEC_ID_DOLBY_E,
+            Id::APTX => AV_CODEC_ID_APTX,
+            Id::APTX_HD => AV_CODEC_ID_APTX_HD,
+            Id::SBC => AV_CODEC_ID_SBC,
         }
     }
 }
diff --git a/src/codec/packet/side_data.rs b/src/codec/packet/side_data.rs
index 6dd5cb5..2a6c3cb 100644
--- a/src/codec/packet/side_data.rs
+++ b/src/codec/packet/side_data.rs
@@ -33,6 +33,8 @@ pub enum Type {
 
     ContentLightLevel,
     A53CC,
+    EncryptionInitInfo,
+    EncryptionInfo,
 }
 
 impl From<AVPacketSideDataType> for Type {
@@ -64,6 +66,8 @@ impl From<AVPacketSideDataType> for Type {
 
             AV_PKT_DATA_CONTENT_LIGHT_LEVEL => Type::ContentLightLevel,
             AV_PKT_DATA_A53_CC => Type::A53CC,
+            AV_PKT_DATA_ENCRYPTION_INIT_INFO => Type::EncryptionInitInfo,
+            AV_PKT_DATA_ENCRYPTION_INFO => Type::EncryptionInfo,
         }
     }
 }
@@ -97,6 +101,8 @@ impl Into<AVPacketSideDataType> for Type {
 
             Type::ContentLightLevel => AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
             Type::A53CC => AV_PKT_DATA_A53_CC,
+            Type::EncryptionInitInfo => AV_PKT_DATA_ENCRYPTION_INIT_INFO,
+            Type::EncryptionInfo => AV_PKT_DATA_ENCRYPTION_INFO,
         }
     }
 }
diff --git a/src/util/format/pixel.rs b/src/util/format/pixel.rs
index 824ca77..ed51d46 100644
--- a/src/util/format/pixel.rs
+++ b/src/util/format/pixel.rs
@@ -306,6 +306,7 @@ pub enum Pixel {
     GBRAPF32BE,
     GBRAPF32LE,
     DRM_PRIME,
+    OPENCL,
 }
 
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -583,6 +584,7 @@ impl From<AVPixelFormat> for Pixel {
             AV_PIX_FMT_GBRAPF32BE => Pixel::GBRAPF32BE,
             AV_PIX_FMT_GBRAPF32LE => Pixel::GBRAPF32LE,
             AV_PIX_FMT_DRM_PRIME => Pixel::DRM_PRIME,
+            AV_PIX_FMT_OPENCL => Pixel::OPENCL,
         }
     }
 }
@@ -889,6 +891,7 @@ impl Into<AVPixelFormat> for Pixel {
             Pixel::GBRAPF32BE => AV_PIX_FMT_GBRAPF32BE,
             Pixel::GBRAPF32LE => AV_PIX_FMT_GBRAPF32LE,
             Pixel::DRM_PRIME => AV_PIX_FMT_DRM_PRIME,
+            Pixel::OPENCL => AV_PIX_FMT_OPENCL,
         }
     }
 }
diff --git a/src/util/frame/side_data.rs b/src/util/frame/side_data.rs
index acc5024..770bce9 100644
--- a/src/util/frame/side_data.rs
+++ b/src/util/frame/side_data.rs
@@ -27,6 +27,9 @@ pub enum Type {
 
     ContentLightLevel,
     IccProfile,
+
+    QPTableProperties,
+    QPTableData,
 }
 
 impl Type {
@@ -59,6 +62,9 @@ impl From<AVFrameSideDataType> for Type {
 
             AV_FRAME_DATA_CONTENT_LIGHT_LEVEL => Type::ContentLightLevel,
             AV_FRAME_DATA_ICC_PROFILE => Type::IccProfile,
+
+            AV_FRAME_DATA_QP_TABLE_PROPERTIES => Type::QPTableProperties,
+            AV_FRAME_DATA_QP_TABLE_DATA => Type::QPTableData,
         }
     }
 }
@@ -84,6 +90,9 @@ impl Into<AVFrameSideDataType> for Type {
 
             Type::ContentLightLevel => AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
             Type::IccProfile => AV_FRAME_DATA_ICC_PROFILE,
+
+            Type::QPTableProperties => AV_FRAME_DATA_QP_TABLE_PROPERTIES,
+            Type::QPTableData => AV_FRAME_DATA_QP_TABLE_DATA,
         }
     }
 }