| Message ID | 20230927131242.1950-9-jamrial@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | AVCodecContext and AVCodecParameters side data | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Quoting James Almer (2023-09-27 15:12:39) > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavcodec/avcodec.h | 2 +- > libavcodec/decode.c | 10 ++++++++++ > libavcodec/decode.h | 3 +++ > libavcodec/hevcdec.c | 15 ++++++++++++++- > 4 files changed, 28 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index da3c5234a0..48a4b73fd3 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -1903,7 +1903,7 @@ typedef struct AVCodecContext { > /** > * Additional data associated with the entire coded stream. > * > - * - decoding: unused > + * - decoding: set by user before calling avcodec_open2(). Should be "may be set...", because it's optional. Also, I think this deserves to be mentione in APIchanges. > @@ -3644,12 +3651,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); Do you have a sample for this? Would be very nice to have a test for this functionality.
On 10/3/2023 7:18 AM, Anton Khirnov wrote: > Quoting James Almer (2023-09-27 15:12:39) >> Signed-off-by: James Almer <jamrial@gmail.com> >> --- >> libavcodec/avcodec.h | 2 +- >> libavcodec/decode.c | 10 ++++++++++ >> libavcodec/decode.h | 3 +++ >> libavcodec/hevcdec.c | 15 ++++++++++++++- >> 4 files changed, 28 insertions(+), 2 deletions(-) >> >> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h >> index da3c5234a0..48a4b73fd3 100644 >> --- a/libavcodec/avcodec.h >> +++ b/libavcodec/avcodec.h >> @@ -1903,7 +1903,7 @@ typedef struct AVCodecContext { >> /** >> * Additional data associated with the entire coded stream. >> * >> - * - decoding: unused >> + * - decoding: set by user before calling avcodec_open2(). > > Should be "may be set...", because it's optional. > > Also, I think this deserves to be mentione in APIchanges. Ok. > >> @@ -3644,12 +3651,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); > > Do you have a sample for this? Would be very nice to have a test for > this functionality. There's a sample in fate, but apparently it does stream copy (testing demux and mux code), so the hevc decoder never handles it.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index da3c5234a0..48a4b73fd3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1903,7 +1903,7 @@ typedef struct AVCodecContext { /** * Additional data associated with the entire coded stream. * - * - decoding: unused + * - decoding: 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 466c393c1e..a7196b5740 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1400,6 +1400,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..8a7dec4e2e 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -153,4 +153,7 @@ 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); +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 81b9c5e089..59d59bbef4 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3340,8 +3340,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); @@ -3644,12 +3651,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;
Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/avcodec.h | 2 +- libavcodec/decode.c | 10 ++++++++++ libavcodec/decode.h | 3 +++ libavcodec/hevcdec.c | 15 ++++++++++++++- 4 files changed, 28 insertions(+), 2 deletions(-)