From patchwork Fri Dec 2 23:52:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1663 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp556046vsa; Fri, 2 Dec 2016 15:53:11 -0800 (PST) X-Received: by 10.194.113.2 with SMTP id iu2mr46831428wjb.32.1480722791819; Fri, 02 Dec 2016 15:53:11 -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 sj4si7128091wjb.0.2016.12.02.15.53.10; Fri, 02 Dec 2016 15:53:11 -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 91A18689F6F; Sat, 3 Dec 2016 01:52:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9286E689DDE for ; Sat, 3 Dec 2016 01:52:52 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cCxdU-0004hE-7w for ffmpeg-devel@ffmpeg.org; Sat, 03 Dec 2016 00:53:00 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id FBsy1u01H0S5wYM01BszSz; Sat, 03 Dec 2016 00:53:00 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 3 Dec 2016 00:52:54 +0100 Message-Id: <20161202235258.26223-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/ffmdec: Remove some st->codec uses which set encoder parameters 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" Modern ffserver should not need these Signed-off-by: Michael Niedermayer --- libavformat/ffmdec.c | 148 +++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 960e793220..9192bff507 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -405,51 +405,51 @@ static int ffm2_read_header(AVFormatContext *s) ret = av_image_check_size(codec->width, codec->height, 0, s); if (ret < 0) goto fail; - codec->gop_size = avio_rb16(pb); + avio_rb16(pb); codec->pix_fmt = avio_rb32(pb); if (!av_pix_fmt_desc_get(codec->pix_fmt)) { av_log(s, AV_LOG_ERROR, "Invalid pix fmt id: %d\n", codec->pix_fmt); codec->pix_fmt = AV_PIX_FMT_NONE; goto fail; } - codec->qmin = avio_r8(pb); - codec->qmax = avio_r8(pb); - codec->max_qdiff = avio_r8(pb); - codec->qcompress = avio_rb16(pb) / 10000.0; - codec->qblur = avio_rb16(pb) / 10000.0; - codec->bit_rate_tolerance = avio_rb32(pb); + avio_r8(pb); + avio_r8(pb); + avio_r8(pb); + avio_rb16(pb); + avio_rb16(pb); + avio_rb32(pb); avio_get_str(pb, INT_MAX, rc_eq_buf, sizeof(rc_eq_buf)); - codec->rc_eq = av_strdup(rc_eq_buf); - codec->rc_max_rate = avio_rb32(pb); - codec->rc_min_rate = avio_rb32(pb); - codec->rc_buffer_size = avio_rb32(pb); - codec->i_quant_factor = av_int2double(avio_rb64(pb)); - codec->b_quant_factor = av_int2double(avio_rb64(pb)); - codec->i_quant_offset = av_int2double(avio_rb64(pb)); - codec->b_quant_offset = av_int2double(avio_rb64(pb)); - codec->dct_algo = avio_rb32(pb); - codec->strict_std_compliance = avio_rb32(pb); - codec->max_b_frames = avio_rb32(pb); - codec->mpeg_quant = avio_rb32(pb); - codec->intra_dc_precision = avio_rb32(pb); - codec->me_method = avio_rb32(pb); - codec->mb_decision = avio_rb32(pb); - codec->nsse_weight = avio_rb32(pb); - codec->frame_skip_cmp = avio_rb32(pb); - codec->rc_buffer_aggressivity = av_int2double(avio_rb64(pb)); + + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb64(pb); codec->codec_tag = avio_rb32(pb); - codec->thread_count = avio_r8(pb); - codec->coder_type = avio_rb32(pb); - codec->me_cmp = avio_rb32(pb); - codec->me_subpel_quality = avio_rb32(pb); - codec->me_range = avio_rb32(pb); - codec->keyint_min = avio_rb32(pb); - codec->scenechange_threshold = avio_rb32(pb); - codec->b_frame_strategy = avio_rb32(pb); - codec->qcompress = av_int2double(avio_rb64(pb)); - codec->qblur = av_int2double(avio_rb64(pb)); - codec->max_qdiff = avio_rb32(pb); - codec->refs = avio_rb32(pb); + avio_r8(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb32(pb); + avio_rb32(pb); break; case MKBETAG('S', 'T', 'A', 'U'): if (f_stau++) { @@ -614,51 +614,51 @@ static int ffm_read_header(AVFormatContext *s) codec->height = avio_rb16(pb); if (av_image_check_size(codec->width, codec->height, 0, s) < 0) goto fail; - codec->gop_size = avio_rb16(pb); + avio_rb16(pb); codec->pix_fmt = avio_rb32(pb); if (!av_pix_fmt_desc_get(codec->pix_fmt)) { av_log(s, AV_LOG_ERROR, "Invalid pix fmt id: %d\n", codec->pix_fmt); codec->pix_fmt = AV_PIX_FMT_NONE; goto fail; } - codec->qmin = avio_r8(pb); - codec->qmax = avio_r8(pb); - codec->max_qdiff = avio_r8(pb); - codec->qcompress = avio_rb16(pb) / 10000.0; - codec->qblur = avio_rb16(pb) / 10000.0; - codec->bit_rate_tolerance = avio_rb32(pb); + avio_r8(pb); + avio_r8(pb); + avio_r8(pb); + avio_rb16(pb); + avio_rb16(pb); + avio_rb32(pb); avio_get_str(pb, INT_MAX, rc_eq_buf, sizeof(rc_eq_buf)); - codec->rc_eq = av_strdup(rc_eq_buf); - codec->rc_max_rate = avio_rb32(pb); - codec->rc_min_rate = avio_rb32(pb); - codec->rc_buffer_size = avio_rb32(pb); - codec->i_quant_factor = av_int2double(avio_rb64(pb)); - codec->b_quant_factor = av_int2double(avio_rb64(pb)); - codec->i_quant_offset = av_int2double(avio_rb64(pb)); - codec->b_quant_offset = av_int2double(avio_rb64(pb)); - codec->dct_algo = avio_rb32(pb); - codec->strict_std_compliance = avio_rb32(pb); - codec->max_b_frames = avio_rb32(pb); - codec->mpeg_quant = avio_rb32(pb); - codec->intra_dc_precision = avio_rb32(pb); - codec->me_method = avio_rb32(pb); - codec->mb_decision = avio_rb32(pb); - codec->nsse_weight = avio_rb32(pb); - codec->frame_skip_cmp = avio_rb32(pb); - codec->rc_buffer_aggressivity = av_int2double(avio_rb64(pb)); + + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb64(pb); codec->codec_tag = avio_rb32(pb); - codec->thread_count = avio_r8(pb); - codec->coder_type = avio_rb32(pb); - codec->me_cmp = avio_rb32(pb); - codec->me_subpel_quality = avio_rb32(pb); - codec->me_range = avio_rb32(pb); - codec->keyint_min = avio_rb32(pb); - codec->scenechange_threshold = avio_rb32(pb); - codec->b_frame_strategy = avio_rb32(pb); - codec->qcompress = av_int2double(avio_rb64(pb)); - codec->qblur = av_int2double(avio_rb64(pb)); - codec->max_qdiff = avio_rb32(pb); - codec->refs = avio_rb32(pb); + avio_r8(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb32(pb); + avio_rb64(pb); + avio_rb64(pb); + avio_rb32(pb); + avio_rb32(pb); break; case AVMEDIA_TYPE_AUDIO: codec->sample_rate = avio_rb32(pb);