API: add AV_PKT_DATA_ICC_PROFILE to AVPacketSideDataType

Signed-off-by: vectronic <hello.vectronic@gmail.com>

diff --git a/doc/APIchanges b/doc/APIchanges
index 5bfb0a654e12f958ac477f4259abdb52261443f6..8eeaec2028e5d04a598f730ccc7997c0f5013aea 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2017-10-21
 
 API changes, most recent first:
 
+2020-03-10 - xxxxxxxxxx - lavc 58.75.100 - avcodec.h
+  Add AV_PKT_DATA_ICC_PROFILE.
+
 2020-02-21 - xxxxxxxxxx - lavc 58.73.101 - avcodec.h
   Add AV_CODEC_EXPORT_DATA_PRFT.
 

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 833642d692447114163991b90364bbe0af2b2a25..aca3825fd39d89ac7bfbea2f0988e7680496724e 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1451,6 +1451,12 @@ enum AVPacketSideDataType {
      */
     AV_PKT_DATA_PRFT,
 
+    /**
+     * ICC profile data consisting of an opaque octet buffer following the
+     * format described by ISO 15076-1.
+     */
+    AV_PKT_DATA_ICC_PROFILE,
+
     /**
      * The number of side data types.
      * This is not part of the public API/ABI in the sense that it may

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 74845efcd2cbd8b627bbaf05e0c7c0b8aa8bb9a7..b5667659fd09fdd5e4a905b42c300dda5aab0efb 100644 (file)
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -394,6 +394,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
     case AV_PKT_DATA_ENCRYPTION_INIT_INFO:       return "Encryption initialization data";
     case AV_PKT_DATA_ENCRYPTION_INFO:            return "Encryption info";
     case AV_PKT_DATA_AFD:                        return "Active Format Description data";
+    case AV_PKT_DATA_ICC_PROFILE:                return "ICC Profile";
     }
     return NULL;
 }

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 03b9da25f9fd9932ae6b29d65dd76d67a105098c..07b64b387b5282a282cdfd17c890aaed6a3cbe74 100644 (file)
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -1750,6 +1750,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
         { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA },
         { AV_PKT_DATA_CONTENT_LIGHT_LEVEL,        AV_FRAME_DATA_CONTENT_LIGHT_LEVEL },
         { AV_PKT_DATA_A53_CC,                     AV_FRAME_DATA_A53_CC },
+        { AV_PKT_DATA_ICC_PROFILE,                AV_FRAME_DATA_ICC_PROFILE },
     };
 
     if (pkt) {

diff --git a/libavcodec/version.h b/libavcodec/version.h
index c051ac0754585c206e4b112c45368f6a5461b3f4..a94ed92668b1ec73ef7c8761cfc4b8d36403283d 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  58
-#define LIBAVCODEC_VERSION_MINOR  74
+#define LIBAVCODEC_VERSION_MINOR  75
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --git a/libavformat/dump.c b/libavformat/dump.c
index 56814ff7d202a5c3001eea19a0e643a9522335c9..220f404d65b1069568110c576e594dae3c90a93c 100644 (file)
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -446,6 +446,9 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent)
         case AV_PKT_DATA_CONTENT_LIGHT_LEVEL:
             dump_content_light_metadata(ctx, &sd);
             break;
+        case AV_PKT_DATA_ICC_PROFILE:
+            av_log(ctx, AV_LOG_INFO, "ICC Profile");
+            break;
         default:
             av_log(ctx, AV_LOG_INFO,
                    "unknown side data type %d (%d bytes)", sd.type, sd.size);