From patchwork Sat Dec 5 20:33:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24361 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 0592B44B27B for ; Sat, 5 Dec 2020 22:41:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D59A668A6E6; Sat, 5 Dec 2020 22:41:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5374668A682 for ; Sat, 5 Dec 2020 22:41:28 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id f190so10110780wme.1 for ; Sat, 05 Dec 2020 12:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NFzuNHnYIEb2RwNMIQh7tTLg6Xynp7/fqnmy4NrD70M=; b=Ocl5RHGGp1/g0qs4WB+trMh/V6qfGEBUk1Yy+Cfp3OEDf2WbQdyJQc7UvhD3E4TKRR UmPkY5row3S8nDJ2Tm8TDAwmfexLqiKQ0fdJbCAOMyK675nvVDfQQdwb4gpyZET0qyTn Uv7Hc+vWPHNcX+RBQNd/oV9ZhsPHaCy2qk4/tFP8uGtcLZKDSAxvyU4eNuIQCrSCK7kq C/Aa7VifO7Hz8R9d/QPc9/6Pq/d0FYieGyDoa0qCSVEBLNqTsyb+Yg0YQktI3A+ovCwU Y8xo8uv01PhVcu3OPs1iVTPNAS0cqDiGN3hFsX5pRErwBFe/EECWpfLp5Gx9+YnbEcdr V/zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NFzuNHnYIEb2RwNMIQh7tTLg6Xynp7/fqnmy4NrD70M=; b=MWke1MVqB4ptDUa2bQSlhKvmNNG7DRtsdm7eCZ0reVARy3FY+/6O31N9oBWMcS7b4p 0RPfea41Msy5ytomqG8EQzx+ZYim96jp3CyjmeXssXt1OM+xWnxWyjNfZUqDhmPYAROt FEoNAaoUFbX/KXOs/dHbSyng9HeGlBroWp2UuqJCk6p7zvm3fOvmXSSSqWykk+/Io72Q ROm5mH3IWWGubWgt+BXuD1BWveKo7lWT1nZX4qOTI2tvjYHJxQ062CMbkzSIMqPCpb6g YIsN7AW+lbDFrWDudqJ3plVwr3OF7I835JmN2l+qnIYaGC2ntbZIq1qWwg0ZtMFbrOHY AD5w== X-Gm-Message-State: AOAM530ynTGybi4JuOnHook/Hq4IND2xfi1ZU5KbrErGmFU/Xdbp3qoT 36tSO3ogTwnk3oRgL0FZ+A/15Y5ZDNLD2g== X-Google-Smtp-Source: ABdhPJz602DJXQKsgf8pgaJ7/79WZ2j8474d1fIYd1WwBeyMCfQjUmneDQd6SrPJxuWuhqtn7Ti6XQ== X-Received: by 2002:a1c:a5d4:: with SMTP id o203mr10707719wme.41.1607200455400; Sat, 05 Dec 2020 12:34:15 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e4sm8747079wrr.32.2020.12.05.12.34.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Dec 2020 12:34:14 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Dec 2020 21:33:36 +0100 Message-Id: <20201205203340.19357-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> References: <20201205203340.19357-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/ac3enc_template: Perform compile-time checks at compile-time 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Runtime checks for whether the encoder is fixed-point or not are unnecessary here as this is a template; furthermore, there is no fixed-point EAC-3 encoder, so some checks for whether one is in EAC-3 mode can be omitted when doing fixed-point encoding. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc_template.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index cbb7f63f79..974a3f9f74 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -97,8 +97,7 @@ static void apply_mdct(AC3EncodeContext *s) s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples, s->mdct_window, AC3_WINDOW_SIZE); - if (s->fixed_point) - block->coeff_shift[ch+1] = normalize_samples(s); + block->coeff_shift[ch + 1] = normalize_samples(s); #endif s->mdct.mdct_calcw(&s->mdct, block->mdct_coef[ch+1], @@ -311,7 +310,7 @@ static void apply_channel_coupling(AC3EncodeContext *s) } } - if (CONFIG_EAC3_ENCODER && s->eac3) + if (AC3ENC_FLOAT && CONFIG_EAC3_ENCODER && s->eac3) ff_eac3_set_cpl_states(s); } @@ -383,14 +382,14 @@ int AC3_NAME(encode_frame)(AVCodecContext *avctx, AVPacket *avpkt, return ret; } - if (s->bit_alloc.sr_code == 1 || s->eac3) + if (s->bit_alloc.sr_code == 1 || (AC3ENC_FLOAT && s->eac3)) ff_ac3_adjust_frame_size(s); copy_input_samples(s, (SampleType **)frame->extended_data); apply_mdct(s); - if (s->fixed_point) + if (!AC3ENC_FLOAT) scale_coefficients(s); clip_coefficients(&s->adsp, s->blocks[0].mdct_coef[1], @@ -404,7 +403,7 @@ int AC3_NAME(encode_frame)(AVCodecContext *avctx, AVPacket *avpkt, compute_rematrixing_strategy(s); - if (!s->fixed_point) + if (AC3ENC_FLOAT) scale_coefficients(s); ff_ac3_apply_rematrixing(s);