[FFmpeg-cvslog] avformat/utils: Make find_stream_info get side data from codec context
Nicolas Gaullier
git at videolan.org
Fri Mar 20 11:41:54 EET 2020
ffmpeg | branch: master | Nicolas Gaullier <nicolas.gaullier at cji.paris> | Thu Mar 5 09:17:22 2020 +0100| [2d6baff0c0dbd24d77321601f453bf1552fccfb9] | committer: Anton Khirnov
avformat/utils: Make find_stream_info get side data from codec context
This will allow probing input coded side data, and also forwarding them to the output.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d6baff0c0dbd24d77321601f453bf1552fccfb9
---
libavformat/utils.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index cb15f6a4b3..a58e47fabc 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3599,6 +3599,21 @@ static int extract_extradata(AVStream *st, const AVPacket *pkt)
return 0;
}
+static int add_coded_side_data(AVStream *st, AVCodecContext *avctx)
+{
+ int i;
+
+ for (i = 0; i < avctx->nb_coded_side_data; i++) {
+ const AVPacketSideData *sd_src = &avctx->coded_side_data[i];
+ uint8_t *dst_data;
+ dst_data = av_stream_new_side_data(st, sd_src->type, sd_src->size);
+ if (!dst_data)
+ return AVERROR(ENOMEM);
+ memcpy(dst_data, sd_src->data, sd_src->size);
+ }
+ return 0;
+}
+
int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
{
int i, count = 0, ret = 0, j;
@@ -4138,6 +4153,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
ret = avcodec_parameters_from_context(st->codecpar, st->internal->avctx);
if (ret < 0)
goto find_stream_info_err;
+ ret = add_coded_side_data(st, st->internal->avctx);
+ if (ret < 0)
+ goto find_stream_info_err;
#if FF_API_LOWRES
// The decoder might reduce the video size by the lowres factor.
if (st->internal->avctx->lowres && orig_w) {
More information about the ffmpeg-cvslog
mailing list