From patchwork Thu Dec 1 16:37:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1634 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1032692vsa; Thu, 1 Dec 2016 08:38:01 -0800 (PST) X-Received: by 10.28.180.214 with SMTP id d205mr35704627wmf.131.1480610281847; Thu, 01 Dec 2016 08:38:01 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z83si1327848wmb.72.2016.12.01.08.38.01; Thu, 01 Dec 2016 08:38:01 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88D78689ED3; Thu, 1 Dec 2016 18:37:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1C44689E59 for ; Thu, 1 Dec 2016 18:37:34 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cCUMg-0000St-UR for ffmpeg-devel@ffmpeg.org; Thu, 01 Dec 2016 17:37:42 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Egdh1u01q0S5wYM01gdiyh; Thu, 01 Dec 2016 17:37:42 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 1 Dec 2016 17:37:36 +0100 Message-Id: <20161201163739.23548-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161201163739.23548-1-michael@niedermayer.cc> References: <20161201163739.23548-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/6] avformat/ffmenc: Drop ffm_write_header_codec_private_ctx() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This accesses the private encoder context, it should not be used by the current ffserver it may affect old ffserver versions but i believe there is consens that accessing the private encoder context from the muxer is completely wrong. Signed-off-by: Michael Niedermayer --- libavformat/ffmenc.c | 35 ++--------------------------------- tests/ref/lavf/ffm | 2 +- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index c89b9b3..221f0a2 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -95,35 +95,6 @@ static void write_header_chunk(AVIOContext *pb, AVIOContext *dpb, unsigned id) av_free(dyn_buf); } -static int ffm_write_header_codec_private_ctx(AVFormatContext *s, AVCodecContext *ctx, int type) -{ - AVIOContext *pb = s->pb; - AVIOContext *tmp; - char *buf = NULL; - int ret; - const AVCodec *enc = ctx->codec ? ctx->codec : avcodec_find_encoder(ctx->codec_id); - - if (!enc) { - av_log(s, AV_LOG_WARNING, "Stream codec is not found. Codec private options are not stored.\n"); - return 0; - } - if (ctx->priv_data && enc->priv_class && enc->priv_data_size) { - if ((ret = av_opt_serialize(ctx->priv_data, AV_OPT_FLAG_ENCODING_PARAM | type, - AV_OPT_SERIALIZE_SKIP_DEFAULTS, &buf, '=', ',')) < 0) - return ret; - if (buf && strlen(buf)) { - if (avio_open_dyn_buf(&tmp) < 0) { - av_free(buf); - return AVERROR(ENOMEM); - } - avio_put_str(tmp, buf); - write_header_chunk(pb, tmp, MKBETAG('C', 'P', 'R', 'V')); - } - av_free(buf); - } - return 0; -} - static int ffm_write_header_codec_ctx(AVIOContext *pb, AVCodecContext *ctx, unsigned tag, int type) { AVIOContext *tmp; @@ -280,8 +251,7 @@ static int ffm_write_header(AVFormatContext *s) if ((ret = ffm_write_recommended_config(s->pb, codec, MKBETAG('S', '2', 'V', 'I'), st->recommended_encoder_configuration)) < 0) return ret; - } else if ((ret = ffm_write_header_codec_ctx(s->pb, codec, MKBETAG('S', '2', 'V', 'I'), AV_OPT_FLAG_VIDEO_PARAM)) < 0 || - (ret = ffm_write_header_codec_private_ctx(s, codec, AV_OPT_FLAG_VIDEO_PARAM)) < 0) + } else if ((ret = ffm_write_header_codec_ctx(s->pb, codec, MKBETAG('S', '2', 'V', 'I'), AV_OPT_FLAG_VIDEO_PARAM)) < 0) return ret; break; case AVMEDIA_TYPE_AUDIO: @@ -291,8 +261,7 @@ static int ffm_write_header(AVFormatContext *s) if ((ret = ffm_write_recommended_config(s->pb, codec, MKBETAG('S', '2', 'A', 'U'), st->recommended_encoder_configuration)) < 0) return ret; - } else if ((ret = ffm_write_header_codec_ctx(s->pb, codec, MKBETAG('S', '2', 'A', 'U'), AV_OPT_FLAG_AUDIO_PARAM)) < 0 || - (ret = ffm_write_header_codec_private_ctx(s, codec, AV_OPT_FLAG_AUDIO_PARAM)) < 0) + } else if ((ret = ffm_write_header_codec_ctx(s->pb, codec, MKBETAG('S', '2', 'A', 'U'), AV_OPT_FLAG_AUDIO_PARAM)) < 0) return ret; break; default: diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index c4d7e1f..9d9d07f 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -e63c16b5f0ad5015304fc4009fdb33ca *./tests/data/lavf/lavf.ffm +15a9929d1cb7129dcaffeccf3cb2fda9 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm ./tests/data/lavf/lavf.ffm CRC=0x000e23ae