From patchwork Thu Dec 1 16:37:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1635 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1032623vsa; Thu, 1 Dec 2016 08:37:52 -0800 (PST) X-Received: by 10.194.60.195 with SMTP id j3mr35685733wjr.149.1480610272268; Thu, 01 Dec 2016 08:37:52 -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 ym9si847470wjc.208.2016.12.01.08.37.51; Thu, 01 Dec 2016 08:37:52 -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 3842E689EA8; 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 45650689E6B 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 1cCUMf-0000St-RE for ffmpeg-devel@ffmpeg.org; Thu, 01 Dec 2016 17:37:41 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Egdg1u01d0S5wYM01gdhy4; Thu, 01 Dec 2016 17:37:41 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 1 Dec 2016 17:37:35 +0100 Message-Id: <20161201163739.23548-2-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 2/6] avformat/ffmenc: Replace some st->codec use by codecpar 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" Note, this temporarly drops the ability to set ffmpeg encoder debug and flags2 via ffserver.conf Signed-off-by: Michael Niedermayer --- libavformat/ffmenc.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 0f23b79..c89b9b3 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -224,6 +224,7 @@ static int ffm_write_header(AVFormatContext *s) AVStream *st; AVIOContext *pb = s->pb; AVCodecContext *codec; + AVCodecParameters *codecpar; int bit_rate, i, ret; if ((ret = ff_parse_creation_time_metadata(s, &ffm->start_time, 0)) < 0) @@ -243,7 +244,7 @@ static int ffm_write_header(AVFormatContext *s) bit_rate = 0; for(i=0;inb_streams;i++) { st = s->streams[i]; - bit_rate += st->codec->bit_rate; + bit_rate += st->codecpar->bit_rate; } avio_wb32(pb, bit_rate); @@ -257,20 +258,21 @@ static int ffm_write_header(AVFormatContext *s) return AVERROR(ENOMEM); codec = st->codec; + codecpar = st->codecpar; /* generic info */ - avio_wb32(pb, codec->codec_id); - avio_w8(pb, codec->codec_type); - avio_wb32(pb, codec->bit_rate); - avio_wb32(pb, codec->flags); - avio_wb32(pb, codec->flags2); - avio_wb32(pb, codec->debug); - if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { - avio_wb32(pb, codec->extradata_size); - avio_write(pb, codec->extradata, codec->extradata_size); + avio_wb32(pb, codecpar->codec_id); + avio_w8(pb, codecpar->codec_type); + avio_wb32(pb, codecpar->bit_rate); + avio_wb32(pb, codecpar->extradata_size ? AV_CODEC_FLAG_GLOBAL_HEADER : 0); + avio_wb32(pb, 0); // flags2 + avio_wb32(pb, 0); // debug + if (codecpar->extradata_size) { + avio_wb32(pb, codecpar->extradata_size); + avio_write(pb, codecpar->extradata, codecpar->extradata_size); } write_header_chunk(s->pb, pb, MKBETAG('C', 'O', 'M', 'M')); /* specific info */ - switch(codec->codec_type) { + switch(codecpar->codec_type) { case AVMEDIA_TYPE_VIDEO: if (st->recommended_encoder_configuration) { av_log(NULL, AV_LOG_DEBUG, "writing recommended configuration: %s\n",