From patchwork Mon Jan 13 18:54:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 17328 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3527844A9E2 for ; Mon, 13 Jan 2020 20:55:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17CDB68B014; Mon, 13 Jan 2020 20:55:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 638F268AF30 for ; Mon, 13 Jan 2020 20:55:03 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 47xN7V5wqlzHh9C; Mon, 13 Jan 2020 18:55:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cji.paris; s=20150421; t=1578941702; bh=Bp2mvTCFP0A0F0xIEs+/1CpoeeBe26ZkGIb6H/D2Sq8=; h=From:To:Cc:Subject:Date:Message-Id; b=aP+dMC2d0bAlkA7TpwIc6LQWnHBlG7r5hUUG3aMj+Hkjs67HEDsbLbDSvExbSEDSa dY4CU3NYKoSjuq0ersLYiayjsOCu+EVcBgzozNuTX68rdvlOGye7eCAF2e1aa3Uotp 6kl3DQNnbn/6ywU7tskBPNDHuA++6i8Uqf7gHCt8= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 8617E3FA74; Mon, 13 Jan 2020 19:55:04 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jan 2020 19:54:55 +0100 Message-Id: <20200113185459.8908-2-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20200113185459.8908-1-nicolas.gaullier@cji.paris> References: <20200113185459.8908-1-nicolas.gaullier@cji.paris> Subject: [FFmpeg-devel] [PATCH v6 1/5] avformat: Add av_stream_add_coded_side_data() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will allow avformat_find_stream_info() get side data from the codec context. --- doc/APIchanges | 3 +++ libavformat/avformat.h | 11 +++++++++++ libavformat/utils.c | 15 +++++++++++++++ libavformat/version.h | 4 ++-- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 3c24dc6fbc..b3656f2671 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2020-01-13 - xxxxxxxxxx - lavf 58.36.100 - avformat.h + Add av_stream_add_coded_side_data(). + 2019-12-27 - xxxxxxxxxx - lavu 56.38.100 - eval.h Add av_expr_count_func(). diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d4d9a3b06e..4dee1a272a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2191,6 +2191,17 @@ int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, */ uint8_t *av_stream_new_side_data(AVStream *stream, enum AVPacketSideDataType type, int size); + +/** + * Add stream side_data from the coded_side_data of the supplied context. + * + * @param stream stream + * @param avctx the codec context that may contain coded_side_data + * @return >= 0 in case of success, a negative AVERROR code in case of + * failure + */ +int av_stream_add_coded_side_data(AVStream *stream, AVCodecContext *avctx); + /** * Get side information from stream. * diff --git a/libavformat/utils.c b/libavformat/utils.c index f3d71642c3..3270d971c6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -5554,6 +5554,21 @@ uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, return data; } +int av_stream_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 ff_stream_add_bitstream_filter(AVStream *st, const char *name, const char *args) { int ret; diff --git a/libavformat/version.h b/libavformat/version.h index 43f3811df1..f72fb9478a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 35 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 36 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ From patchwork Mon Jan 13 18:54:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 17329 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3CE5944A9E2 for ; Mon, 13 Jan 2020 20:55:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25A9068B01D; Mon, 13 Jan 2020 20:55:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8834868AFA8 for ; Mon, 13 Jan 2020 20:55:03 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 47xN7W1TtMzHh9P; Mon, 13 Jan 2020 18:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cji.paris; s=20150421; t=1578941703; bh=lNPfldI+OrpALn0TiX/5YXXxTwU3vRVSVjwgTz63T1o=; h=From:To:Cc:Subject:Date:Message-Id; b=ku1uDH2Ukr+REKxn5pH1b/X2Vatp8wNnXcM/oG4Mxp7TzDb7GJItV3HHW1/9t/H+4 AkUE59f9UFm+FsNnwA+FGmx1+PSSHWjF0vzZGvgIIX70Vh4f/Bq7uBpodmlFvzq7h+ nzJgZTcea/F+e7DidnJ+Q4KIeK7vGMBkQLhO4UXs= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id B72BC3FA6D; Mon, 13 Jan 2020 19:55:04 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jan 2020 19:54:56 +0100 Message-Id: <20200113185459.8908-3-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20200113185459.8908-1-nicolas.gaullier@cji.paris> References: <20200113185459.8908-1-nicolas.gaullier@cji.paris> Subject: [FFmpeg-devel] [PATCH v6 2/5] avformat/utils: Make find_stream_info get side data from codec context X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will allow probing input coded side data, and also forwarding them to the output. --- libavformat/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3270d971c6..ddc36cce1c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4135,6 +4135,9 @@ FF_ENABLE_DEPRECATION_WARNINGS ret = avcodec_parameters_from_context(st->codecpar, st->internal->avctx); if (ret < 0) goto find_stream_info_err; + ret = av_stream_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) { From patchwork Mon Jan 13 18:54:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 17330 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4C3F744A9E2 for ; Mon, 13 Jan 2020 20:55:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A84068B03E; Mon, 13 Jan 2020 20:55:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EE0C68AF30 for ; Mon, 13 Jan 2020 20:55:04 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 47xN7W41YRzHh9Q; Mon, 13 Jan 2020 18:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cji.paris; s=20150421; t=1578941703; bh=d6YisKL0/DEwLc+reuYLkV0PtlPmSVD93VW9TKFTLFA=; h=From:To:Cc:Subject:Date:Message-Id; b=IB3XA3k8O2xFDqNbT4OHMnaTG39ECtKIeeFZYZQzGVwjb5JRm0e//rZGN3TH3Yx2K cU8BXoVwIoAtaSJdmWyxrELPktr2QNwM04b7eSVqacCC8pMxgGKO/lIMWLZPO5aIOn xrl0eGqHM0hulY3buJjQkGhgLTWBPQiOH0fxvmOA= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 24E383FA74; Mon, 13 Jan 2020 19:55:05 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jan 2020 19:54:57 +0100 Message-Id: <20200113185459.8908-4-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20200113185459.8908-1-nicolas.gaullier@cji.paris> References: <20200113185459.8908-1-nicolas.gaullier@cji.paris> Subject: [FFmpeg-devel] [PATCH v6 3/5] fftools/ffmpeg: Use the new av_stream_add_coded_side_data() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This code is now shared with avformat_find_stream_info(). --- fftools/ffmpeg.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6bcd7b94d2..a513e9f3cc 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3534,19 +3534,9 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len) if (ret < 0) return ret; - if (ost->enc_ctx->nb_coded_side_data) { - int i; - - for (i = 0; i < ost->enc_ctx->nb_coded_side_data; i++) { - const AVPacketSideData *sd_src = &ost->enc_ctx->coded_side_data[i]; - uint8_t *dst_data; - - dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size); - if (!dst_data) - return AVERROR(ENOMEM); - memcpy(dst_data, sd_src->data, sd_src->size); - } - } + ret = av_stream_add_coded_side_data(ost->st, ost->enc_ctx); + if (ret < 0) + return ret; /* * Add global input side data. For now this is naive, and copies it From patchwork Mon Jan 13 18:54:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 17331 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0302144A9E2 for ; Mon, 13 Jan 2020 20:55:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1C2068B051; Mon, 13 Jan 2020 20:55:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48B1B68AF30 for ; Mon, 13 Jan 2020 20:55:04 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 47xN7W6g3qzHh9G; Mon, 13 Jan 2020 18:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cji.paris; s=20150421; t=1578941703; bh=eJjfU+qpfX3wLgaD3E+Lu5fIi48o8n73kN1Q4rejqwg=; h=From:To:Cc:Subject:Date:Message-Id; b=Sejrzcn5/5+ky4TfWuh84WSKBTDNzVs3bN5gx8RJPyhR73pNoKo1Fe3P+QZ5HkZ3E XVoq5SMU6X3hf0UwMUhHMHOyjpAXb5ZHX0JcQhQ5FeCk/5wEcL7oAdKlKEg9HDBKfk rGwtcPd25Zp+wGV2/Ot7/xiYRcN2+RL8Nj8WQyEo= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 7C81C3FA6D; Mon, 13 Jan 2020 19:55:05 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jan 2020 19:54:58 +0100 Message-Id: <20200113185459.8908-5-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20200113185459.8908-1-nicolas.gaullier@cji.paris> References: <20200113185459.8908-1-nicolas.gaullier@cji.paris> Subject: [FFmpeg-devel] [PATCH v6 4/5] avcodec/utils: Fix ff_add_cpb_side_data() add twice X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Makes it behave similarly to av_stream_add_side_data(). --- libavcodec/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ab48754a64..d9af6053bb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1978,6 +1978,11 @@ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) AVPacketSideData *tmp; AVCPBProperties *props; size_t size; + int i; + + for (i = 0; i < avctx->nb_coded_side_data; i++) + if (avctx->coded_side_data[i].type == AV_PKT_DATA_CPB_PROPERTIES) + return (AVCPBProperties *)avctx->coded_side_data[i].data; props = av_cpb_properties_alloc(&size); if (!props) From patchwork Mon Jan 13 18:54:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 17332 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 05E5344A9E2 for ; Mon, 13 Jan 2020 20:55:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E396A68B05E; Mon, 13 Jan 2020 20:55:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C63DC68AF42 for ; Mon, 13 Jan 2020 20:55:08 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 47xN7X1JvnzHh9R; Mon, 13 Jan 2020 18:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cji.paris; s=20150421; t=1578941704; bh=vtKwrSEzPPyHoydghulzTD0sWXq9FDSpHG5SumdClrM=; h=From:To:Cc:Subject:Date:Message-Id; b=hGzC1KpXte5CaV2Kckq3mNJXq9HDNgYRbARhpdQEWX7C4zImtyd9nMBk0jKumLaiq KyHG6sgBsX2/MrQYrF7N00pgH5BBammtCGuDRnSBObjte7yJYNrnICffnNKR6OHzHi oAbOc7F7dpjs8Q4aEjnUTEkS74rkTBmxE9nZKPIU= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id D6CB23FA74; Mon, 13 Jan 2020 19:55:05 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jan 2020 19:54:59 +0100 Message-Id: <20200113185459.8908-6-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20200113185459.8908-1-nicolas.gaullier@cji.paris> References: <20200113185459.8908-1-nicolas.gaullier@cji.paris> Subject: [FFmpeg-devel] [PATCH v6 5/5] avcodec/mpeg12dec: Add CPB coded side data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes mpeg2video stream copies to mpeg muxer like this: ffmpeg -i xdcamhd.mxf -c:v copy output.mpg --- libavcodec/mpeg12dec.c | 7 +++++++ tests/ref/fate/mxf-probe-d10 | 3 +++ tests/ref/fate/ts-demux | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 17f9495a1d..48ac14fafa 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1398,6 +1398,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) MpegEncContext *s = &s1->mpeg_enc_ctx; int horiz_size_ext, vert_size_ext; int bit_rate_ext; + AVCPBProperties *cpb_props; skip_bits(&s->gb, 1); /* profile and level esc*/ s->avctx->profile = get_bits(&s->gb, 3); @@ -1429,6 +1430,12 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) ff_dlog(s->avctx, "sequence extension\n"); s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; + if (cpb_props = ff_add_cpb_side_data(s->avctx)) { + cpb_props->buffer_size = FFMAX(cpb_props->buffer_size, s->avctx->rc_buffer_size); + if (s->bit_rate != 0x3FFFF*400) + cpb_props->max_bitrate = FFMAX(cpb_props->max_bitrate, s->bit_rate); + } + if (s->avctx->debug & FF_DEBUG_PICT_INFO) av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n", diff --git a/tests/ref/fate/mxf-probe-d10 b/tests/ref/fate/mxf-probe-d10 index ab564467b5..317d4ae4c5 100644 --- a/tests/ref/fate/mxf-probe-d10 +++ b/tests/ref/fate/mxf-probe-d10 @@ -50,6 +50,9 @@ DISPOSITION:clean_effects=0 DISPOSITION:attached_pic=0 DISPOSITION:timed_thumbnails=0 TAG:file_package_umid=0x060A2B340101010501010D1313000000AE86B200913105800000080046A54011 +[SIDE_DATA] +side_data_type=CPB properties +[/SIDE_DATA] [/STREAM] [STREAM] index=1 diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux index eb13ecc684..cdf34d6af0 100644 --- a/tests/ref/fate/ts-demux +++ b/tests/ref/fate/ts-demux @@ -15,7 +15,7 @@ 1, 5760, 5760, 2880, 1536, 0xbab5129c 1, 8640, 8640, 2880, 1536, 0x602f034b, S=1, 1, 0x00bd00bd 1, 11520, 11520, 2880, 906, 0x69cdcbcd -0, 32037, 36541, 1501, 114336, 0x37a215a8, S=1, 1, 0x00e000e0 +0, 32037, 36541, 1501, 114336, 0x37a215a8, S=2, 1, 0x00e000e0, 24, 0x663d0b52 0, 33538, 33538, 1501, 12560, 0xb559a3d4, F=0x0, S=1, 1, 0x00e000e0 0, 35040, 35040, 1501, 12704, 0x2614adf4, F=0x0, S=1, 1, 0x00e000e0 0, 36541, 41046, 1501, 51976, 0x9ff1dbfe, F=0x0, S=1, 1, 0x00e000e0