From patchwork Fri Feb 19 07:50:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25785 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 BEDC6447D4B for ; Fri, 19 Feb 2021 09:50:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98EEA68A132; Fri, 19 Feb 2021 09:50:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB00B689A8B for ; Fri, 19 Feb 2021 09:50:35 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id t15so6542353wrx.13 for ; Thu, 18 Feb 2021 23:50:35 -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:reply-to:mime-version :content-transfer-encoding; bh=GlX3VGswAZD9YRBGMVvbyqHoSw9OVz8guE4JPJbEji8=; b=j1gUZErEJIFVaxQGD+7QTzjU62MmOXTL11hy7hALcYEfyTxTCEs0VxDZNbN4j+X0Jh vG6pOPVQsQidRtZlTgeepKHbg4JB/YApMME26ZbrbPzzRZ+f81EapkhY0UUJB2a2G+kh ZYFoB7Nju9lYyqEWUjR8G/BP6jXMohPIn+zLSfBWNy2T5CsoQE0iP5BLDF+/7GUlzbNy gBHrVpfeIPquViOGS1UOJQbyx1mWw94MXj4wp7sNyxbHa0K4Q4ea/Py4eP43T2hL1hi9 1ovmisrybqWxMCpbH37ZEXVvEY/Xp1uZc6/kTJjE9/RKRMFqpJ3Mq36h/LwNqDEgvgbk Rsdg== 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:reply-to :mime-version:content-transfer-encoding; bh=GlX3VGswAZD9YRBGMVvbyqHoSw9OVz8guE4JPJbEji8=; b=PMLxITPm0f5qdw41dFQdRW/02oYrmwl4870z0PP1lEu+MUvu52ygGADUYc6ZsBqbHW cm5dUicsEiZDcSNGRbeHhxzIGDCOOUix9ujXpDt+M7wMtAaOkUdlhxfoKDuEznf7WoW3 Cj9mLf7/dxlIRT1w5Di3/6PTA8n3/AiGAnL+JJydok5Kfavh8fKAbv0Zm8cCBKxbItA3 kZDSKhUOqEegpXlLFzzH3AEfQWCydZN89KzcdgZCbSWXray7UT5kkqq/E+jBjV+pibHZ 6RBYdHi1L2wnhZH/2TbXt2ucpxohrGQXUw/d7JccZVTJ2Fyp/V5yxSYU4fYkgGcF/G7Y i/6g== X-Gm-Message-State: AOAM531eZWGL1/0d5AoQ7Wi1tpnNUht+W7rnpMHGd/OhF94k7Xf+OQda cppXZwX4hJQNVr5WEQ2tOI8qouYdpGU= X-Google-Smtp-Source: ABdhPJw/ynBaIcNXBh8XC09vNNlhw5icZDzkdcK5aNj+eUC79C5bn2gWZ62wixw49L2vJm9f+sqx1A== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr7626680wrt.411.1613721035011; Thu, 18 Feb 2021 23:50:35 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:34 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:08 +0100 Message-Id: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/15] avformat/asf: Move ff_asf_audio_conceal_none to its only user 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" It is only used inside code guarded by #ifdef DEBUG, i.e. it is normally unused. Signed-off-by: Andreas Rheinhardt --- libavformat/asf.c | 6 ------ libavformat/asf.h | 1 - libavformat/asfdec_f.c | 8 +++++++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/asf.c b/libavformat/asf.c index 719cae9da5..f1f171e6f6 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -40,12 +40,6 @@ const ff_asf_guid ff_asf_audio_stream = { 0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; -const ff_asf_guid ff_asf_audio_conceal_none = { - // 0x40, 0xa4, 0xf1, 0x49, 0x4ece, 0x11d0, 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 - // New value lifted from avifile - 0x00, 0x57, 0xfb, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b -}; - const ff_asf_guid ff_asf_audio_conceal_spread = { 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 }; diff --git a/libavformat/asf.h b/libavformat/asf.h index a30d3bb23b..bce820efae 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -74,7 +74,6 @@ extern const ff_asf_guid ff_asf_file_header; extern const ff_asf_guid ff_asf_stream_header; extern const ff_asf_guid ff_asf_ext_stream_header; extern const ff_asf_guid ff_asf_audio_stream; -extern const ff_asf_guid ff_asf_audio_conceal_none; extern const ff_asf_guid ff_asf_audio_conceal_spread; extern const ff_asf_guid ff_asf_video_stream; extern const ff_asf_guid ff_asf_jfif_media; diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index b584f60195..1484b544d9 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -143,6 +143,12 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */ 0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2 }; +static const ff_asf_guid asf_audio_conceal_none = { + // 0x40, 0xa4, 0xf1, 0x49, 0x4ece, 0x11d0, 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 + // New value lifted from avifile + 0x00, 0x57, 0xfb, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b +}; + #define PRINT_IF_GUID(g, cmp) \ if (!ff_guidcmp(g, &cmp)) \ av_log(NULL, AV_LOG_TRACE, "(GUID: %s) ", # cmp) @@ -154,7 +160,7 @@ static void print_guid(ff_asf_guid *g) else PRINT_IF_GUID(g, ff_asf_file_header); else PRINT_IF_GUID(g, ff_asf_stream_header); else PRINT_IF_GUID(g, ff_asf_audio_stream); - else PRINT_IF_GUID(g, ff_asf_audio_conceal_none); + else PRINT_IF_GUID(g, asf_audio_conceal_none); else PRINT_IF_GUID(g, ff_asf_video_stream); else PRINT_IF_GUID(g, ff_asf_video_conceal_none); else PRINT_IF_GUID(g, ff_asf_command_stream); From patchwork Fri Feb 19 07:50:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25786 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 B5C53447D4B for ; Fri, 19 Feb 2021 09:50:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 923B468A2C6; Fri, 19 Feb 2021 09:50:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD3DD68A21C for ; Fri, 19 Feb 2021 09:50:51 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id u14so6620714wri.3 for ; Thu, 18 Feb 2021 23:50:51 -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:reply-to :mime-version:content-transfer-encoding; bh=uTfZj7hHoFhCtt4GM17fkjEDaK0P4C/4kmNg6CQalRk=; b=S16uvjwc7gTRrXeLhpxALHkjxItYU/quLxjHqBrNvsQwe+q5pZ3nj8iO3S/nDL8MTL roZ+yQh+/2/VNRMvZ9SzIHqPAr64wjqcoDair3iRKbTCAz6YdAKr10cz35Ly8sJYK7m6 XYOLgGwW3jOzfIHY9li2XJthJn3Lnd+Zz4otB52kdqSBZfZytiJXFZVPFQDHXkjP8Ym0 GJdymovxrQO/t3myX2mgB8FSrssSwMz2jrxvNKWgbrlE64Y3bFLRMBnbhwVXOelm9tLL ZojQIBiec6ZIW+3CX18bnQcbYHpwY5F1qHMKDJOoQymMF4YSA1PlbsbtFEqeWWXbA4bc ayrQ== 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:reply-to:mime-version:content-transfer-encoding; bh=uTfZj7hHoFhCtt4GM17fkjEDaK0P4C/4kmNg6CQalRk=; b=Z/1WMDaHX3NLvW69EchcuNR4ffcdqR8GP8nRMfs2lKnmE37INMYu6kzYxsJHtuAwJa LaZh9npfk6guWNUtwhBKxiUfCmKXU+qtkdo1ctvVCH9XGmULWwLOAdL0jtJtRM0qgZ8w rKIgCpeCr+p2mTLKvF8gc61gCkXAyzPtPzi5Zd9WzQXXM6LGBmK3NHorCx2jxcJhkkgt oOSBUg2HDg1pD8Ba3Y83I/mMD4G1vSgf6JfHN83qIukiJ2OiHZYMZPGCK8k4LFmvkzBw tr6eD+OMysp45kUtPytDeY/u3TcGxgBDTR2v1uRcGOmjiVJy8/dM/eGVPsjHPeh7rn+R 4pMw== X-Gm-Message-State: AOAM532D0qTBCjDrT+k2kG+1BpxYvnseh+zNASWisB/bxEPIXOVSWxXX rQ8ud+X+H0rtW3NeRox0Ky1z89B5Zow= X-Google-Smtp-Source: ABdhPJwGsGNfqfRpCaVnBjCKtOri/TrMZ+PZP0tzx4L3GhU72vqBq5a3byhmpITuuh51WnrpXoZM4g== X-Received: by 2002:adf:9564:: with SMTP id 91mr6432978wrs.207.1613721051233; Thu, 18 Feb 2021 23:50:51 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:50 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:09 +0100 Message-Id: <20210219075022.2445161-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/15] avcodec/ac3tab: Remove unused ff_eac3_default_chmap 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" Added in 0c79b1402a48a99f32435a0f5ad2364c58c6fcf3 to use it a function that was never used and was itself removed in 676f1f533e2c2960d81784188592a066b9ff1c3d. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3tab.c | 13 ------------- libavcodec/ac3tab.h | 1 - 2 files changed, 14 deletions(-) diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index 99307218cc..1dcaa0e977 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -263,19 +263,6 @@ const uint16_t ff_ac3_fast_gain_tab[8]= { 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400, }; -/** - * Default channel map for a dependent substream defined by acmod - */ -const uint16_t ff_eac3_default_chmap[8] = { - AC3_CHMAP_L | AC3_CHMAP_R, // FIXME Ch1+Ch2 - AC3_CHMAP_C, - AC3_CHMAP_L | AC3_CHMAP_R, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R, - AC3_CHMAP_L | AC3_CHMAP_R | AC3_CHMAP_C_SUR, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_C_SUR, - AC3_CHMAP_L | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR -}; const uint64_t ff_eac3_custom_channel_map_locations[16][2] = { { 1, AV_CH_FRONT_LEFT }, { 1, AV_CH_FRONT_CENTER }, diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index a0036a301b..081a5906fb 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -46,7 +46,6 @@ extern const uint16_t ff_ac3_slow_gain_tab[4]; extern const uint16_t ff_ac3_db_per_bit_tab[4]; extern const int16_t ff_ac3_floor_tab[8]; extern const uint16_t ff_ac3_fast_gain_tab[8]; -extern const uint16_t ff_eac3_default_chmap[8]; extern const uint8_t ff_ac3_band_start_tab[AC3_CRITICAL_BANDS+1]; extern const uint8_t ff_ac3_bin_to_band_tab[253]; extern const uint64_t ff_eac3_custom_channel_map_locations[16][2]; From patchwork Fri Feb 19 07:50:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25787 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 B8564447D4B for ; Fri, 19 Feb 2021 09:50:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9459468A328; Fri, 19 Feb 2021 09:50:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EB496881E8 for ; Fri, 19 Feb 2021 09:50:52 +0200 (EET) Received: by mail-wr1-f48.google.com with SMTP id t15so6543691wrx.13 for ; Thu, 18 Feb 2021 23:50:52 -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:reply-to :mime-version:content-transfer-encoding; bh=3tFfX1XQPKPBhQ6pjaoHQ6hoKXfjInXUMGyF6xtAToY=; b=utBfgQf7Ujlt9J4UrroiVf+CoZwc8afPpiDiaV753wZ33Kia+31o3EfCBs79E7pf56 AsIPmonBd+ejwICVonSsTvdSwgQs8J+Ipiz59wW6drjtZoSWf2XaI+nQx4NSpuWj0Tzo XdIU5+Th44KpiwEnVxhIkD0mAqox/4uCQzvj90xH9ItY2RTbmWnk1M7F/RoRmrTIWewz 2/9opTlKXCfQPudik7yKUW+oFYiT8UGTsqIW97r6pOZoixTzRcK2Aapah0/p1BdebbUF Fto9oIdRZMIoXXIe1wIQLdb658tB60h3QcCEO0lNuWw+34irIEysn1j5Z2lxjjL/717S tZMg== 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:reply-to:mime-version:content-transfer-encoding; bh=3tFfX1XQPKPBhQ6pjaoHQ6hoKXfjInXUMGyF6xtAToY=; b=XPl48lBAZMzh8ke0QKPs/Df38Wsi0OWKxDVdz3J+RJpyGDlQTCe/+BY38UrwQeHAjG WKIJGfAhv+J+s5W9fkK/lEtrBpMRHHjr+uSYCaQw3D48kYMVn8t19D9yenfHdEdwhTGx bCZCFtStnf3e7rUGMGn+W5AjoLjyugH7fI7B9Z8w9suXz02ntahuFAyEhxiENGmNHSNO 0xjdD3B48d6gyNOp4sw9sPIoYL6+U3euZp47RS0L/LOxzLp4hQy3bvRd3R307ybDLopN xjchbaNeh7VqgE6jqn/a60pxBrvQhTRV4/H3pUcnjQyt9HOxSoPmdQhuvkwBiSJTMwsd bMMg== X-Gm-Message-State: AOAM532P1D3TXtD+gli6OjPiihbFgMrgm6QPGyTpJPg0FxpGVeAHSJyv NL7dPGLG7l5GWn3J2cmpBX5VU1goTso= X-Google-Smtp-Source: ABdhPJz/p97dr1U4Y8jA7YvZ23WjkqB1USjHqtO8eowcNT45L5kxvf8yU2b4ruUAiwumLD0Y+vubiw== X-Received: by 2002:adf:a384:: with SMTP id l4mr7972326wrb.228.1613721051909; Thu, 18 Feb 2021 23:50:51 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:51 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:10 +0100 Message-Id: <20210219075022.2445161-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/15] avcodec/mqcenc: Remove unused ff_mqc_length 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" Unused since 4624656797b667eb6405186682eb04e74dfd90fd. Signed-off-by: Andreas Rheinhardt --- libavcodec/mqc.h | 3 --- libavcodec/mqcenc.c | 5 ----- 2 files changed, 8 deletions(-) diff --git a/libavcodec/mqc.h b/libavcodec/mqc.h index 8bf7223d41..73604d5efe 100644 --- a/libavcodec/mqc.h +++ b/libavcodec/mqc.h @@ -54,9 +54,6 @@ void ff_mqc_initenc(MqcState *mqc, uint8_t *bp); /** code bit d with context cx */ void ff_mqc_encode(MqcState *mqc, uint8_t *cxstate, int d); -/** number of encoded bytes */ -int ff_mqc_length(MqcState *mqc); - /** flush the encoder [returns number of bytes encoded] */ int ff_mqc_flush(MqcState *mqc); int ff_mqc_flush_to(MqcState *mqc, uint8_t *dst, int *dst_len); diff --git a/libavcodec/mqcenc.c b/libavcodec/mqcenc.c index 7c9e1a0df9..c941f849d9 100644 --- a/libavcodec/mqcenc.c +++ b/libavcodec/mqcenc.c @@ -102,11 +102,6 @@ void ff_mqc_encode(MqcState *mqc, uint8_t *cxstate, int d) } } -int ff_mqc_length(MqcState *mqc) -{ - return mqc->bp - mqc->bpstart; -} - int ff_mqc_flush(MqcState *mqc) { setbits(mqc); From patchwork Fri Feb 19 07:50:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25788 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 4CA87447D4B for ; Fri, 19 Feb 2021 09:51:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 216A768A2B9; Fri, 19 Feb 2021 09:51:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CF1168A27A for ; Fri, 19 Feb 2021 09:50:53 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id n4so6637385wrx.1 for ; Thu, 18 Feb 2021 23:50:53 -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:reply-to :mime-version:content-transfer-encoding; bh=h/9BcAw8G9/jO31K9ZJiJ2hBWMSx/oYqL69Srqg7WPI=; b=XcOrm1/3KWu0STu4T7j+ris/zXT1HOj93cVhDZ10LmQALVWPT/pi69ka+o/gUZyOsC ZgL/yTEWnfX3FH3PlZvMjxCR7DlQqKMRG8ia6ddeX3eayPLcWHVLDtUEDT5KNKQfoFUB yRQ5d2Nbkxm3E2CxxeLdRygUsNMH84AJ/esjSdJKXZniG7tmrv4N/5uRCzmFjLrXng8W o7d6vL8Dh0IOiMEf74QzAOkNBbdadB+7fn4TppkHWdykpmXqxgSHotBDZVKPjisWdUAG cXtv3tQQrDuf5n97zaPpJQ+9qcElTgFVcfKdc4eOHWik3pWBFY2XNso4gFVgmkUbdniQ qsQQ== 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:reply-to:mime-version:content-transfer-encoding; bh=h/9BcAw8G9/jO31K9ZJiJ2hBWMSx/oYqL69Srqg7WPI=; b=oGkTSrU5OTQcAn6p27q1itJv1sIGIXdwmYdzF4Ir4i1615ZEbKnWvzkW6zez3Dd5VV SlbeqMxjuFKNquctzLt5uhiRWU6lDZhJ1PPh2ukQzlL1je1DqZEc4qERJIy3gHEQ5moK jMYXO7FiGRZ0zoOj6uuFPsBMHM+jFfPfEPs5ii94sygbgwwsIaTntkDivyQlSnnyrrT/ ehvLfCgoz553xx5rxdHqy++cSVE8eAkg3MjUUoxFnzieQrgaTqyZ4v9Xea0GFhbya9aA WPWr1hUINBm4A6QXqWLcTcnaV2/zHABodbL4Kte71QjvVUBn4/U5mJ3rUezGJ3IZKMTO qlDw== X-Gm-Message-State: AOAM533tagp+hywg34ZNiMI7kbyVSd8KieIQWoVY7XBSWz8gG6I3yT9x E+QXeY5Q8pEWi7g58qGOyDDl5qHidkw= X-Google-Smtp-Source: ABdhPJx82W+SdQ3PJwyVPDDLYFVsiAQ+ymTPqawziOjU44wfz2l1nJqINsihiyjeD6dAfbFv4GpFJA== X-Received: by 2002:a5d:4a0b:: with SMTP id m11mr7985013wrq.51.1613721052719; Thu, 18 Feb 2021 23:50:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:52 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:11 +0100 Message-Id: <20210219075022.2445161-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/15] avcodec/rangecoder: Move ff_rac_check_termination to tests/rangecoder.c 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" It is only used there. Signed-off-by: Andreas Rheinhardt --- libavcodec/rangecoder.c | 19 ------------------- libavcodec/rangecoder.h | 9 --------- libavcodec/tests/rangecoder.c | 28 +++++++++++++++++++++++++++- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index a6a3f082ef..fa7d5526d1 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -121,22 +121,3 @@ int ff_rac_terminate(RangeCoder *c, int version) return c->bytestream - c->bytestream_start; } - -int ff_rac_check_termination(RangeCoder *c, int version) -{ - if (version == 1) { - RangeCoder tmp = *c; - get_rac(c, (uint8_t[]) { 129 }); - - if (c->bytestream == tmp.bytestream && c->bytestream > c->bytestream_start) - tmp.low -= *--tmp.bytestream; - tmp.bytestream_end = tmp.bytestream; - - if (get_rac(&tmp, (uint8_t[]) { 129 })) - return AVERROR_INVALIDDATA; - } else { - if (c->bytestream_end != c->bytestream) - return AVERROR_INVALIDDATA; - } - return 0; -} diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index 4d4ca4d526..4495f6df1a 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -57,15 +57,6 @@ void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size); */ int ff_rac_terminate(RangeCoder *c, int version); -/** - * Check if at the current position there is a valid looking termination - * @param version version 0 requires the decoder to know the data size in bytes - * version 1 needs about 1 bit more space but does not need to - * carry the size from encoder to decoder - * @returns negative AVERROR code on error or non negative. - */ -int ff_rac_check_termination(RangeCoder *c, int version); - void ff_build_rac_states(RangeCoder *c, int factor, int max_p); static inline void renorm_encoder(RangeCoder *c) diff --git a/libavcodec/tests/rangecoder.c b/libavcodec/tests/rangecoder.c index d6cf9ec380..ca96e13c99 100644 --- a/libavcodec/tests/rangecoder.c +++ b/libavcodec/tests/rangecoder.c @@ -26,6 +26,32 @@ #define SIZE 1240 +/** + * Check if at the current position there is a valid looking termination + * @param version version 0 requires the decoder to know the data size in bytes + * version 1 needs about 1 bit more space but does not need to + * carry the size from encoder to decoder + * @returns negative AVERROR code on error or non negative. + */ +static int rac_check_termination(RangeCoder *c, int version) +{ + if (version == 1) { + RangeCoder tmp = *c; + get_rac(c, (uint8_t[]) { 129 }); + + if (c->bytestream == tmp.bytestream && c->bytestream > c->bytestream_start) + tmp.low -= *--tmp.bytestream; + tmp.bytestream_end = tmp.bytestream; + + if (get_rac(&tmp, (uint8_t[]) { 129 })) + return AVERROR_INVALIDDATA; + } else { + if (c->bytestream_end != c->bytestream) + return AVERROR_INVALIDDATA; + } + return 0; +} + int main(void) { RangeCoder c; @@ -61,7 +87,7 @@ int main(void) return 1; } - if (ff_rac_check_termination(&c, version) < 0) { + if (rac_check_termination(&c, version) < 0) { av_log(NULL, AV_LOG_ERROR, "rac failure at termination pass %d version %d\n", p, version); return 1; } From patchwork Fri Feb 19 07:50:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25792 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 2A05B447D4B for ; Fri, 19 Feb 2021 09:51:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 198FD68A486; Fri, 19 Feb 2021 09:51:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EE5168A31D for ; Fri, 19 Feb 2021 09:50:54 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id r21so6589838wrr.9 for ; Thu, 18 Feb 2021 23:50:54 -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:reply-to :mime-version:content-transfer-encoding; bh=kNBTPlg2Rd6rRCPIPRC8N4IYR90Bl0CI5k2C/S79TyY=; b=KGHR6FUkb9Z12orVrE1B7GJzF68KSRkXs3Mk7NPO7er2IZuzKwKH0xfTjIK6ZcZZXe wLtNb14vQ98IWDXdSRD/LBYW1Hn6UC/T0dnF1+uaR1IwChskWLYop46EJsWKcCTjCX/7 fUdbtCnX6/BxddBFaV3FbAe8UxGxKMyuYyhP3FKMEeZdOjzZx9cEkHcre7OaXsaClnm0 rjuQJ28DlspHW3GSX3U69dF7pFTPYwNf/DkV/aquQ6RE+aKSCIq5iTSCdaSl2NgnpCFi XDgFkFf3iJX231eupUi/VBBa2YT6V5pGOco6bCZgDxwdreqyBQkLpJt9aLxCF8ghCR96 0Hkg== 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:reply-to:mime-version:content-transfer-encoding; bh=kNBTPlg2Rd6rRCPIPRC8N4IYR90Bl0CI5k2C/S79TyY=; b=RQvP+bIWoHkDkWic/iNn4LISHXTMG7rJ+pmPB6+a9egfKvEOTzuPN6ITaqv5HHCZDV eg50jYoV3E94mi9WXA6PP+jvOZjbxlgw73P2kktPLRr9yEkkLhsDe6Xx8V2M4mFJOvy/ HssOSG7tG3uhnuXsPw7MjZefkkcy7hN7GG4/hQWz7M9GAd8UlFHmnfvrPdfy5Hp3Uatz Nlb1C/GqrFCctb3YfXH0V2QHUNe6cafThjjw16CUml4EZYOaUm0LbqlAXh6mHPBtsY5X 0mRDSlsqCTFt/4+G5EfZFGyRM1BYvFdLmaFcdF9uuBA3zDc7vTJ+T14s1XWHTj2Q0X7P 2KpQ== X-Gm-Message-State: AOAM531R22EmYVjHlZ3hr8n8FpzBj3eNc0woSWRalkYuZVNy06NnFjn2 Fh3qooYYiHSWE45QOrtCqkE+fiwXb2A= X-Google-Smtp-Source: ABdhPJwifwBfz6So6PGqYBh1MM/Z+gmzizYfp/sYYihbdmMccvabhpXoUgEHbr298L8+hLhYKpUZtw== X-Received: by 2002:adf:92c4:: with SMTP id 62mr7810105wrn.245.1613721053334; Thu, 18 Feb 2021 23:50:53 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:12 +0100 Message-Id: <20210219075022.2445161-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/15] avcodec/acelp_pitch_delay: Inline small functions only used once 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" ff_acelp_decode_8bit_to_1st_delay3, ff_acelp_decode_4bit_to_2nd_delay3 and ff_acelp_decode_5_6_bit_to_2nd_delay3 are all only used once (by g729dec) whereas ff_acelp_decode_9bit_to_1st_delay6 and ff_acelp_decode_6bit_to_2nd_delay6 are completely unused; with the possible exception of ff_acelp_decode_4bit_to_2nd_delay3, these functions are so small that inlining them is appropriate; and as long as ff_acelp_decode_4bit_to_2nd_delay3 is only called once, this is also true for it. Signed-off-by: Andreas Rheinhardt --- libavcodec/acelp_pitch_delay.c | 41 ------------------------------- libavcodec/acelp_pitch_delay.h | 45 +++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 52 deletions(-) diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index a070d1b25d..1eca97ec69 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -29,47 +29,6 @@ #include "celp_math.h" #include "audiodsp.h" -int ff_acelp_decode_8bit_to_1st_delay3(int ac_index) -{ - ac_index += 58; - if(ac_index > 254) - ac_index = 3 * ac_index - 510; - return ac_index; -} - -int ff_acelp_decode_4bit_to_2nd_delay3( - int ac_index, - int pitch_delay_min) -{ - if(ac_index < 4) - return 3 * (ac_index + pitch_delay_min); - else if(ac_index < 12) - return 3 * pitch_delay_min + ac_index + 6; - else - return 3 * (ac_index + pitch_delay_min) - 18; -} - -int ff_acelp_decode_5_6_bit_to_2nd_delay3( - int ac_index, - int pitch_delay_min) -{ - return 3 * pitch_delay_min + ac_index - 2; -} - -int ff_acelp_decode_9bit_to_1st_delay6(int ac_index) -{ - if(ac_index < 463) - return ac_index + 105; - else - return 6 * (ac_index - 368); -} -int ff_acelp_decode_6bit_to_2nd_delay6( - int ac_index, - int pitch_delay_min) -{ - return 6 * pitch_delay_min + ac_index - 3; -} - void ff_acelp_update_past_gain( int16_t* quant_energy, int gain_corr_factor, diff --git a/libavcodec/acelp_pitch_delay.h b/libavcodec/acelp_pitch_delay.h index 2aade2f226..73fa3c331a 100644 --- a/libavcodec/acelp_pitch_delay.h +++ b/libavcodec/acelp_pitch_delay.h @@ -41,7 +41,13 @@ * with 1/3 resolution, 19 < pitch_delay < 85 * integers only, 85 <= pitch_delay <= 143 */ -int ff_acelp_decode_8bit_to_1st_delay3(int ac_index); +static inline int ff_acelp_decode_8bit_to_1st_delay3(int ac_index) +{ + ac_index += 58; + if (ac_index > 254) + ac_index = 3 * ac_index - 510; + return ac_index; +} /** * @brief Decode pitch delay of the second subframe encoded by 5 or 6 bits @@ -58,9 +64,11 @@ int ff_acelp_decode_8bit_to_1st_delay3(int ac_index); * @remark The routine is used in G.729 @@8k, AMR @@10.2k, AMR @@7.95k, * AMR @@7.4k for the second subframe. */ -int ff_acelp_decode_5_6_bit_to_2nd_delay3( - int ac_index, - int pitch_delay_min); +static inline int ff_acelp_decode_5_6_bit_to_2nd_delay3(int ac_index, + int pitch_delay_min) +{ + return 3 * pitch_delay_min + ac_index - 2; +} /** * @brief Decode pitch delay with 1/3 precision. @@ -78,9 +86,16 @@ int ff_acelp_decode_5_6_bit_to_2nd_delay3( * @remark The routine is used in G.729 @@6.4k, AMR @@6.7k, AMR @@5.9k, * AMR @@5.15k, AMR @@4.75k for the second subframe. */ -int ff_acelp_decode_4bit_to_2nd_delay3( - int ac_index, - int pitch_delay_min); +static inline int ff_acelp_decode_4bit_to_2nd_delay3(int ac_index, + int pitch_delay_min) +{ + if (ac_index < 4) + return 3 * (ac_index + pitch_delay_min); + else if (ac_index < 12) + return 3 * pitch_delay_min + ac_index + 6; + else + return 3 * (ac_index + pitch_delay_min) - 18; +} /** * @brief Decode pitch delay of the first subframe encoded by 9 bits @@ -95,7 +110,13 @@ int ff_acelp_decode_4bit_to_2nd_delay3( * * @remark The routine is used in AMR @@12.2k for the first and third subframes. */ -int ff_acelp_decode_9bit_to_1st_delay6(int ac_index); +static inline int ff_acelp_decode_9bit_to_1st_delay6(int ac_index) +{ + if (ac_index < 463) + return ac_index + 105; + else + return 6 * (ac_index - 368); +} /** * @brief Decode pitch delay of the second subframe encoded by 6 bits @@ -111,9 +132,11 @@ int ff_acelp_decode_9bit_to_1st_delay6(int ac_index); * * @remark The routine is used in AMR @@12.2k for the second and fourth subframes. */ -int ff_acelp_decode_6bit_to_2nd_delay6( - int ac_index, - int pitch_delay_min); +static inline int ff_acelp_decode_6bit_to_2nd_delay6(int ac_index, + int pitch_delay_min) +{ + return 6 * pitch_delay_min + ac_index - 3; +} /** * @brief Update past quantized energies From patchwork Fri Feb 19 07:50:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25795 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 DC845447D4B for ; Fri, 19 Feb 2021 09:51:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C79D468A5A8; Fri, 19 Feb 2021 09:51:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C95A68A329 for ; Fri, 19 Feb 2021 09:50:54 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id t15so6543957wrx.13 for ; Thu, 18 Feb 2021 23:50:54 -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:reply-to :mime-version:content-transfer-encoding; bh=6FmxAZjoLpjxcNUF6x+5n8LzrhwbciX6TpWLyRXZVi4=; b=sHq4SAY9qrf2aPBp4rqWyrZzAnbwVZ0lheh9NkZo9/GADVBLSEROqbgBiNaHF6dShQ wRcluLmQPiCH/BSymFcNkKN1vg6IBEZIUaTTGC47Ky0T++dxVlImULVcl8uu1sxMFVIE kaLHfloi7mXMrQ2Mz/QGhAk1nO3byMA2izw7UEj3VH9kHu9qZRxGMPZGegP2gwVv2MQ8 m3m6WR2hu8/PJs/DnmqGuXsIJa5V/SCUWWmj56dSEDOAArrIlQSfNxkpo/dIqflBQe9I wMwYxJQ8IaCtfCz+NmGSVhqLxB7delkrTsnnCE2+/UI0DPWNfBFYWHfAEpO7nnbJm9MS JVhw== 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:reply-to:mime-version:content-transfer-encoding; bh=6FmxAZjoLpjxcNUF6x+5n8LzrhwbciX6TpWLyRXZVi4=; b=RvfBdag1b1D9aOtlwaIfX84Uq/W0mQbD4ShZuhN+s+qF/oQWodeORf7uJbf2sfNkw9 hcoN8WEjFoDTP+a9Mb1SQ4IThjDJ/CpWfOoXkeuPvTD3Egp6fVgxgnZxEh5RxLZGI6k1 jBi3O+hYL4fXXJDUs0JhGUfK8cGnbvEvTZyWUVaodWQ5RgGeO8qa+0d0jAx7b2Ji5Zjd 8yCZKmYCnTi5sEEhL22VT2Hd6gKKdHWyNKVKKn0oBnZ5ytX2sZMmHuVFmhzzxYso2GV5 6AHvYhBA+3Q6JiqN9ylD9FB3nx/H66msyoa71/VvQM1G45uTRmMYAyLBm2iGYyjC/p6c AW/w== X-Gm-Message-State: AOAM530mEPYSBIAB77YBphhjoVKxlhesRsb+aBSY+NHhhjBWIsPdGxmb +7vfBlo/SAss271QzOZfWpWpSDm1/aY= X-Google-Smtp-Source: ABdhPJwYDOjLy12cOCOSmIf2xnPd2X4u5f25MRHtkdCj6s+Yx6zLfupqD+eKpwXag/1ypcHfj8qy8g== X-Received: by 2002:adf:e807:: with SMTP id o7mr216734wrm.372.1613721053984; Thu, 18 Feb 2021 23:50:53 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:13 +0100 Message-Id: <20210219075022.2445161-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/15] avcodec/acelp_vectors: Remove unused ff_fc_2pulses_9bits_track1 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/acelp_vectors.c | 11 ----------- libavcodec/acelp_vectors.h | 1 - 2 files changed, 12 deletions(-) diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c index 798217d73b..0d4de0e4c3 100644 --- a/libavcodec/acelp_vectors.c +++ b/libavcodec/acelp_vectors.c @@ -28,17 +28,6 @@ #include "avcodec.h" #include "acelp_vectors.h" -const uint8_t ff_fc_2pulses_9bits_track1[16] = -{ - 1, 3, - 6, 8, - 11, 13, - 16, 18, - 21, 23, - 26, 28, - 31, 33, - 36, 38 -}; const uint8_t ff_fc_2pulses_9bits_track1_gray[16] = { 1, 3, diff --git a/libavcodec/acelp_vectors.h b/libavcodec/acelp_vectors.h index fae834dac1..c2587c5f69 100644 --- a/libavcodec/acelp_vectors.h +++ b/libavcodec/acelp_vectors.h @@ -102,7 +102,6 @@ extern const uint8_t ff_fc_4pulses_8bits_track_4[32]; * * Used in G.729 @@6.4k (with gray coding), AMR @@5.9k (without gray coding) */ -extern const uint8_t ff_fc_2pulses_9bits_track1[16]; extern const uint8_t ff_fc_2pulses_9bits_track1_gray[16]; /** From patchwork Fri Feb 19 07:50:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25797 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 6AFDC447D4B for ; Fri, 19 Feb 2021 09:51:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5932168A636; Fri, 19 Feb 2021 09:51:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BC7A68A370 for ; Fri, 19 Feb 2021 09:50:55 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id 7so6646244wrz.0 for ; Thu, 18 Feb 2021 23:50:55 -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:reply-to :mime-version:content-transfer-encoding; bh=BebTG+D08fvFcQgA9PmdJ+XUBqUDLNE4nh1diftIppA=; b=oIwImLvje0gPkHz8s0pzfWAlVsYsEuR1zU462xY3Z77IvxB5asHALredViGenWk1E4 Kf7rhvYyjFndKUCcWlqhLVIvQgpc8rpl3MaQ1+PBeCA8KXvmad72nuIyRv3lMvw7NOSV FLIMegCs4dZRnV6ZveT8QfHMy9pLvV6bOKLVHZd82KJby5fMyXRBHe5aMdf5kgyvlgvX 6hrscClQUHBZawmUfko4yqh/pz169lhuPKRE9ZkxTat91HYtEvvT5ofWet7jwMPiikyQ fBLzSbHtlbkfMW5PSkeACDlEoWGSNcyPbbt6fLFbfkYVXgSfS0xQiEfyN83v9ksjUJ9t vahg== 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:reply-to:mime-version:content-transfer-encoding; bh=BebTG+D08fvFcQgA9PmdJ+XUBqUDLNE4nh1diftIppA=; b=kAEk2Ya9MOy2giVXAuv7e06D7CDRWTkmRGkptTZ4cM9hueQJZg8fwbw/zzj3EjXrMz NF1+GdPBmYyxZ2XkT6Dlxj/3+BcyHyN87PwKJ/owBYCnos06xzyepW/u11job8H9lnJT 4zrIws+BIi81upc8eyQSdZTa/qsREKk2WdcepfVB4Wds0f41+zXsgZfM+N6orfwdTGF9 uCa1qEYuRMa/HRD1AsGy1uXDgb9px1E8TytyqL+kYUmxww0vy5gqQLaJt3/Lx4Gg7SwX tDprVyZiV+0RRM0O8R2Cdv+UVI3k9E2gm4C3u2UEoqm1Jj4AjPhmIuJl9hrsmysHaZM2 WGZQ== X-Gm-Message-State: AOAM5320fz4Z7GhUEQskyiezUw62Q4Z5qOqx+oPwbiKfmxGiQ5POnD0u U976Vtit920kZAvTAsKGQfSddXuRnng= X-Google-Smtp-Source: ABdhPJwWf2eF6UabgYOHpTnVubz/IQvHHAZIHEQdiFgVOXN+dxV/RR1ww5A8leDELcIIEVfUn0Hh5A== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr7627849wrt.411.1613721054676; Thu, 18 Feb 2021 23:50:54 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:54 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:14 +0100 Message-Id: <20210219075022.2445161-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/15] avcodec/x86/diracdsp_init: Remove unused MMX functions 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" Unused since a1f3b18bf55f106c974eacb1dc831be4d2bd5277, yet as nonstatic functions the compiler can't detect this, so that these functions aren't stripped and no warning is emitted. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/diracdsp_init.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c index 8cb84eb74c..d570238d16 100644 --- a/libavcodec/x86/diracdsp_init.c +++ b/libavcodec/x86/diracdsp_init.c @@ -77,13 +77,6 @@ void ff_dequant_subband_32_sse4(uint8_t *src, uint8_t *dst, ptrdiff_t stride, co c->PFX ## _dirac_pixels_tab[2][IDX] = ff_ ## PFX ## _dirac_pixels32_ ## EXT #define DIRAC_PIXOP(OPNAME2, OPNAME, EXT)\ -void ff_ ## OPNAME2 ## _dirac_pixels8_ ## EXT(uint8_t *dst, const uint8_t *src[5], int stride, int h)\ -{\ - if (h&3)\ - ff_ ## OPNAME2 ## _dirac_pixels8_c(dst, src, stride, h);\ - else\ - OPNAME ## _pixels8_ ## EXT(dst, src[0], stride, h);\ -}\ void ff_ ## OPNAME2 ## _dirac_pixels16_ ## EXT(uint8_t *dst, const uint8_t *src[5], int stride, int h)\ {\ if (h&3)\ From patchwork Fri Feb 19 07:50:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25799 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 89484447DFA for ; Fri, 19 Feb 2021 09:51:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CDB468A68F; Fri, 19 Feb 2021 09:51:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 216CD68A486 for ; Fri, 19 Feb 2021 09:50:56 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id n8so6573346wrm.10 for ; Thu, 18 Feb 2021 23:50:56 -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:reply-to :mime-version:content-transfer-encoding; bh=W1BU4j+jizmt9JXjXl0Xrh7SbtIrRfCfVCoysT57XEM=; b=RAQ80s1LmPU2n65q8keZYJobtbzGMPCC4qTPm3BV0p7eWwwBXGDy78XjOiMci0IYBs YjTZMcNvgKZlnCBwiylbk7+stm7g5qjo+4/ObDl3+aI/SSWlt6fq9FegWqRnOzuOyeZC T/4q8WwH6fSoyExpooHj3LLK2GSaMS3oFtMwkJdseHvZXsWZWMbKjnCF5hBcO23S/3pv QV5Gj7rgBFDD5O62M6RAXRs7N8jXRT70F44+els9xW1MwqnLNcQ7bsakpgTxS1/7DfHM ajgKPQmNTnGYMmIr5nJb5Ju9KVXeIpPqwnAAup+RcxJfTlElUuemCERUnBzJYLva5n2B HyRQ== 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:reply-to:mime-version:content-transfer-encoding; bh=W1BU4j+jizmt9JXjXl0Xrh7SbtIrRfCfVCoysT57XEM=; b=PYvTUYnTVNALnn7Uiw5ex+5FtjPIf7qPus2OA11r8RqDkWdvZYWrEzYiRHAgJb1uzT ywH2hxqh1daQG5pah2SIs4ATkHIcMRvXqLbLuTTw/xFYU6xhO2crDFrsrq8bz/+Wz20C e//AKoO/LxvRbWoRPTzMjCqEBsRz03qyqmckxEc4X+NvBZaEYIMaDIRVeFBNDiwzDvoP ROVf77HP1U/asFK0meDoCDUV2x7x7Mq7b+i6B1nN46p2VdgKjwcb5AYqArXUIftWQEn/ iyrLMYjvbFPmIGlStLYbZm390WE5J7h9BrV8gj8tSCUOep+MT97yqxmyzoVltko9ahRc uqUA== X-Gm-Message-State: AOAM530ygninEpaF3FfChgCDLFZe2dktidx6lUS1RCNcd6OZXGwl0Jmz aoajUntAn1HhbaPEcXATscPp4qFuYCE= X-Google-Smtp-Source: ABdhPJz0/Aqa0eYioVikulTo9uyfDt2wEVR6MKPdC/ho5nz4oq1scK5staTUPxfzE9J3AGiUHL5K8g== X-Received: by 2002:adf:9f10:: with SMTP id l16mr6696836wrf.0.1613721055398; Thu, 18 Feb 2021 23:50:55 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:15 +0100 Message-Id: <20210219075022.2445161-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/15] avcodec/x86_diracdsp_init: Make functions only used here static 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" This allowed to remove forward declarations. Because compilers expect declarations for all functions they encounter even when it is within blocks disabled via "if (0 && foo)", one has to use a real #if in ff_diracdsp_init_x86. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/diracdsp_init.c | 55 ++++++++++++++-------------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c index d570238d16..cd663f2d23 100644 --- a/libavcodec/x86/diracdsp_init.c +++ b/libavcodec/x86/diracdsp_init.c @@ -22,15 +22,6 @@ #include "libavcodec/diracdsp.h" #include "fpel.h" -DECL_DIRAC_PIXOP(put, mmx); -DECL_DIRAC_PIXOP(avg, mmx); -DECL_DIRAC_PIXOP(avg, mmxext); - -void ff_put_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h); -void ff_avg_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h); -void ff_put_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h); -void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h); - void ff_add_rect_clamped_mmx(uint8_t *, const uint16_t *, int, const int16_t *, int, int, int); void ff_add_rect_clamped_sse2(uint8_t *, const uint16_t *, int, const int16_t *, int, int, int); @@ -72,19 +63,21 @@ void ff_dequant_subband_32_sse4(uint8_t *src, uint8_t *dst, ptrdiff_t stride, co } #define PIXFUNC(PFX, IDX, EXT) \ - /*MMXDISABLEDc->PFX ## _dirac_pixels_tab[0][IDX] = ff_ ## PFX ## _dirac_pixels8_ ## EXT;*/ \ - c->PFX ## _dirac_pixels_tab[1][IDX] = ff_ ## PFX ## _dirac_pixels16_ ## EXT; \ - c->PFX ## _dirac_pixels_tab[2][IDX] = ff_ ## PFX ## _dirac_pixels32_ ## EXT + /*MMXDISABLEDc->PFX ## _dirac_pixels_tab[0][IDX] = PFX ## _dirac_pixels8_ ## EXT;*/ \ + c->PFX ## _dirac_pixels_tab[1][IDX] = PFX ## _dirac_pixels16_ ## EXT; \ + c->PFX ## _dirac_pixels_tab[2][IDX] = PFX ## _dirac_pixels32_ ## EXT #define DIRAC_PIXOP(OPNAME2, OPNAME, EXT)\ -void ff_ ## OPNAME2 ## _dirac_pixels16_ ## EXT(uint8_t *dst, const uint8_t *src[5], int stride, int h)\ +static void OPNAME2 ## _dirac_pixels16_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ + int stride, int h) \ {\ if (h&3)\ ff_ ## OPNAME2 ## _dirac_pixels16_c(dst, src, stride, h);\ else\ OPNAME ## _pixels16_ ## EXT(dst, src[0], stride, h);\ }\ -void ff_ ## OPNAME2 ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[5], int stride, int h)\ +static void OPNAME2 ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ + int stride, int h) \ {\ if (h&3) {\ ff_ ## OPNAME2 ## _dirac_pixels32_c(dst, src, stride, h);\ @@ -98,21 +91,24 @@ DIRAC_PIXOP(put, ff_put, mmx) DIRAC_PIXOP(avg, ff_avg, mmx) DIRAC_PIXOP(avg, ff_avg, mmxext) -void ff_put_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h) +static void put_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], + int stride, int h) { if (h&3) ff_put_dirac_pixels16_c(dst, src, stride, h); else ff_put_pixels16_sse2(dst, src[0], stride, h); } -void ff_avg_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h) +static void avg_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], + int stride, int h) { if (h&3) ff_avg_dirac_pixels16_c(dst, src, stride, h); else ff_avg_pixels16_sse2(dst, src[0], stride, h); } -void ff_put_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h) +static void put_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], + int stride, int h) { if (h&3) { ff_put_dirac_pixels32_c(dst, src, stride, h); @@ -121,7 +117,8 @@ void ff_put_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride, ff_put_pixels16_sse2(dst+16, src[0]+16, stride, h); } } -void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h) +static void avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], + int stride, int h) { if (h&3) { ff_avg_dirac_pixels32_c(dst, src, stride, h); @@ -131,23 +128,16 @@ void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride, } } -#else // HAVE_X86ASM - -#define HPEL_FILTER(MMSIZE, EXT) \ - void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, \ - const uint8_t *src, int stride, int width, int height); - -#define PIXFUNC(PFX, IDX, EXT) do {} while (0) - -#endif // HAVE_X86ASM - #if !ARCH_X86_64 HPEL_FILTER(8, mmx) #endif HPEL_FILTER(16, sse2) +#endif // HAVE_X86ASM + void ff_diracdsp_init_x86(DiracDSPContext* c) { +#if HAVE_X86ASM int mm_flags = av_get_cpu_flags(); if (EXTERNAL_MMX(mm_flags)) { @@ -175,14 +165,15 @@ void ff_diracdsp_init_x86(DiracDSPContext* c) c->add_dirac_obmc[1] = ff_add_dirac_obmc16_sse2; c->add_dirac_obmc[2] = ff_add_dirac_obmc32_sse2; - c->put_dirac_pixels_tab[1][0] = ff_put_dirac_pixels16_sse2; - c->avg_dirac_pixels_tab[1][0] = ff_avg_dirac_pixels16_sse2; - c->put_dirac_pixels_tab[2][0] = ff_put_dirac_pixels32_sse2; - c->avg_dirac_pixels_tab[2][0] = ff_avg_dirac_pixels32_sse2; + c->put_dirac_pixels_tab[1][0] = put_dirac_pixels16_sse2; + c->avg_dirac_pixels_tab[1][0] = avg_dirac_pixels16_sse2; + c->put_dirac_pixels_tab[2][0] = put_dirac_pixels32_sse2; + c->avg_dirac_pixels_tab[2][0] = avg_dirac_pixels32_sse2; } if (EXTERNAL_SSE4(mm_flags)) { c->dequant_subband[1] = ff_dequant_subband_32_sse4; c->put_signed_rect_clamped[1] = ff_put_signed_rect_clamped_10_sse4; } +#endif } From patchwork Fri Feb 19 07:50:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25800 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 A460D447DFA for ; Fri, 19 Feb 2021 09:51:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D89A68A6E7; Fri, 19 Feb 2021 09:51:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A56D568A27A for ; Fri, 19 Feb 2021 09:50:56 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id u14so6621320wri.3 for ; Thu, 18 Feb 2021 23:50:56 -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:reply-to :mime-version:content-transfer-encoding; bh=5iL9i7FNFjtMYmMXMvbkOYuNNbpcxlVN3zOlVAYPaBk=; b=oaLVJVa/7Wb6kpSKhaS4dtBgaQYTUqphYwANdJz3HwjITh5HfNOoGYCuDwLLTUGC7T RX0mRaM+7QsajrqGreWcwxuwOKxVOkWng54WEv+2jXHNl74vQ1Vd7pAInshGneG1EweP +/1EPNMh4N4RqnAtcnMRUEzL5Si90J6m4OYG/N2AhogZhxVi//hUEu8D7gLItamg8OUy PIkgNhKsV+zqfPRS22Vq9vTgnhlod23PXyjBtDfkFv3WWejpR52q6Sun7cCDZJzvZpw+ ugmFsLxuXpYfvKtRXQaHlaPwLTcFVkRkqGrLUOMk5xgHPFqMeoWYYcLOjKrLu10fDw1c 0ybw== 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:reply-to:mime-version:content-transfer-encoding; bh=5iL9i7FNFjtMYmMXMvbkOYuNNbpcxlVN3zOlVAYPaBk=; b=o37EVxluSp66ZeGKDddzV7MDs+v3zsJt6+7o6KNqj+kOF2Zoy48ycbe3cYtSJub29t BXNnS+2PuyONZv3jAW5FvHPoOb7308oMiLjMaH8gbVYDrw2h/F7svlOt2DgodAJ+BMeS 8HBTEVgbBt4OhLFN1NgYLLtWQfoMp/JRV5D1p9giiLFeKbISz1R5dD/yOovKXFLfJy1H hl4xicSc8By/LoZSaTQlgFVeghdak0jHrxCNKWpt9GFHPN1Jqz6G0JZ5n/oq499nc01U 9IBg1hWOlCJEC++w1k6xW25r0Zc0r/WoehUpr5NxgWtlcbaq7prknZGtqfehw0S5JUX3 sB5Q== X-Gm-Message-State: AOAM530I3v4Lw/Wl3tmGLcRE/vWknkqhtq/fWa9yA1+5ImtDmpCa3sC8 yJJWcUAnttCCS+aIWYbpWlhg44+L1e4= X-Google-Smtp-Source: ABdhPJzllpBU92NnXkOlDPBGCZijvsbSVr897KMdbyIalIN0uApIsF49Fln1LKNUXSTtKts7X40ryw== X-Received: by 2002:adf:a196:: with SMTP id u22mr7767363wru.416.1613721056061; Thu, 18 Feb 2021 23:50:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:16 +0100 Message-Id: <20210219075022.2445161-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] avcodec/x86/diracdsp_init: Simplify macro 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/diracdsp_init.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c index cd663f2d23..8633c66743 100644 --- a/libavcodec/x86/diracdsp_init.c +++ b/libavcodec/x86/diracdsp_init.c @@ -67,29 +67,29 @@ void ff_dequant_subband_32_sse4(uint8_t *src, uint8_t *dst, ptrdiff_t stride, co c->PFX ## _dirac_pixels_tab[1][IDX] = PFX ## _dirac_pixels16_ ## EXT; \ c->PFX ## _dirac_pixels_tab[2][IDX] = PFX ## _dirac_pixels32_ ## EXT -#define DIRAC_PIXOP(OPNAME2, OPNAME, EXT)\ -static void OPNAME2 ## _dirac_pixels16_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ - int stride, int h) \ +#define DIRAC_PIXOP(OPNAME, EXT)\ +static void OPNAME ## _dirac_pixels16_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ + int stride, int h) \ {\ if (h&3)\ - ff_ ## OPNAME2 ## _dirac_pixels16_c(dst, src, stride, h);\ + ff_ ## OPNAME ## _dirac_pixels16_c(dst, src, stride, h);\ else\ - OPNAME ## _pixels16_ ## EXT(dst, src[0], stride, h);\ + ff_ ## OPNAME ## _pixels16_ ## EXT(dst, src[0], stride, h);\ }\ -static void OPNAME2 ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ - int stride, int h) \ +static void OPNAME ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ + int stride, int h) \ {\ if (h&3) {\ - ff_ ## OPNAME2 ## _dirac_pixels32_c(dst, src, stride, h);\ + ff_ ## OPNAME ## _dirac_pixels32_c(dst, src, stride, h);\ } else {\ - OPNAME ## _pixels16_ ## EXT(dst , src[0] , stride, h);\ - OPNAME ## _pixels16_ ## EXT(dst+16, src[0]+16, stride, h);\ + ff_ ## OPNAME ## _pixels16_ ## EXT(dst , src[0] , stride, h);\ + ff_ ## OPNAME ## _pixels16_ ## EXT(dst+16, src[0]+16, stride, h);\ }\ } -DIRAC_PIXOP(put, ff_put, mmx) -DIRAC_PIXOP(avg, ff_avg, mmx) -DIRAC_PIXOP(avg, ff_avg, mmxext) +DIRAC_PIXOP(put, mmx) +DIRAC_PIXOP(avg, mmx) +DIRAC_PIXOP(avg, mmxext) static void put_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h) From patchwork Fri Feb 19 07:50:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25801 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 A7134447DFA for ; Fri, 19 Feb 2021 09:51:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8888868A6EB; Fri, 19 Feb 2021 09:51:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F55968A552 for ; Fri, 19 Feb 2021 09:50:57 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id u14so6621404wri.3 for ; Thu, 18 Feb 2021 23:50:57 -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:reply-to :mime-version:content-transfer-encoding; bh=84XvOgodt+/+VZZa14itWpR5osCKPZhCnUT4ujbuSAU=; b=NkZsjNPV/yRyhUtYbsXlRXCSKPH09P2F8FrpzlqF8rx7L5tl46SAWYFdLFP/0zdU03 rmeQS/uGK7EsO3xyYg1uz20rkm4kckpZ99jHI9wAB1Eu3nJywZlxEkKVshNGg3K9Ocur NJS9QW0aAnB0UQA6+i9VnRiLZid62cmWqkNXOb9olqs8aZfIC7t14hjvQK8Fy/Piu+Oq vt2TB/y9NCOTR7jWirmTTWZTb0mP0w066MbIHpL8+MQr2JrutWV6wbNAod2ZYwa845VB IVxauZXX85/SSFUK/bRvgC7n+1ifpPiabB8WJm6V3d4d9h6eaC/evSeJNxbPKBHWezU7 ZqFw== 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:reply-to:mime-version:content-transfer-encoding; bh=84XvOgodt+/+VZZa14itWpR5osCKPZhCnUT4ujbuSAU=; b=XR5d8sdnOi4QZfM8sQE+O7VOOGBnM3PWTp5IpX5eqPEDmXa2V2dYaoD7NTO2O2ImaC y4eojQmTun7gS33c26VZ2s+ckRJnJrIvygs05i6DczQwkLHL/Z7Fs51sDcOqbBEkUR/j 2KFdBu793xLhit6rAzVxK1/v+f/lT6VSL2tEtkql3lU88Q41VbC0lrKXI+6KzuPOZehr xaX6ikx42YmgNLOcAkS1ImFOeH3jjLLVGK0NYPZaDHazyEJORRee+P4+XkPyD2UItAr1 kQLDcieSNXhlEnMwy4pVIosTXk9NZefxgw93nskzahkb0PgI11lq+n62XET2njUtaBND uMNQ== X-Gm-Message-State: AOAM533N6A0+g9AvBgWIAJfDPWrvje1aH54wFFqU1YJvCs3dh+h1/uXK YOM5jTM6vPYKxCpvZiOE/rFbStiXpK8= X-Google-Smtp-Source: ABdhPJynUB0aUjVEIT3yoYF6+iTgpLati4RHqKKQl5ivTjreotGnlGOlMPysssjtxowEd8BupsuUjQ== X-Received: by 2002:a5d:44d2:: with SMTP id z18mr7853478wrr.26.1613721056744; Thu, 18 Feb 2021 23:50:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:17 +0100 Message-Id: <20210219075022.2445161-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/15] avcodec/x86/diracdsp_init: Reuse macro 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/diracdsp_init.c | 38 ++-------------------------------- 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c index 8633c66743..8baacf3129 100644 --- a/libavcodec/x86/diracdsp_init.c +++ b/libavcodec/x86/diracdsp_init.c @@ -91,42 +91,8 @@ DIRAC_PIXOP(put, mmx) DIRAC_PIXOP(avg, mmx) DIRAC_PIXOP(avg, mmxext) -static void put_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], - int stride, int h) -{ - if (h&3) - ff_put_dirac_pixels16_c(dst, src, stride, h); - else - ff_put_pixels16_sse2(dst, src[0], stride, h); -} -static void avg_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], - int stride, int h) -{ - if (h&3) - ff_avg_dirac_pixels16_c(dst, src, stride, h); - else - ff_avg_pixels16_sse2(dst, src[0], stride, h); -} -static void put_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], - int stride, int h) -{ - if (h&3) { - ff_put_dirac_pixels32_c(dst, src, stride, h); - } else { - ff_put_pixels16_sse2(dst , src[0] , stride, h); - ff_put_pixels16_sse2(dst+16, src[0]+16, stride, h); - } -} -static void avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], - int stride, int h) -{ - if (h&3) { - ff_avg_dirac_pixels32_c(dst, src, stride, h); - } else { - ff_avg_pixels16_sse2(dst , src[0] , stride, h); - ff_avg_pixels16_sse2(dst+16, src[0]+16, stride, h); - } -} +DIRAC_PIXOP(put, sse2) +DIRAC_PIXOP(avg, sse2) #if !ARCH_X86_64 HPEL_FILTER(8, mmx) From patchwork Fri Feb 19 07:50:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25802 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 E72D9447DFA for ; Fri, 19 Feb 2021 09:51:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D170868A494; Fri, 19 Feb 2021 09:51:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A27368A53C for ; Fri, 19 Feb 2021 09:50:58 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id r21so6590276wrr.9 for ; Thu, 18 Feb 2021 23:50:58 -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:reply-to :mime-version:content-transfer-encoding; bh=rkwE0suozpzchk4zDsubTTmLlDz4lQBhkGMOCZGQXqg=; b=AmlqMt2XlmbFAML/OMYT/i81A8tpbAz8SV5NWCcHYYdjHqneqroXnITZSGg0bsRVHh iJWG3oX/xgH+pKrYnN8vGeFkxihWUgeIF83redt7giFvpW3sL/zVxSVxPb74hCj/UoXG prxumxq5uW+AJcTImC1gyfFZvisdP9pBWECxkJQUFuE1holR/1bM6WqzqrNkQJZJEIxI EF6tfqrxJpUiFbGlFOmmgrwl2mX4MCCvzznwjWO7at7ZlUg9f8+hyd28j2p9yV9JzisB ubwWUzDa62UaiONLvpEHR8/RpdYv0eKAP+m0el3bbj3gRD1HzBMwOdbKMHg7+jlu3bQk pltw== 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:reply-to:mime-version:content-transfer-encoding; bh=rkwE0suozpzchk4zDsubTTmLlDz4lQBhkGMOCZGQXqg=; b=UJmVJjZC5GAxovDXXH0ZJ3pJ9RTA9V+KHHwJra9ihJctfOy+bgA+DSFoVIo5HAWXhr YoRJV7ILtgeIfh5kd0zRCXRt5JdKKvEu0QHaD9zEDwZ/uImCKEsrSiyQIqPmW6pPuDp2 QMkSweYIUKu6Ga2ccTD5/O7KwG6hTqB9V3rnWPC6azsEvIxV49OPcIIz5Mp1yJCt9cDB V+Zw5/NsPMJ52dBYlXueHvi7rF48WI5eADTfHJjEaIJGJL46f5Vw4mkyziCjcLq1RFHg bYNapcb1IMiKvK0OuGqPeovVzvFmTqd/7S1SazFLe1+2zjtxyCkgOrEpy8Gy/lK5gQv1 Rjkw== X-Gm-Message-State: AOAM531fyFJu91ArVHiVKB3re6uY3pQKuoOUV7BGWDjQh1KtiAh8ZC2y N3CDSsCb3vpYnNY7pW2d7n4CESYksb0= X-Google-Smtp-Source: ABdhPJzqK4C0nJ2EEcwNH2xL51OT3EZOmshvdUqIyjGobOTSduwz9CXtul7UudwzxRuT35TAgnivaA== X-Received: by 2002:adf:e7c4:: with SMTP id e4mr5881540wrn.167.1613721057403; Thu, 18 Feb 2021 23:50:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:18 +0100 Message-Id: <20210219075022.2445161-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/15] avcodec/celp_math: Disable unused function 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" The code using ff_exp2 (namely ff_acelp_decode_gain_code) use it only if G729_BITEXACT is defined. So disable it if not. Signed-off-by: Andreas Rheinhardt --- Alternatively one can also remove the G729_BITEXACT code altogether. libavcodec/celp_math.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/celp_math.c b/libavcodec/celp_math.c index a96b1aed9e..920995a879 100644 --- a/libavcodec/celp_math.c +++ b/libavcodec/celp_math.c @@ -29,6 +29,7 @@ #include "celp_math.h" #include "libavutil/common.h" +#ifdef G729_BITEXACT static const uint16_t exp2a[]= { 0, 1435, 2901, 4400, 5931, 7496, 9096, 10730, @@ -54,6 +55,7 @@ int ff_exp2(uint16_t power) result= (result<<3) + ((result*exp2b[(power>>5)&31])>>17); return result + ((result*(power&31)*89)>>22); } +#endif /** * Table used to compute log2(x) From patchwork Fri Feb 19 07:50:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25794 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 EB331447D4B for ; Fri, 19 Feb 2021 09:51:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4F9F68A403; Fri, 19 Feb 2021 09:51:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B61D68A28B for ; Fri, 19 Feb 2021 09:50:58 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id v14so6603267wro.7 for ; Thu, 18 Feb 2021 23:50:58 -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:reply-to :mime-version:content-transfer-encoding; bh=Ls4hJFR+sGqyzj0Eww5QEaj2N62H0m6tkyw0TMyM4z4=; b=JzoVM05cKMEn1NI0lEfMNHtv+j0n0Ok+iGa/8ttvSlDL7tB2zLVJTT0sucZEXzfD9i LEuiu83U2/NYYRb5Y3a7zBw3rz5t5bpyjW4pGC8M1lDUXxgsyBD6ZnztfjmXn6E1MQ+J vrOsy8xBg7LohhLRy8IGB1PGckWKwzL7oRmxnkbKcB1wcwOptNt7hq88Bkh9LVPgmwu1 ExK6Vc1/DHjFXXmL4bhP/ae76yvufhQcua0UcYWl6BGStTrtSq4Taz9Com3d42TIO/xa KVDJDQhrL7xisycXV/hLWcHzfT/hDefGJuKY6JC+yDoLHDcAGNCVoFI4bFbx2g9WOhGl 5hWg== 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:reply-to:mime-version:content-transfer-encoding; bh=Ls4hJFR+sGqyzj0Eww5QEaj2N62H0m6tkyw0TMyM4z4=; b=PcmMPKFzKEvmag8SKZrcDSvB3pNmZ3/Hlt/86cvT5/e+o1kjskiYus9Mctg0t/XKM6 AX9GXaFJBIfMou07cUOVUpsABo8PHEO1JwoCaxVs6LlZHmgd8eum6CDoxq3h/LiqeVp/ io9pUFCxwatLr6fjgD901uU9nRREDFpdfwjIuJAT2nYw1oKoQf6xwX3A5GCOouom1TkR Tz7SlA/G6PvQMe5YKf8CP8JDoxfXEbfxCNgIVXReQDboK6LLam9HMjiX5775GE25GPnJ jxZhz304yxRraQjzZWOzUGXJsCdoBzL1vwPrO7AkfO2a7Dkbpm8CTCNpYg3Rf0Kt5x7p vlWg== X-Gm-Message-State: AOAM532XtUKpbUZepdsycjWZ+lhnkGJQnzloamZfG2bZpSL5WXEE7Ns/ aNROKoLZjKH8QFO83Ep4HxaSCQE7teM= X-Google-Smtp-Source: ABdhPJwKPmK9ssIWkIv0n46AeLDMHnYff6k5YIpIudWlc1UJi7RM7zSzJhgaxPvs4orllSGE4M5+FQ== X-Received: by 2002:adf:b60f:: with SMTP id f15mr7975219wre.83.1613721058052; Thu, 18 Feb 2021 23:50:58 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:19 +0100 Message-Id: <20210219075022.2445161-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/15] swscale/x86/yuv2rgb: Remove unused ASM constants 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" mmx_grnmask is unused since 531f97b0c32d1d421f3ac614e002c53951658115, the other constants since e934194b6a4159b7960cabefb0dd8b998c1961e8. Signed-off-by: Andreas Rheinhardt --- libswscale/x86/yuv2rgb.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 2143026a0d..47f45bd7c2 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -41,14 +41,6 @@ #define DITHER1XBPP // only for MMX -/* hope these constant values are cache line aligned */ -DECLARE_ASM_CONST(8, uint64_t, mmx_00ffw) = 0x00ff00ff00ff00ffULL; -DECLARE_ASM_CONST(8, uint64_t, mmx_redmask) = 0xf8f8f8f8f8f8f8f8ULL; -DECLARE_ASM_CONST(8, uint64_t, mmx_grnmask) = 0xfcfcfcfcfcfcfcfcULL; -DECLARE_ASM_CONST(8, uint64_t, pb_e0) = 0xe0e0e0e0e0e0e0e0ULL; -DECLARE_ASM_CONST(8, uint64_t, pb_03) = 0x0303030303030303ULL; -DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL; - //MMX versions #if HAVE_MMX #undef RENAME From patchwork Fri Feb 19 07:50:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25793 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 13EDD447D4B for ; Fri, 19 Feb 2021 09:51:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 000AE68A40E; Fri, 19 Feb 2021 09:51:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79E3C6881E8 for ; Fri, 19 Feb 2021 09:50:59 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id n4so6638091wrx.1 for ; Thu, 18 Feb 2021 23:50:59 -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:reply-to :mime-version:content-transfer-encoding; bh=z6U8froS7j0nfI3q5bgMGl6F7B/PHLY9B+/7uXb3oms=; b=RditJq+KGkHyabvPTeihjZ4uNmYKyYZb+EV5LJVFwA9i1owKbP5DWm4u4ylebfkurz n2IukO/jbeBjw4u7mlFuhtWmMTtydEWhgai9Xah5osVGV88zk2knUwHdxz4LYsBD4qVh H1tNK5VRngsnqPdixDa/cB23DexpGIy6GGHWk7HsjEbG5tV0epIrLb9/WnV1QFNtFfqj oSRtNzQM9o0y0gchpZosSkkspRPCX6PzVJjZteIbebd2TIaP/t8g+qwdeqm+rp5ucnlI peQT2eb78jNSBGOAW1c95r2gKDdV0t1TSwxTgYragMg7ZmUSdG0uaZD1Qq/H5ML7AlSU rMxg== 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:reply-to:mime-version:content-transfer-encoding; bh=z6U8froS7j0nfI3q5bgMGl6F7B/PHLY9B+/7uXb3oms=; b=qCke0g3th7/8gF5jT9RhgBBI7yeWc0tSCHUOs2mpOXkRGoLtt3nTQiWyklLG9UmKDf 76f78CD7g8EdhsbFYAYe8IIbqYmvz1OXO4XxV4OAfufJf0T6Rd5KBs7Z7zxgR5re4Hzy HNxxyDKCKkkIscS3tfTSZf0zLyjqulRrfvaDmrCtFAcP0vVfe3ixM7YAziNORJNCBQy+ 7uEKwqx2AnHeE0la32Uy/ZFcfLv0ifHbGwBdAKeYNoZbHUWwtMAd1YB/eeLELYqsTwA2 XzROZBwqED9JPhyJaYmjfBN1JNwVzqMg0b9Jt2UVzXCGgSeDGSBfwBoZGJalvg4s5kB8 TjsA== X-Gm-Message-State: AOAM531DJ4Goa4qlf0+AzcLb/gQ9q4OBXzo6rR8UI/nuD525APWYQxf8 WcU456ldyb4YVImAJ5PRW8c9F1lT+kc= X-Google-Smtp-Source: ABdhPJyPMrB5oBklJfyEAPRnjQUWmLI7Fobx9+4BrtnJv9GuBq7XEO39+Sae6KGaPWB6iTzl3vC1tQ== X-Received: by 2002:a05:6000:188b:: with SMTP id a11mr7630068wri.151.1613721058715; Thu, 18 Feb 2021 23:50:58 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:58 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:20 +0100 Message-Id: <20210219075022.2445161-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/15] swscale/x86/rgb2rgb: Remove unused ASM constants 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" mask24hh etc. are unused since f099fbf5f3ac1d6b3753fc8dfda6558572111fbd, mask32b and mask32r since 296609f859a587575b91fe9e9691f2707d6e8136, mask32g since b38d487466e68bd6baf2889017d2a751831560f0 and mask32 since f8a138be5257f751ef7d3c6b7ab534c0434e90e7. Signed-off-by: Andreas Rheinhardt --- libswscale/x86/rgb2rgb.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 4344b5f714..c38a953277 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -40,12 +40,7 @@ DECLARE_ASM_CONST(8, uint64_t, mmx_ff) = 0x00000000000000FFULL; DECLARE_ASM_CONST(8, uint64_t, mmx_null) = 0x0000000000000000ULL; -DECLARE_ASM_CONST(8, uint64_t, mmx_one) = 0xFFFFFFFFFFFFFFFFULL; -DECLARE_ASM_CONST(8, uint64_t, mask32b) = 0x000000FF000000FFULL; -DECLARE_ASM_CONST(8, uint64_t, mask32g) = 0x0000FF000000FF00ULL; -DECLARE_ASM_CONST(8, uint64_t, mask32r) = 0x00FF000000FF0000ULL; DECLARE_ASM_CONST(8, uint64_t, mask32a) = 0xFF000000FF000000ULL; -DECLARE_ASM_CONST(8, uint64_t, mask32) = 0x00FFFFFF00FFFFFFULL; DECLARE_ASM_CONST(8, uint64_t, mask3216br) = 0x00F800F800F800F8ULL; DECLARE_ASM_CONST(8, uint64_t, mask3216g) = 0x0000FC000000FC00ULL; DECLARE_ASM_CONST(8, uint64_t, mask3215g) = 0x0000F8000000F800ULL; @@ -56,9 +51,6 @@ DECLARE_ASM_CONST(8, uint64_t, mask24g) = 0xFF0000FF0000FF00ULL; DECLARE_ASM_CONST(8, uint64_t, mask24r) = 0x0000FF0000FF0000ULL; DECLARE_ASM_CONST(8, uint64_t, mask24l) = 0x0000000000FFFFFFULL; DECLARE_ASM_CONST(8, uint64_t, mask24h) = 0x0000FFFFFF000000ULL; -DECLARE_ASM_CONST(8, uint64_t, mask24hh) = 0xffff000000000000ULL; -DECLARE_ASM_CONST(8, uint64_t, mask24hhh) = 0xffffffff00000000ULL; -DECLARE_ASM_CONST(8, uint64_t, mask24hhhh) = 0xffffffffffff0000ULL; DECLARE_ASM_CONST(8, uint64_t, mask15b) = 0x001F001F001F001FULL; /* 00000000 00011111 xxB */ DECLARE_ASM_CONST(8, uint64_t, mask15rg) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000 RGx */ DECLARE_ASM_CONST(8, uint64_t, mask15s) = 0xFFE0FFE0FFE0FFE0ULL; From patchwork Fri Feb 19 07:50:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25796 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 9C4F6447D4B for ; Fri, 19 Feb 2021 09:51:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A2EC68A5D7; Fri, 19 Feb 2021 09:51:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4061868A360 for ; Fri, 19 Feb 2021 09:51:00 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id a207so6507952wmd.1 for ; Thu, 18 Feb 2021 23:51:00 -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:reply-to :mime-version:content-transfer-encoding; bh=EbGbaiFrbfe6cokDNtS6/ZLOzKATYvYWA55i716NvcY=; b=qboJHlqbuSXwcdYpzsHYa3GyncjBAmr1DlFnwiqlmZRUBUm2qCLdKY9lWwtZ2UqXMW S2DuFuUgT/zlIEVHVeHX4lcwvKJi6ZW6P6fVHP4IwxHy0JajrMpE9tb9niw4zsviTHAQ tNKcZpEOT9gF+NYIMD4DTM9UO/kg5CJ9q+nqyeazWchx9dKy2KeHtCXCLwW0l9EJ9Xcn q1Q/qmNUOOKqacsCl32nrs2bIhNtVUwAI/+9RtuQyZNrOHj/anm3KvQb8B4MWs+n4ot1 TbLgbRuBlXEKchsOKLdd33Bvt3quhw/36Ru2ETrC/PbAimZ0N6HhjoNEf2sEtRA4VzF9 w1mw== 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:reply-to:mime-version:content-transfer-encoding; bh=EbGbaiFrbfe6cokDNtS6/ZLOzKATYvYWA55i716NvcY=; b=gPccHEDGNjvd+/2GXsTtLnNr0JjBDB8E95YDAJ0HV14DWHWhIAvbETHdG06fC4hsPa WByUm7s+iPtDEzygxYujrWMIeuJ4d9YcQgAIxcBGQ7lgNuAviO0J24iTbr0SzKu3EueZ 72yO86D5DWPBMLIIf1a89KBgQamfE+ZZI+lhQlq15BB9xxB2RW1QReHMLpen+gg/nM4n 7EO1q3GYA07h3D+LqwT3Lc0TpvB+9Q514EgZkYFw2zcQuOxSos8LJdhPJdXDUOEFjgoC pOnQYvEIX7ymEo5Lq132EeP+NaJwHNhW3x/nzEaUVK8NZdvbSKNBVHjWYFKoGzNqaHWr MiYQ== X-Gm-Message-State: AOAM530lnrbXUEUrPaDSWSY/91U5eNU5aGKOCVSEHSv0LsSv/Qb8M4/s ySwLp6h94ExmnqJ+k1Geli11SHtwLoo= X-Google-Smtp-Source: ABdhPJzEBmqFkoQTR6vT6w8dYmo5az9mcVAVnuN//XhrQ6e5cS8tqVrtSShNZbzRgJgEZYWldXfYyw== X-Received: by 2002:a05:600c:4eca:: with SMTP id g10mr2438932wmq.149.1613721059355; Thu, 18 Feb 2021 23:50:59 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:59 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:21 +0100 Message-Id: <20210219075022.2445161-14-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/15] swscale/x86/swscale: Remove unused ASM constants 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" The last user of g15Mask, r15Mask, g16Mask and r16Mask was disabled in 77a416e8aab77058b542030870fd7178b62d2a62 and finally removed in 36e8de07ed62609df45d064b56501e3084d25723; b15Mask and b16Mask were apparently always unused (except for in_asm_used_var_warning_killer, a function that only existed to make the compiler not optimize ASM constants away). w10 is unused since d604bab901f6dfaaad672ef2164e42b1f350474c, w02 since ef423a661818f3c0d8206a2abbc65ff555cc0c67. Signed-off-by: Andreas Rheinhardt --- libswscale/x86/swscale.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 1e865914cb..cc9e8b0155 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -44,15 +44,6 @@ const DECLARE_ALIGNED(8, uint64_t, ff_dither8)[2] = { DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL; DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL; -DECLARE_ASM_CONST(8, uint64_t, w10)= 0x0010001000100010LL; -DECLARE_ASM_CONST(8, uint64_t, w02)= 0x0002000200020002LL; - -DECLARE_ASM_CONST(8, uint64_t, b16Mask)= 0x001F001F001F001FLL; -DECLARE_ASM_CONST(8, uint64_t, g16Mask)= 0x07E007E007E007E0LL; -DECLARE_ASM_CONST(8, uint64_t, r16Mask)= 0xF800F800F800F800LL; -DECLARE_ASM_CONST(8, uint64_t, b15Mask)= 0x001F001F001F001FLL; -DECLARE_ASM_CONST(8, uint64_t, g15Mask)= 0x03E003E003E003E0LL; -DECLARE_ASM_CONST(8, uint64_t, r15Mask)= 0x7C007C007C007C00LL; DECLARE_ASM_ALIGNED(8, const uint64_t, ff_M24A) = 0x00FF0000FF0000FFLL; DECLARE_ASM_ALIGNED(8, const uint64_t, ff_M24B) = 0xFF0000FF0000FF00LL; From patchwork Fri Feb 19 07:50:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25798 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 802F9447DFA for ; Fri, 19 Feb 2021 09:51:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61BF568A583; Fri, 19 Feb 2021 09:51:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1162768A2BB for ; Fri, 19 Feb 2021 09:51:00 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id i7so3905330wmb.0 for ; Thu, 18 Feb 2021 23:51:00 -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:reply-to :mime-version:content-transfer-encoding; bh=6FAA5L89kFxuW0VyHv6nWOivBlU0/hvVhzQLLC9hAvk=; b=Jf83x6AbiMW084005+7ice+FC/Qj13FoYCwO6jryiM55zweuZjUnHBhRzOkvpE6jpE cR3quVem5SaYCuLedmCG9RGNkav4kVz91GWaXc1CpkEnQXKSlZXFugXx/gQWd3/0kXn+ plXLTZ4unczF5CK2f9oPEJaPVRecbsdVzRjsnUMahCFmlZjkDwt4IVBCNLTLbjow2ewH 75537aWZwuW0hcZaP6n31+XzoeyYbN5xryN/prxPe9vCLHogePQ4Xgr9zxfWj+G3G0iG 9A9wFMF1o43ZkL38/5pSey+N4DDyUUSOk4TptArM8marY28TpSeZhcYHcnTzq96aYYY1 pZuw== 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:reply-to:mime-version:content-transfer-encoding; bh=6FAA5L89kFxuW0VyHv6nWOivBlU0/hvVhzQLLC9hAvk=; b=pbZis86MfCWYI9L2KstKeGTnbqg7VkU4Dg1VTiGlMcDXn0Wv3LDoFvabPgFVMZw8ca AfkYYUn2kSM1nBm16cTICfInN6EHK8bNXKtV498bp9SlumCtcLNAju3mxdKb41SoCkiw 4QQRbXO6Ophh/s3vlIusCvrGv9tSeY5oiFbyg7ZA2uQsQBMCEQmwR4b51zseMGUHrGki xZcI9tGGELHH4hhCG+8Ja5RETv3OBa0pcPMXu8OaMHaU7C7zWi9d2FyHd+Uk6daL7r7r c+G2L0R0vmaRxSbmfAtc2VM9oI/2ofYUdF51MaU7aMzeRlWSpYfa/86A8Ik5v6PtAOX+ 0a2w== X-Gm-Message-State: AOAM530IXdMU8CdhGUKMPbUrOK+yi0MTj1G/trsQaJYSf7bltPqeGiT2 FaNfZ9SlUT8s6h9qJ7nMxNbE+IvYjnw= X-Google-Smtp-Source: ABdhPJxQM6f+BIo8vYN2zBz+nd6wbjt66X27CqOIllbCe3D3geYkmwLhgSCM0l6RSwG4A7+sK5TrJw== X-Received: by 2002:a1c:e143:: with SMTP id y64mr6164861wmg.109.1613721060225; Thu, 18 Feb 2021 23:51:00 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:59 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:22 +0100 Message-Id: <20210219075022.2445161-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/15] avcodec/x86/constants: Remove unused ff_pw_17 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" Unused since 80944df720da98d6e5ee0e355db5814735914ec9. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/constants.c | 1 - libavcodec/x86/h264_intrapred.asm | 4 ---- 2 files changed, 5 deletions(-) diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c index f2d267e85d..bc7f2b17b8 100644 --- a/libavcodec/x86/constants.c +++ b/libavcodec/x86/constants.c @@ -34,7 +34,6 @@ DECLARE_ALIGNED(16, const xmm_reg, ff_pw_8) = { 0x0008000800080008ULL, 0x000 DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_9) = { 0x0009000900090009ULL, 0x0009000900090009ULL }; DECLARE_ALIGNED(8, const uint64_t, ff_pw_15) = 0x000F000F000F000FULL; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_16) = { 0x0010001000100010ULL, 0x0010001000100010ULL }; -DECLARE_ALIGNED(16, const xmm_reg, ff_pw_17) = { 0x0011001100110011ULL, 0x0011001100110011ULL }; DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_18) = { 0x0012001200120012ULL, 0x0012001200120012ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_20) = { 0x0014001400140014ULL, 0x0014001400140014ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_32) = { 0x0020002000200020ULL, 0x0020002000200020ULL }; diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index f3aa3172f0..b36c198fbb 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -42,11 +42,7 @@ SECTION .text cextern pb_1 cextern pb_3 cextern pw_4 -cextern pw_5 cextern pw_8 -cextern pw_16 -cextern pw_17 -cextern pw_32 ;----------------------------------------------------------------------------- ; void ff_pred16x16_vertical_8(uint8_t *src, ptrdiff_t stride) From patchwork Sat Feb 20 14:36:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25840 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 3FA7844A102 for ; Sat, 20 Feb 2021 16:36:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 125E468A700; Sat, 20 Feb 2021 16:36:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7475968A64E for ; Sat, 20 Feb 2021 16:36:16 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id t15so13859326wrx.13 for ; Sat, 20 Feb 2021 06:36:16 -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=NQPzI90NWKhUIh3g18iGW7bsosyC2+ilDPbld9lZaJ0=; b=SF1zCSrphbpJBHAozm+xS9UluFsSzSdGmBrKQXsLBqWPxtWJFDXPturPfMCv5UlBfg I1emBov/r8KJuC5zhTt7UaHTfhRCSV4dylf94LHSO4k4l+7AzYMLI0Be9r/Uxl9grt1C xDlh/ww6umhNLRsJPIFRsomxOmXgOuxhmtmK8leMaQeU3Xmr2ssilSapaCmXZH+qZNsE Y99vnvVHdcV0fo7htbTXGMYRhN8HbuwcceEfDmfZc4rJ/rE4tEUbrgwhPiQgHj+dVSkt eLX+xmdydid3Dbs7jAfwKEuwLY1e3iwwZ0Z0mez4lr5SZVpnlZBxGpvKPsbG/D8m4ICB ifNQ== 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=NQPzI90NWKhUIh3g18iGW7bsosyC2+ilDPbld9lZaJ0=; b=n/nb3XvCt/MsKMk8XGIUn90MaFLY1SvUKJipKpLsZRhA/m9WTpVPCfyUgHDxP6CQhx Bw6jed8b7NyGAjWcV0lzm0DmxeKXkbp1X4eEth2uEXqEF1oyepKKJBSlem1G7WtIbK6Q sALt8sd6n+25hzoj+SNpU8rPBewHybz/fbguKNxYSgHy3+58rQGGuVdi9/BdeAs29MRI ULuIFCq2VSYBl+/BplUnW/8PtHmtQao43lDuNen4ZQWve+d5QDD/qu01RMYL7h7HqBfO YR1eLRtpt8FNfrzmXH9Gcu9shhk01GMyiXVvJ9uW0+wgObWwTTOsWRNGzSGm1dmjg9s0 KnlQ== X-Gm-Message-State: AOAM530jX/q7MLAXe/FFVeI1XUKy6B4SvTtewhdoDP6PtE6+IZe5HHVI NkJ9xIRwvtlxEwpJzjHClLo3QlDccIs= X-Google-Smtp-Source: ABdhPJygMaWjKxmCOV2wInsV3VGAjP7TwwM8UDOw+wVNfvZGNUcwcoN2i6yYFML9PKVUUqfnRPGRzA== X-Received: by 2002:a05:6000:2aa:: with SMTP id l10mr13992806wry.368.1613831775713; Sat, 20 Feb 2021 06:36:15 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id y62sm20535213wmy.9.2021.02.20.06.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Feb 2021 06:36:15 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Feb 2021 15:36:02 +0100 Message-Id: <20210220143602.76243-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/16] avcodec/rv34data: Remove rv34_dquant_tab 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" It is unused and coincides with ff_modified_quant_tab. Signed-off-by: Andreas Rheinhardt --- libavcodec/rv34data.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavcodec/rv34data.h b/libavcodec/rv34data.h index 32ecc395a8..4509e1feed 100644 --- a/libavcodec/rv34data.h +++ b/libavcodec/rv34data.h @@ -99,19 +99,6 @@ static const uint8_t rv34_quant_to_vlc_set[2][32] = { 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6 }, }; -/** - * table for obtaining the quantizer difference - * @todo Use with ff_modified_quant_tab from h263data.h. - */ -static const uint8_t rv34_dquant_tab[2][32]={ -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 -{ - 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9,10,11,12,13,14,15,16,17,18,18,19,20,21,22,23,24,25,26,27,28 -},{ - 0, 2, 3, 4, 5, 6, 7, 8, 9,10,11,13,14,15,16,17,18,19,20,21,22,24,25,26,27,28,29,30,31,31,31,26 -} -}; - /** * maximum number of macroblocks for each of the possible slice offset sizes * @todo This is the same as ff_mba_max, maybe use it instead.