diff options
author | Anton Khirnov <anton@khirnov.net> | 2024-03-22 20:49:33 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2024-03-28 08:40:11 +0100 |
commit | e0de84ad2e25632b9a2f402f9e71a222c00567bb (patch) | |
tree | e0453ce6185b5b518ffd9e34737f34cef6d2a286 /libavcodec/encode.c | |
parent | a3f4670943dfe4455da94901bf57226bab72bde1 (diff) | |
download | ffmpeg-e0de84ad2e25632b9a2f402f9e71a222c00567bb.tar.gz |
lavc/encode: map AVCodecContext.decoded_side_data to coded_side_data
This way it can be automagically propagated through the encoder to
muxing.
Diffstat (limited to 'libavcodec/encode.c')
-rw-r--r-- | libavcodec/encode.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 7fc9737e93..46e46a055e 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -782,6 +782,29 @@ int ff_encode_preinit(AVCodecContext *avctx) return AVERROR(ENOMEM); } + for (int i = 0; ff_sd_global_map[i].packet < AV_PKT_DATA_NB; i++) { + const enum AVPacketSideDataType type_packet = ff_sd_global_map[i].packet; + const enum AVFrameSideDataType type_frame = ff_sd_global_map[i].frame; + const AVFrameSideData *sd_frame; + AVPacketSideData *sd_packet; + + sd_frame = av_frame_side_data_get(avctx->decoded_side_data, + avctx->nb_decoded_side_data, + type_frame); + if (!sd_frame || + av_packet_side_data_get(avctx->coded_side_data, avctx->nb_coded_side_data, + type_packet)) + + continue; + + sd_packet = av_packet_side_data_new(&avctx->coded_side_data, &avctx->nb_coded_side_data, + type_packet, sd_frame->size, 0); + if (!sd_packet) + return AVERROR(ENOMEM); + + memcpy(sd_packet->data, sd_frame->data, sd_frame->size); + } + if (CONFIG_FRAME_THREAD_ENCODER) { ret = ff_frame_thread_encoder_init(avctx); if (ret < 0) |