[FFmpeg-cvslog] avcodec/hevcdec: check for DOVI configuration record in AVCodecContext side data
James Almer
git at videolan.org
Fri Oct 6 16:11:31 EEST 2023
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Jul 17 17:55:30 2023 -0300| [804be7f9e3c52ba38efb13e2ef1737061b2e9d0f] | committer: James Almer
avcodec/hevcdec: check for DOVI configuration record in AVCodecContext side data
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=804be7f9e3c52ba38efb13e2ef1737061b2e9d0f
---
doc/APIchanges | 4 ++++
libavcodec/avcodec.h | 2 +-
libavcodec/decode.c | 10 ++++++++++
libavcodec/decode.h | 6 ++++++
libavcodec/hevcdec.c | 15 ++++++++++++++-
libavcodec/version.h | 2 +-
6 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index b67dfba316..9b109e6fa7 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09
API changes, most recent first:
+2023-10-06 - xxxxxxxxxx - lavc 60.30.101 - avcodec.h
+ AVCodecContext.coded_side_data may now be used during decoding, to be set
+ by user before calling avcodec_open2() for initialization.
+
2023-10-06 - xxxxxxxxxx - lavc 60.15.100 - avformat.h
Deprecate AVFormatContext.{nb_,}side_data, av_stream_add_side_data(),
av_stream_new_side_data(), and av_stream_get_side_data(). Side data fields
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3916f66980..7fb44e28f4 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1909,7 +1909,7 @@ typedef struct AVCodecContext {
/**
* Additional data associated with the entire coded stream.
*
- * - decoding: unused
+ * - decoding: may be set by user before calling avcodec_open2().
* - encoding: may be set by libavcodec after avcodec_open2().
*/
AVPacketSideData *coded_side_data;
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 8f94678e9b..d81c418e10 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -1403,6 +1403,16 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
return ret;
}
+const AVPacketSideData *ff_get_coded_side_data(const AVCodecContext *avctx,
+ enum AVPacketSideDataType type)
+{
+ for (int i = 0; i < avctx->nb_coded_side_data; i++)
+ if (avctx->coded_side_data[i].type == type)
+ return &avctx->coded_side_data[i];
+
+ return NULL;
+}
+
static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame)
{
size_t size;
diff --git a/libavcodec/decode.h b/libavcodec/decode.h
index a52152e4a7..be03c136e7 100644
--- a/libavcodec/decode.h
+++ b/libavcodec/decode.h
@@ -153,4 +153,10 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame,
int ff_hwaccel_frame_priv_alloc(AVCodecContext *avctx, void **hwaccel_picture_private,
AVBufferRef **hwaccel_priv_buf);
+/**
+ * Get side data of the given type from a decoding context.
+ */
+const AVPacketSideData *ff_get_coded_side_data(const AVCodecContext *avctx,
+ enum AVPacketSideDataType type);
+
#endif /* AVCODEC_DECODE_H */
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 2be62ddfb2..5acaa407dd 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -3343,8 +3343,15 @@ static int hevc_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
}
sd = av_packet_get_side_data(avpkt, AV_PKT_DATA_DOVI_CONF, &sd_size);
- if (sd && sd_size > 0)
+ if (sd && sd_size > 0) {
+ int old = s->dovi_ctx.dv_profile;
+
ff_dovi_update_cfg(&s->dovi_ctx, (AVDOVIDecoderConfigurationRecord *) sd);
+ if (old)
+ av_log(avctx, AV_LOG_DEBUG,
+ "New DOVI configuration record from input packet (profile %d -> %u).\n",
+ old, s->dovi_ctx.dv_profile);
+ }
s->ref = NULL;
ret = decode_nal_units(s, avpkt->data, avpkt->size);
@@ -3649,12 +3656,18 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx)
atomic_init(&s->wpp_err, 0);
if (!avctx->internal->is_copy) {
+ const AVPacketSideData *sd;
+
if (avctx->extradata_size > 0 && avctx->extradata) {
ret = hevc_decode_extradata(s, avctx->extradata, avctx->extradata_size, 1);
if (ret < 0) {
return ret;
}
}
+
+ sd = ff_get_coded_side_data(avctx, AV_PKT_DATA_DOVI_CONF);
+ if (sd && sd->size > 0)
+ ff_dovi_update_cfg(&s->dovi_ctx, (AVDOVIDecoderConfigurationRecord *) sd->data);
}
return 0;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index aeb58e3fed..a51282e33d 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 30
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list