From patchwork Sat Jan 23 20:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25126 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 237DF44B48E for ; Sat, 23 Jan 2021 22:48:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFE446881D4; Sat, 23 Jan 2021 22:48:14 +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 8431868084B for ; Sat, 23 Jan 2021 22:48:08 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id p15so1790070wrq.8 for ; Sat, 23 Jan 2021 12:48:08 -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=K6U2qfWi6JV8nFULDZ3vSnGEqsE3rbm99BzZaQnkiuA=; b=moi1/kfqguknSenyF9LdKwDI0vxd7TMbBM+8x1h5EVtp1uwW2vT94uVUU4h4ZGUoid wCTyjqtaYJWyDqY24/hswcVUb1MvlC4WsAxA2m8CgjJR55RASjIT/Kpq+cWsZM8HEMW3 1sdiX+RelN7npkUiOeokkfZZNUhOTSvNNdPMkOHAcRIqn7gYD7qK1T9g6JaoHZuhIJYz 5efORVSteT7CtD8DmsWe1S9LZ7diB2rWe8yzYvqBdWxE4IgxviJKBMmFzTSLDkFT+hA/ gRUpWB2m8TAjjnuojTbKuOuXam2lD66PV/2Ms3A0Url2uGqRLmH10kHIiIk9ZMorHTQS UEjQ== 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=K6U2qfWi6JV8nFULDZ3vSnGEqsE3rbm99BzZaQnkiuA=; b=V7r287j4lJ7OEAf+hGs209BUmEKS2XJHUNYErPxtCZCRlq92CVLQ2Lr4ZOgh6Ks0ai II1qlsJTY3L/UXC3w9hilKL0POLTeFQEZHqlA8h5KcTjSE1OESUGkPlNUJetn+GQKMMR inZlSc2ReR5vGTA33t8uX7oVskfY0w70RNW317K0JM1d7t7gLpx9mnVccpX/VpnmMteY hqUuX1YfHpb6qpVNvQNLBKe8nMyhJ1ImXYdq+XzB3t1EXD/ffM74zTme/rCboWoffK/f jA604uppzJa9oYc/DlLKeyADf1g4LtNb5paDNYDnXV3NdinKJZWP5l8d+MVwsl1fhaR5 WGkQ== X-Gm-Message-State: AOAM533SSzZR9KuDllKKqQq/DQAjrBQB3LESWXDm2kqL1i+S3DeXMoAR nwLIniQo0R3i6DImBy5HWIPXOpp1ZoQ= X-Google-Smtp-Source: ABdhPJzcW++MzY3nsF9zFppQCQq/cC8v0b/gZAoj17uVEDRzt0CGH/jV5PhuBfCwqGTvaGYfn7GumQ== X-Received: by 2002:a05:6000:104d:: with SMTP id c13mr342950wrx.127.1611434887829; Sat, 23 Jan 2021 12:48:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:51 +0100 Message-Id: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] avcodec/atrac3plus_data: Remove unused arrays 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" Forgotten in 58fc810d42fde26ed6c1f2996122e98ab7005849. Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac3plus_data.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/libavcodec/atrac3plus_data.h b/libavcodec/atrac3plus_data.h index b0b85c4368..05ae2b78a9 100644 --- a/libavcodec/atrac3plus_data.h +++ b/libavcodec/atrac3plus_data.h @@ -104,25 +104,6 @@ static const uint8_t atrac3p_sf_xlats[] = { 0, 1, 2, 14, 15, 3, 13, 4, 12, 5, 11, 6, 7, 9, 10, }; -static const uint8_t atrac3p_ct_huff1[4][2] = { - { 0, 1 }, { 1, 2 }, { 2, 3 }, { 3, 3 }, -}; - -static const uint8_t atrac3p_ct_huff2[8][2] = { - { 0, 2 }, { 1, 3 }, { 2, 3 }, { 3, 3 }, { 4, 3 }, { 5, 3 }, { 6, 4 }, - { 7, 4 }, -}; - -static const uint8_t atrac3p_ct_huff3[8][2] = { - { 0, 2 }, { 1, 3 }, { 2, 3 }, { 3, 3 }, { 6, 3 }, { 7, 3 }, { 4, 4 }, - { 5, 4 }, -}; - -static const uint8_t atrac3p_ct_huff4[8][2] = { - { 0, 1 }, { 1, 3 }, { 2, 4 }, { 3, 4 }, { 4, 4 }, { 5, 4 }, { 6, 4 }, - { 7, 4 }, -}; - /* weights for quantized word lengths */ static const int8_t atrac3p_wl_weights[6][32] = { { 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, From patchwork Sat Jan 23 20:47:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25127 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 2DC4144B48E for ; Sat, 23 Jan 2021 22:48:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1681C689BC9; Sat, 23 Jan 2021 22:48:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4032A688175 for ; Sat, 23 Jan 2021 22:48:27 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id i9so862743wmq.1 for ; Sat, 23 Jan 2021 12:48:27 -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=8INbiwvWen/YfONOltaZPWiXnILSeGdBekB5x+UmYso=; b=Y62o35ddiIKtR58vMpMsAsqDmlgM8FmJNfuTHCWcgJMkc5gCSn+SoJeJKy+1IBnMHz Sb1YmvD4YFY4bBkwuVCOPVbvaw6IkKXurrAMUaoIgpC+MeQN2hjDVaez9ai2srYqXQ4P QpquWaN0U1LZLq442Ww2Fry7sqrlaPJhdLGUoHWuztkDVVs2oxwPLTxH0rUfFPMPR7bh RVBbM6tBxgoOwzsuraHWpDwwCGrhhRKTo6X040j1f1MRkA1JsRRQNBTuKO8RXWxjbTbR AN89KVcWM7afETVr8267rPCiUlaVqGyFDHxCKcaSz9B92w+RhbpJLt/fNl64gvXWyJ7F 8DNQ== 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=8INbiwvWen/YfONOltaZPWiXnILSeGdBekB5x+UmYso=; b=HnPVIAJwHdA3Jw3flPuKRvTSjHgKSbrNCAWHidtC9AfIRSF7K8dh2rUwOn/EoTy4e6 1KLvgtghz+K76sjwZO8mH8zvmqvsJOMmWg+siiOTQFhvcIxL4pAChWslsQq9B5uLwNNw h9MpW0YoZMFMcLAXfgZHryxQ5whL6N2dl9fJvBWpa/6zrGI51cDpI/w+4LgG5Hd+ka6V vIfhOAncvOKW0QWKAvfmDRR5yHlGMUK/blkOWMQTV5P57IKpp7ML3vXNnlJSH4doB7AE t7/Y3vW0WrDHoBMgE0rWJJspPRoeMO9QpcxC3vwOdZ/tStMw+xxj9vdHQXeAljg4ySYS B+sQ== X-Gm-Message-State: AOAM532lQAMv2hH3gcmJXwtY+1V2ABvP0ysPx0r0QrMSX12ERXzToY/N mFerk+WV6Id9Mq2TRuNYHNtGzTFSBPU= X-Google-Smtp-Source: ABdhPJy1FFrEd0+D57DVEPiMZ/6/hiKcOBcdMDfGD34Lb4CpWCfVShsWU3dvPEeCFWBZViaIidJHCA== X-Received: by 2002:a1c:9cc5:: with SMTP id f188mr9100738wme.171.1611434906605; Sat, 23 Jan 2021 12:48:26 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:26 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:52 +0100 Message-Id: <20210123204800.689497-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10] avcodec/ilbcdata: Remove unused array 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" Never used. Signed-off-by: Andreas Rheinhardt --- libavcodec/ilbcdata.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/ilbcdata.h b/libavcodec/ilbcdata.h index 8d145bc183..b17e24df5f 100644 --- a/libavcodec/ilbcdata.h +++ b/libavcodec/ilbcdata.h @@ -60,10 +60,6 @@ static const int16_t kLpcChirpSyntDenum[] = { 32767, 29573, 26690, 24087, 21739, 19619, 17707, 15980, 14422, 13016, 11747 }; -static const int16_t LpcChirpWeightDenum[] = { - 32767, 13835, 5841, 2466, 1041, 440, 186, 78, 33, 14, 6 -}; - static const int16_t cos_tbl[64] = { 32767, 32729, 32610, 32413, 32138, 31786, 31357, 30853, 30274, 29622, 28899, 28106, 27246, 26320, 25330, 24279, From patchwork Sat Jan 23 20:47:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25128 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 2FFD844B48E for ; Sat, 23 Jan 2021 22:48:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DA8C689E8A; Sat, 23 Jan 2021 22:48:36 +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 29D5E688175 for ; Sat, 23 Jan 2021 22:48:28 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id m1so7741461wrq.12 for ; Sat, 23 Jan 2021 12:48: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:reply-to :mime-version:content-transfer-encoding; bh=wn6wOA3WcDuuP/z3MmUAY2YRt6McZsRoZM3BNHLH7Ug=; b=XGomAcCcounho8CFuVPLLQd1qm0mKV5Rp6VsN1uSlHKrlzMY6D7wYn6eHFPEtmu3PA FLNMaVsZbwt3aI4SNuUgGoC3P/dKKuTW3wWe/PLx4rmygzZ1XrftbYbvsdJAHrLZ64d7 O8xocSRwd4lBtpyIpq495LfRnzyh+OUljr2BuHuzHks3GJy2WjIWdCcULm4PZ0K2ma94 zVq1dl4I+zTyc6IzX12L8n8/VFQbp/k08adV79kNVxvzwVyha25d61stAlakKrIdnq7X UWhjQRX2m3HUQEdj2gY/hB/mgKTXkSwok5UnozfLY9YITdAgYPbuhkzVHOiRRDhc1BHd Ut7w== 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=wn6wOA3WcDuuP/z3MmUAY2YRt6McZsRoZM3BNHLH7Ug=; b=SLaapNCGOZP9G26D+2rUTDdttK0ZREvefi2iB/oTl/lmFKdEP7cYXEIfoOvzefVh1y 11/IPN1lEzuT6mZkShNHYtUblqxHE3Nroq0nfkhVypmiJm8a9ApbDoVYqQqIPLmU+6mk v0pmpAk3nZRBZU1RUyhuPxaD5pnuWBMNcB2Aau9Q4goRVYU6SyHl41OaEQn/v4fnNVYs FJeanzCJjpF3EsycJjjH8tMjCr2GULBIvnlnVHtcoQTw9+4eZWplQf0UdxKFN1G9CuXo ii3YP2ZuxDg7D71huTwwBUUdGp0BgMVK0MJWa2idlKM0f6fP6Bl2xcSz3DRpwDDmquuZ zUAA== X-Gm-Message-State: AOAM530DNF+8jAGVYSz2jIOfsKvUf0NGD08Daf2hQnCS6UGVshDlrAy/ JSSk6aqXghgkGEQEkiWxkquxC1ZykfI= X-Google-Smtp-Source: ABdhPJyYQoCsCQXw3Jh3uKOcRcUmnhu9yoQeeKmegD2chYQIGALf+YMPzBqqf3670b1lIUHeESxhPg== X-Received: by 2002:a5d:528a:: with SMTP id c10mr10277595wrv.117.1611434907518; Sat, 23 Jan 2021 12:48:27 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:27 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:53 +0100 Message-Id: <20210123204800.689497-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] avcodec/vp8data: Remove unused array 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 748f921ad1997a464fb8963d0ba2c5bb5e036b1b. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8data.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index 5e6dea7617..1fcce134eb 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -316,12 +316,6 @@ static const uint8_t vp8_pred4x4_prob_intra[10][10][9] = { }, }; -static const int8_t vp8_segmentid_tree[][2] = { - { 1, 2 }, - { -0, -1 }, // '00', '01' - { -2, -3 }, // '10', '11' -}; - static const uint8_t vp8_coeff_band[16] = { 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7 }; From patchwork Sat Jan 23 20:47:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25130 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 1151544B48E for ; Sat, 23 Jan 2021 22:48:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F044C68A0F0; Sat, 23 Jan 2021 22:48:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CEF4688175 for ; Sat, 23 Jan 2021 22:48:29 +0200 (EET) Received: by mail-wm1-f51.google.com with SMTP id o10so8468960wmc.1 for ; Sat, 23 Jan 2021 12:48:29 -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=fw6/Z/Ad6kPm1K9Y8DDm8udCf+vCl7HexXX2Pa8rVEw=; b=VlEq6FEl4Ice6EV0AOZFbtSHsLImVddpSEYiPe20hqw3avVGBi4Ze5TidB0xXZma1f A01mI1OvbnoJQ9knYPiHjHJvVaN+QevMvlgg5ir4PEON6ilY6ogH/kq4dRf1gAEUVoRl deN61T60s5O5IYHP0CWG40J/anztfy9ByHrSxeZMSdh20BlwgDthxk0eyV8WJIJVDdBX V7M54fYfcgzgCbr+DQmq8J9amtSxVgYPWkqB53NptUfh+90c54e5KIBGxA9TNwr8jQ21 9njnGyaE7ZbDLfol6yT2nt/ER2c3tXpxdXvvgIv/rLBSunnjAbcO4Spspp64HG2QrpNz idNg== 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=fw6/Z/Ad6kPm1K9Y8DDm8udCf+vCl7HexXX2Pa8rVEw=; b=ijAKdZHv42tn0orboIvHQanlH6b5SAIiqmJ4AlviaYNaFxaT+kPISxvEAh2icAgjxF 2pm2mxc4P1lyFR1CRGxAvZYT3108ekDu5nIeL4eq7MBmwPIIN9o/5sa3FN4PrBsF/Zoo eF8Tqy3+0cNv4PTgauamHlovglwhYIA1Y9CHlL/Ukh7hzXzPiKjgM/NV1bS9k+A7F7Hq f4Z+d96LNL7d33y+bj5/HrvaGzLA5AGoFc+bGVKFLjRInt9FDvLMxBMFIHoWQtZ+C6jv xOjpGvbJIGcoJetO5TY5XYwMxV6Ig4Uh4wMomEQcYQ0SYw/Svb0kOiV6UNsjp4EVFTyA JlKw== X-Gm-Message-State: AOAM533db9mVYBP5BSoAucI+HcebQKrVXIVpVaa2XohIw9MAolzIbrOr 1zDuThhTvKtPJhQEPX3/2OzfhBXCGlk= X-Google-Smtp-Source: ABdhPJzzUTpReZsvGDFHmk7gJgFlPbKrzYXa/x8XVbxXmdiqeay+WEvCDmC7hoGFvqQB1C6I0CtZ4g== X-Received: by 2002:a1c:bac1:: with SMTP id k184mr9575184wmf.17.1611434908399; Sat, 23 Jan 2021 12:48:28 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:27 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:54 +0100 Message-Id: <20210123204800.689497-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] avcodec/amrnbdata: Remove unused array 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" Always unused. Signed-off-by: Andreas Rheinhardt --- libavcodec/amrnbdata.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/amrnbdata.h b/libavcodec/amrnbdata.h index 435fd9924b..20b7a6452f 100644 --- a/libavcodec/amrnbdata.h +++ b/libavcodec/amrnbdata.h @@ -1424,11 +1424,6 @@ static const float pred_fac[LP_FILTER_ORDER] = { // fixed tables -/** - * number of pulses per mode - */ -static const uint8_t pulses_nb_per_mode[] = {2, 2, 2, 3, 4, 4, 8, 10}; - /** track start positions for algebraic code book routines */ static const uint8_t track_position[16] = { 0, 2, 0, 3, 0, 2, 0, 3, 1, 3, 2, 4, 1, 4, 1, 4 From patchwork Sat Jan 23 20:47:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25132 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 7640744B48E for ; Sat, 23 Jan 2021 22:48:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 561C568A29C; Sat, 23 Jan 2021 22:48:40 +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 1333F689AB3 for ; Sat, 23 Jan 2021 22:48:30 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id s24so8470622wmj.0 for ; Sat, 23 Jan 2021 12:48:30 -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=mauirRfSDZqRm/0FMCPdNqZ8vZX5ESAzEz1sWxSdQ8w=; b=T4x1ud/QlAU9vELDQtrEz7voNe9zu6teZJaKMZQIKYBZ0uc2fqn9Gegh0xF0Lm7uGc DPmaTvBuA89YwJ7Lkcnh693mRgUzd4y4hk5dzQxeNr2deD6brcDu9b138/oSb2EZMNz7 8qN57a3iP3ycqTcUyH6Uo53pUakxagyi1oQ6Q7MdmYEMHaKy3dF88auigsAsDNN1LSDj wiTSQxDIWnvCNrUewwSJ6p0v3dUgK/VI7njz+c9TGzNJdFYydS2e/7+7YoqMzR1gY5PG b9CODw+Th7VG2smHapvMmivT/NvOvxJE0llEiyjWDDQ/2+aJBCrdChvO3XIYWn7jb6uD I3KA== 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=mauirRfSDZqRm/0FMCPdNqZ8vZX5ESAzEz1sWxSdQ8w=; b=DHButfwp9fYDFXbItrowi2J1gYQuDKe1OmuWVkkOy8DyZJcp5XUgqLcOGAPNO4FJP3 wWOOdaBX4opagZJFcWzIbVPy2/xrS47tdZTVIEp3ZlTOMCuZj6akH/kw9lHaujfIGgD6 87EN7OVB8HqOb7I0t57fCWSdFh6uNxAAJLjZ75Za9Z6rQVYOhXDTybs2/NNSCXRXBwLI RxxDYD9DHce/GVrmBlhxU+1lqLGJwlCBcFEykifaCBvyWcrfGuyHSVEbg3H1Aze7srZR 5uT3lWkJ0d+s362BPTRcHxqPDKin3AnOLvKxOr+WrbbVTX5nvVxOucEiYCqul2pNVXWq UKTg== X-Gm-Message-State: AOAM532NoJxJ34FrsiOA5cxQlW6hLpLkdCxqvUwVY54OYZFERcB9sN77 zDU+GtZJfByZgFUqC9S65eYcbwPdPTY= X-Google-Smtp-Source: ABdhPJwVX/wH405OjTryGSTtusAEu6mtf/H+0LDFC03hKVY33rcz8hb0KYNEtIZRQHe5uEgDRFcrjw== X-Received: by 2002:a1c:6a02:: with SMTP id f2mr1526867wmc.36.1611434909431; Sat, 23 Jan 2021 12:48:29 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:55 +0100 Message-Id: <20210123204800.689497-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] avcodec/tiff_common: Remove declarations of inexistent 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/tiff_common.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/libavcodec/tiff_common.h b/libavcodec/tiff_common.h index 03558c31a3..019d23e6d5 100644 --- a/libavcodec/tiff_common.h +++ b/libavcodec/tiff_common.h @@ -79,26 +79,6 @@ double ff_tget_double(GetByteContext *gb, int le); /** Reads a byte from the bytestream using given endianness. */ unsigned ff_tget(GetByteContext *gb, int type, int le); -/** Returns an allocated string containing count - * rational values using the given separator. - */ -char *ff_trationals2str(int *rp, int count, const char *sep); - -/** Returns an allocated string containing count - * long values using the given separator. - */ -char *ff_tlongs2str(int32_t *lp, int count, const char *sep); - -/** Returns an allocated string containing count - * double values using the given separator. - */ -char *ff_tdoubles2str(double *dp, int count, const char *sep); - -/** Returns an allocated string containing count - * short values using the given separator. - */ -char *ff_tshorts2str(int16_t *sp, int count, const char *sep); - /** Adds count rationals converted to a string * into the metadata dictionary. */ From patchwork Sat Jan 23 20:47:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25133 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 3085844B48E for ; Sat, 23 Jan 2021 22:48:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14DB9689DCF; Sat, 23 Jan 2021 22:48:42 +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 F04E0688298 for ; Sat, 23 Jan 2021 22:48:30 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id l12so8451078wry.2 for ; Sat, 23 Jan 2021 12:48:30 -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=5RSuHffZC2E4qPeDPsfxEpEtrAhpn+IKEmxfE77qg7U=; b=ij6sDB6s6jwUzXAxj8IQ4k7NuSTiN7+YRMMgHrsVxkgdNfitnOD/lzNwLJn5ECC+0I yv1/hW2Ate0z6ES6og35iH/xa/naYb+miw533dh3RQP/xELfLolfw0gzkXsz4eeLrAyy HuHlnIv5epx0DNWdS2IoE2WsLpKiylmbiMqcszRS4Fe01DbGDoYjpNWScrrseRGDVCRk 2XrJbsX61KREm+CrsZ0PPILPkgjJdRk+0/oBTQJycbn8ubfwSI8+93tN9XMoG0F01O+9 n5iRHy9EqQ3wa6k5IenbKBfRDVT0N3iN2mVP75YbwGWsos7p8DqX5ePkAr+cDyfSObzd nylw== 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=5RSuHffZC2E4qPeDPsfxEpEtrAhpn+IKEmxfE77qg7U=; b=DWcKYdSoRLShb/2HkAftQZqGxyOTK7VZGjfWnzRf7N81Z1+ehqCeDgJ+NMmNr17ln8 fLvXwzRJIbwJMBB61jWDNkv0MpZ3TFSLPq+9giEd2mkXIL9HS1jkhFQlfzqdq4PG+a0k MLmYU51DWF9pHuNh/bEdk9GG+b50JtTrjfVUgM2h+2kNJrDRABPSA1fonPyBKzboW4Yq lT7ngSq32fIW4kYZvee35HZT7WAK/z2s43MIhcZzF96hYvlERuLrdVuQbLJfSzA+uVtu dlMRriuQAvs+CvXr496zobYoCX+h9T82sQ9mx2hocqEc+ogqIop0FTIs89FVe8ofYkX4 htyQ== X-Gm-Message-State: AOAM530uiGrdNLgvucwBRnL3JSQaMC5rrSFAHgiCEYYw3FgKPOFws1Yi Z94yHQe2XQY/wG15PcX5StcbPzIyvQI= X-Google-Smtp-Source: ABdhPJx8q4b+Z5g6kOla40BGJTCUC4mhhp78nTe1MphXCmcpo1nD7opnUtpfLJq4hFqTOaDbAcbPkw== X-Received: by 2002:adf:8145:: with SMTP id 63mr231771wrm.8.1611434910308; Sat, 23 Jan 2021 12:48:30 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:56 +0100 Message-Id: <20210123204800.689497-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/10] avcodec/exif: Avoid allocation for small buffer 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/exif.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/exif.c b/libavcodec/exif.c index 2874772db4..0b656fd09b 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -95,22 +95,15 @@ static int exif_decode_tag(void *logctx, GetByteContext *gbytes, int le, ret = ff_exif_decode_ifd(logctx, gbytes, le, depth + 1, metadata); } else { const char *name = exif_get_tag_name(id); - char *use_name = (char*) name; - - if (!use_name) { - use_name = av_malloc(7); - if (!use_name) { - return AVERROR(ENOMEM); - } - snprintf(use_name, 7, "0x%04X", id); - } - - ret = exif_add_metadata(logctx, count, type, use_name, NULL, - gbytes, le, metadata); + char buf[7]; if (!name) { - av_freep(&use_name); + name = buf; + snprintf(buf, sizeof(buf), "0x%04X", id); } + + ret = exif_add_metadata(logctx, count, type, name, NULL, + gbytes, le, metadata); } bytestream2_seek(gbytes, cur_pos, SEEK_SET); From patchwork Sat Jan 23 20:47:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25134 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 65F3744B48E for ; Sat, 23 Jan 2021 22:48:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F20968A2B1; Sat, 23 Jan 2021 22:48:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20575689AB3 for ; Sat, 23 Jan 2021 22:48:32 +0200 (EET) Received: by mail-wm1-f46.google.com with SMTP id s24so8470632wmj.0 for ; Sat, 23 Jan 2021 12:48:32 -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=afgTDEkarC01dWs63ZUg8AVHIWBen7ESdc8JCjvj1Ug=; b=CnRvYfQUbchWORre6Cr5Z3fdvvMXn6c9JQ6xuRi4tm5HHT3jZGoGNoIqN1KEIo3UPc G3puorFaEnYC7WfH83zWTPJdC+gKjv64O8PH4EGoVy/0YVHU5qF+2WMTRx/sgXp/ji3Q zBZ5GO+1+a8yM9A8HvS94pBqzzuc2gYfM/2H9uWsmXGsOUSVrR5vDeEOyyghlKtjCEDI vqMN7+RnSIuo39MiRxjbd6Jl78aGyv1vEkrOSVzh5VCVOrvBhUPw3nkCaYw9RstCj8pl aPjL96HxrDo1K0I+WZ60LNFefy0pIBDb5reZShIti8edDOHSBUM9sywvojxgr9ZXKxyf dApQ== 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=afgTDEkarC01dWs63ZUg8AVHIWBen7ESdc8JCjvj1Ug=; b=CId5uQfAV30oOZzzRnpEY3ta+WKSx+c3uS9/RXR5tm9Jb1ZvAvGZmbhQxoXWjIUQWg OAnAaFob+b+Y/V7BSNVSQzAwpSlJh1DxAg64fXwXMaxu6qLp78prXQISULXMjFjTqEXb mJl4bppXccIz9NsAhUi7yEOau2UbPRSxi98JqkWTL4GtSRSMDMBLoOYJAerI0cLvZr/T 9fDcrY/S4kJ0kAyUtj/+b1k5GJHnGzICb5rNDR+T/HBI9NU+R7coUdCKo/tQtUsWnTbk YxOKpDRm4aeef97IUr4S+Pc/P2NmCA/4sYGs4vj1GnorAbIZiZrd5GRygxLTkRxuGZra 8v3g== X-Gm-Message-State: AOAM531zC1VJs+G0xVNovpFkBslDwbZQ/4Z+zq9xjPRd4QxDN5sOGZhz oX0xgkOETusovFa/pLr6OPkYMJGyZlw= X-Google-Smtp-Source: ABdhPJz9ITB9zLRrGSGQSRje1OrwJImeDvnv+BBeiqJvgZP12jwzsBnRXWDEVSFekiIFGlZri+uRAg== X-Received: by 2002:a1c:7c03:: with SMTP id x3mr321320wmc.103.1611434911191; Sat, 23 Jan 2021 12:48:31 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:30 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:57 +0100 Message-Id: <20210123204800.689497-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] avcodec/sp5x: Remove unused quant tables 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" Only the fifth one is used. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 4 +- libavcodec/sp5x.h | 92 +------------------------------------- libavcodec/sp5xdec.c | 5 +-- 3 files changed, 5 insertions(+), 96 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7db042e5fe..a4b00c53f7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3874,8 +3874,8 @@ static int encode_picture(MpegEncContext *s, int picture_number) for(i=1;i<64;i++){ int j= s->idsp.idct_permutation[ff_zigzag_direct[i]]; - s->intra_matrix[j] = sp5x_quant_table[5*2+0][i]; - s->chroma_intra_matrix[j] = sp5x_quant_table[5*2+1][i]; + s->intra_matrix[j] = sp5x_qscale_five_quant_table[0][i]; + s->chroma_intra_matrix[j] = sp5x_qscale_five_quant_table[1][i]; } s->y_dc_scale_table= y; s->c_dc_scale_table= c; diff --git a/libavcodec/sp5x.h b/libavcodec/sp5x.h index 21c45715d0..d84d851768 100644 --- a/libavcodec/sp5x.h +++ b/libavcodec/sp5x.h @@ -132,58 +132,8 @@ static const uint8_t sp5x_data_dht[] = { }; -static const uint8_t sp5x_quant_table[20][64]= +static const uint8_t sp5x_qscale_five_quant_table[][64]= { - /* index 0, Q50 */ - { 16, 11, 12, 14, 12, 10, 16, 14, 13, 14, 18, 17, 16, 19, 24, 40, - 26, 24, 22, 22, 24, 49, 35, 37, 29, 40, 58, 51, 61, 60, 57, 51, - 56, 55, 64, 72, 92, 78, 64, 68, 87, 69, 55, 56, 80,109, 81, 87, - 95, 98,103,104,103, 62, 77,113,121,112,100,120, 92,101,103, 99 }, - { 17, 18, 18, 24, 21, 24, 47, 26, 26, 47, 99, 66, 56, 66, 99, 99, - 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99 }, - - /* index 1, Q70 */ - { 10, 7, 7, 8, 7, 6, 10, 8, 8, 8, 11, 10, 10, 11, 14, 24, - 16, 14, 13, 13, 14, 29, 21, 22, 17, 24, 35, 31, 37, 36, 34, 31, - 34, 33, 38, 43, 55, 47, 38, 41, 52, 41, 33, 34, 48, 65, 49, 52, - 57, 59, 62, 62, 62, 37, 46, 68, 73, 67, 60, 72, 55, 61, 62, 59 }, - { 10, 11, 11, 14, 13, 14, 28, 16, 16, 28, 59, 40, 34, 40, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59 }, - - /* index 2, Q80 */ - { 6, 4, 5, 6, 5, 4, 6, 6, 5, 6, 7, 7, 6, 8, 10, 16, - 10, 10, 9, 9, 10, 20, 14, 15, 12, 16, 23, 20, 24, 24, 23, 20, - 22, 22, 26, 29, 37, 31, 26, 27, 35, 28, 22, 22, 32, 44, 32, 35, - 38, 39, 41, 42, 41, 25, 31, 45, 48, 45, 40, 48, 37, 40, 41, 40 }, - { 7, 7, 7, 10, 8, 10, 19, 10, 10, 19, 40, 26, 22, 26, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40 }, - - /* index 3, Q85 */ - { 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, - 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17, 15, - 17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, - 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36, 28, 30, 31, 30 }, - { 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30 }, - - /* index 4, Q90 */ - { 3, 2, 2, 3, 2, 2, 3, 3, 3, 3, 4, 3, 3, 4, 5, 8, - 5, 5, 4, 4, 5, 10, 7, 7, 6, 8, 12, 10, 12, 12, 11, 10, - 11, 11, 13, 14, 18, 16, 13, 14, 17, 14, 11, 11, 16, 22, 16, 17, - 19, 20, 21, 21, 21, 12, 15, 23, 24, 22, 20, 24, 18, 20, 21, 20 }, - { 3, 4, 4, 5, 4, 5, 9, 5, 5, 9, 20, 13, 11, 13, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20 }, - /* index 5, Q60 */ { 13, 9, 10, 11, 10, 8, 13, 11, 10, 11, 14, 14, 13, 15, 19, 32, 21, 19, 18, 18, 19, 39, 28, 30, 23, 32, 46, 41, 49, 48, 46, 41, @@ -193,46 +143,6 @@ static const uint8_t sp5x_quant_table[20][64]= 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79 }, - - /* index 6, Q25 */ - { 32, 22, 24, 28, 24, 20, 32, 28, 26, 28, 36, 34, 32, 38, 48, 80, - 52, 48, 44, 44, 48, 98, 70, 74, 58, 80,116,102,122,120,114,102, - 112,110,128,144,184,156,128,136,174,138,110,112,160,218,162,174, - 190,196,206,208,206,124,154,226,242,224,200,240,184,202,206,198 }, - { 34, 36, 36, 48, 42, 48, 94, 52, 52, 94,198,132,112,132,198,198, - 198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,198, - 198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,198, - 198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,198 }, - - /* index 7, Q95 */ - { 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 2, 2, 2, 2, 4, - 3, 2, 2, 2, 2, 5, 4, 4, 3, 4, 6, 5, 6, 6, 6, 5, - 6, 6, 6, 7, 9, 8, 6, 7, 9, 7, 6, 6, 8, 11, 8, 9, - 10, 10, 10, 10, 10, 6, 8, 11, 12, 11, 10, 12, 9, 10, 10, 10 }, - { 2, 2, 2, 2, 2, 2, 5, 3, 3, 5, 10, 7, 6, 7, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 }, - - /* index 8, Q93 */ - { 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 3, 2, 2, 3, 3, 6, - 4, 3, 3, 3, 3, 7, 5, 5, 4, 6, 8, 7, 9, 8, 8, 7, - 8, 8, 9, 10, 13, 11, 9, 10, 12, 10, 8, 8, 11, 15, 11, 12, - 13, 14, 14, 15, 14, 9, 11, 16, 17, 16, 14, 17, 13, 14, 14, 14 }, - { 2, 3, 3, 3, 3, 3, 7, 4, 4, 7, 14, 9, 8, 9, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14 }, - - /* index 9, Q40 */ - { 20, 14, 15, 18, 15, 13, 20, 18, 16, 18, 23, 21, 20, 24, 30, 50, - 33, 30, 28, 28, 30, 61, 44, 46, 36, 50, 73, 64, 76, 75, 71, 64, - 70, 69, 80, 90,115, 98, 80, 85,109, 86, 69, 70,100,136,101,109, - 119,123,129,130,129, 78, 96,141,151,140,125,150,115,126,129,124 }, - { 21, 23, 23, 30, 26, 30, 59, 33, 33, 59,124, 83, 70, 83,124,124, - 124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, - 124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, - 124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124 } }; #endif /* AVCODEC_SP5X_H */ diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 302fdb073e..0b2b2d8418 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -35,7 +35,6 @@ int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt) const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; AVBufferRef *buf_recoded; - const int qscale = 5; uint8_t *recoded; int i = 0, j = 0; @@ -52,8 +51,8 @@ int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt) recoded[j++] = 0xD8; memcpy(recoded+j, &sp5x_data_dqt[0], sizeof(sp5x_data_dqt)); - memcpy(recoded+j+5, &sp5x_quant_table[qscale * 2], 64); - memcpy(recoded+j+70, &sp5x_quant_table[(qscale * 2) + 1], 64); + memcpy(recoded + j + 5, &sp5x_qscale_five_quant_table[0], 64); + memcpy(recoded + j + 70, &sp5x_qscale_five_quant_table[1], 64); j += sizeof(sp5x_data_dqt); memcpy(recoded+j, &sp5x_data_dht[0], sizeof(sp5x_data_dht)); From patchwork Sat Jan 23 20:47:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25135 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 63AB544B48E for ; Sat, 23 Jan 2021 22:48:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A1EA68A2C6; Sat, 23 Jan 2021 22:48:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7A27689E14 for ; Sat, 23 Jan 2021 22:48:32 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id p15so1790631wrq.8 for ; Sat, 23 Jan 2021 12:48:32 -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=716MykMsr4Jj8phkbhEzl8BsTifNaJlZVbbPNOCz8kw=; b=MY3fTgn/HmnYEiFJV8TsfldjR6qIrBEJA/mCTN/LD1YRXxlz6xoKwmPzeQ4nA5cOeo D/+dS7LW0kPI7Ygz76X9lhb6uI+pRCHRp9ynTpRAZRsQopOlvxi8gy5oDxA7b4AabZcf rZnu3Ltn4ZHVrusnMJ9qWH6j9u2MkHxvCgDHMGpPzur2fGtKK2SvgMiV/29uUlcQn6qf 1F4Q0YYXYYMPMZjCDfuQh54UmrI2v7/kAWVkaAxdBKww4WwGP7X9zHFEsgle9ZpFUbKK Pzg7CY3JiX9m55pWhurciQkv25CYRNh122C8y3dJECsBI7deTukKPYtxEtYqWkVluiim wTBw== 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=716MykMsr4Jj8phkbhEzl8BsTifNaJlZVbbPNOCz8kw=; b=gXCaLESPcm8P2+K58VuVX9FI0G0YiMd6Ri5r9V2KMezkVSn3dadHrdl2+W5ePTeekT fQ7Yb/OpW1xdRJdTMqhgQp5qg0355U5MC3jrWjw0tJdZ9/k43YOyDniSqNQ3lhyjQZdQ pUBvo+kZcKd1dWOhxvEHGxaSnzIrT/R9rS8kCyA88wbJvFk2BoGGd/at8wII8vS931sW v7orB5by9SGoaWKFL2dyP3s1FW6S1CKN5+8pmGZ3oQlkm9R8RGTKRWs3i1MZ0jv6IsnH QxllZ4kl3mWH/ZBurANSI14KstEQgOx7NuuEDPZW8053c573g6p1rOAT63laWwbnQ7vG CLKQ== X-Gm-Message-State: AOAM532JfDpJ7TIVPlHgOHYc3h66UtqFFhQc0TaWNeruxCWxMoyB99IJ Ho5O5rXUhKUSePTVdetdDohg5gie3ek= X-Google-Smtp-Source: ABdhPJxbs+U7GeItP5x/ht38V9oe8WqorChCYxxwKBFLuTKG658Bsa54YY3NO4DfLS1W1m2plTkWYg== X-Received: by 2002:a5d:540f:: with SMTP id g15mr10369623wrv.397.1611434912139; Sat, 23 Jan 2021 12:48:32 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:31 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:58 +0100 Message-Id: <20210123204800.689497-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] avcodec/mpeg4videodec: Move code around to avoid forward declaration 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" Also fix the indentation of decode_studio_vol_header while at it; it was wrong since 177133a0f4b41b3c98b9cbc7f8f45755412c537b. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 308 ++++++++++++++++++------------------- 1 file changed, 152 insertions(+), 156 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index c88de63f36..e364e0b493 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -49,8 +49,6 @@ #define MB_TYPE_B_VLC_BITS 4 #define STUDIO_INTRA_BITS 9 -static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb); - static VLC dc_lum, dc_chrom; static VLC sprite_trajectory; static VLC mb_type_b_vlc; @@ -2148,6 +2146,158 @@ static void mpeg4_load_default_matrices(MpegEncContext *s) } } +static int read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) +{ + int i, j, v; + + if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; + /* intra_quantiser_matrix */ + for (i = 0; i < 64; i++) { + v = get_bits(gb, 8); + j = s->idsp.idct_permutation[ff_zigzag_direct[i]]; + s->intra_matrix[j] = v; + s->chroma_intra_matrix[j] = v; + } + } + + if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; + /* non_intra_quantiser_matrix */ + for (i = 0; i < 64; i++) { + get_bits(gb, 8); + } + } + + if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; + /* chroma_intra_quantiser_matrix */ + for (i = 0; i < 64; i++) { + v = get_bits(gb, 8); + j = s->idsp.idct_permutation[ff_zigzag_direct[i]]; + s->chroma_intra_matrix[j] = v; + } + } + + if (get_bits1(gb)) { + if (get_bits_left(gb) < 64*8) + return AVERROR_INVALIDDATA; + /* chroma_non_intra_quantiser_matrix */ + for (i = 0; i < 64; i++) { + get_bits(gb, 8); + } + } + + next_start_code_studio(gb); + return 0; +} + +static void extension_and_user_data(MpegEncContext *s, GetBitContext *gb, int id) +{ + uint32_t startcode; + uint8_t extension_type; + + startcode = show_bits_long(gb, 32); + if (startcode == USER_DATA_STARTCODE || startcode == EXT_STARTCODE) { + + if ((id == 2 || id == 4) && startcode == EXT_STARTCODE) { + skip_bits_long(gb, 32); + extension_type = get_bits(gb, 4); + if (extension_type == QUANT_MATRIX_EXT_ID) + read_quant_matrix_ext(s, gb); + } + } +} + +static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) +{ + MpegEncContext *s = &ctx->m; + int width, height; + int bits_per_raw_sample; + int rgb, chroma_format; + + // random_accessible_vol and video_object_type_indication have already + // been read by the caller decode_vol_header() + skip_bits(gb, 4); /* video_object_layer_verid */ + ctx->shape = get_bits(gb, 2); /* video_object_layer_shape */ + skip_bits(gb, 4); /* video_object_layer_shape_extension */ + skip_bits1(gb); /* progressive_sequence */ + if (ctx->shape != RECT_SHAPE) { + avpriv_request_sample(s->avctx, "MPEG-4 Studio profile non rectangular shape"); + return AVERROR_PATCHWELCOME; + } + if (ctx->shape != BIN_ONLY_SHAPE) { + rgb = get_bits1(gb); /* rgb_components */ + chroma_format = get_bits(gb, 2); /* chroma_format */ + if (!chroma_format || chroma_format == CHROMA_420 || (rgb && chroma_format == CHROMA_422)) { + av_log(s->avctx, AV_LOG_ERROR, "illegal chroma format\n"); + return AVERROR_INVALIDDATA; + } + + bits_per_raw_sample = get_bits(gb, 4); /* bit_depth */ + if (bits_per_raw_sample == 10) { + if (rgb) { + s->avctx->pix_fmt = AV_PIX_FMT_GBRP10; + } else { + s->avctx->pix_fmt = chroma_format == CHROMA_422 ? AV_PIX_FMT_YUV422P10 : AV_PIX_FMT_YUV444P10; + } + } else { + avpriv_request_sample(s->avctx, "MPEG-4 Studio profile bit-depth %u", bits_per_raw_sample); + return AVERROR_PATCHWELCOME; + } + if (rgb != ctx->rgb || s->chroma_format != chroma_format) + s->context_reinit = 1; + s->avctx->bits_per_raw_sample = bits_per_raw_sample; + ctx->rgb = rgb; + s->chroma_format = chroma_format; + } + if (ctx->shape == RECT_SHAPE) { + check_marker(s->avctx, gb, "before video_object_layer_width"); + width = get_bits(gb, 14); /* video_object_layer_width */ + check_marker(s->avctx, gb, "before video_object_layer_height"); + height = get_bits(gb, 14); /* video_object_layer_height */ + check_marker(s->avctx, gb, "after video_object_layer_height"); + + /* Do the same check as non-studio profile */ + if (width && height) { + if (s->width && s->height && + (s->width != width || s->height != height)) + s->context_reinit = 1; + s->width = width; + s->height = height; + } + } + s->aspect_ratio_info = get_bits(gb, 4); + if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { + s->avctx->sample_aspect_ratio.num = get_bits(gb, 8); // par_width + s->avctx->sample_aspect_ratio.den = get_bits(gb, 8); // par_height + } else { + s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[s->aspect_ratio_info]; + } + skip_bits(gb, 4); /* frame_rate_code */ + skip_bits(gb, 15); /* first_half_bit_rate */ + check_marker(s->avctx, gb, "after first_half_bit_rate"); + skip_bits(gb, 15); /* latter_half_bit_rate */ + check_marker(s->avctx, gb, "after latter_half_bit_rate"); + skip_bits(gb, 15); /* first_half_vbv_buffer_size */ + check_marker(s->avctx, gb, "after first_half_vbv_buffer_size"); + skip_bits(gb, 3); /* latter_half_vbv_buffer_size */ + skip_bits(gb, 11); /* first_half_vbv_buffer_size */ + check_marker(s->avctx, gb, "after first_half_vbv_buffer_size"); + skip_bits(gb, 15); /* latter_half_vbv_occupancy */ + check_marker(s->avctx, gb, "after latter_half_vbv_occupancy"); + s->low_delay = get_bits1(gb); + s->mpeg_quant = get_bits1(gb); /* mpeg2_stream */ + + next_start_code_studio(gb); + extension_and_user_data(s, gb, 2); + + return 0; +} + static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) { MpegEncContext *s = &ctx->m; @@ -2972,72 +3122,6 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) return 0; } -static int read_quant_matrix_ext(MpegEncContext *s, GetBitContext *gb) -{ - int i, j, v; - - if (get_bits1(gb)) { - if (get_bits_left(gb) < 64*8) - return AVERROR_INVALIDDATA; - /* intra_quantiser_matrix */ - for (i = 0; i < 64; i++) { - v = get_bits(gb, 8); - j = s->idsp.idct_permutation[ff_zigzag_direct[i]]; - s->intra_matrix[j] = v; - s->chroma_intra_matrix[j] = v; - } - } - - if (get_bits1(gb)) { - if (get_bits_left(gb) < 64*8) - return AVERROR_INVALIDDATA; - /* non_intra_quantiser_matrix */ - for (i = 0; i < 64; i++) { - get_bits(gb, 8); - } - } - - if (get_bits1(gb)) { - if (get_bits_left(gb) < 64*8) - return AVERROR_INVALIDDATA; - /* chroma_intra_quantiser_matrix */ - for (i = 0; i < 64; i++) { - v = get_bits(gb, 8); - j = s->idsp.idct_permutation[ff_zigzag_direct[i]]; - s->chroma_intra_matrix[j] = v; - } - } - - if (get_bits1(gb)) { - if (get_bits_left(gb) < 64*8) - return AVERROR_INVALIDDATA; - /* chroma_non_intra_quantiser_matrix */ - for (i = 0; i < 64; i++) { - get_bits(gb, 8); - } - } - - next_start_code_studio(gb); - return 0; -} - -static void extension_and_user_data(MpegEncContext *s, GetBitContext *gb, int id) -{ - uint32_t startcode; - uint8_t extension_type; - - startcode = show_bits_long(gb, 32); - if (startcode == USER_DATA_STARTCODE || startcode == EXT_STARTCODE) { - - if ((id == 2 || id == 4) && startcode == EXT_STARTCODE) { - skip_bits_long(gb, 32); - extension_type = get_bits(gb, 4); - if (extension_type == QUANT_MATRIX_EXT_ID) - read_quant_matrix_ext(s, gb); - } - } -} - static void decode_smpte_tc(Mpeg4DecContext *ctx, GetBitContext *gb) { MpegEncContext *s = &ctx->m; @@ -3130,94 +3214,6 @@ static int decode_studiovisualobject(Mpeg4DecContext *ctx, GetBitContext *gb) return 0; } -static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) -{ - MpegEncContext *s = &ctx->m; - int width, height; - int bits_per_raw_sample; - int rgb, chroma_format; - - // random_accessible_vol and video_object_type_indication have already - // been read by the caller decode_vol_header() - skip_bits(gb, 4); /* video_object_layer_verid */ - ctx->shape = get_bits(gb, 2); /* video_object_layer_shape */ - skip_bits(gb, 4); /* video_object_layer_shape_extension */ - skip_bits1(gb); /* progressive_sequence */ - if (ctx->shape != RECT_SHAPE) { - avpriv_request_sample(s->avctx, "MPEG-4 Studio profile non rectangular shape"); - return AVERROR_PATCHWELCOME; - } - if (ctx->shape != BIN_ONLY_SHAPE) { - rgb = get_bits1(gb); /* rgb_components */ - chroma_format = get_bits(gb, 2); /* chroma_format */ - if (!chroma_format || chroma_format == CHROMA_420 || (rgb && chroma_format == CHROMA_422)) { - av_log(s->avctx, AV_LOG_ERROR, "illegal chroma format\n"); - return AVERROR_INVALIDDATA; - } - - bits_per_raw_sample = get_bits(gb, 4); /* bit_depth */ - if (bits_per_raw_sample == 10) { - if (rgb) { - s->avctx->pix_fmt = AV_PIX_FMT_GBRP10; - } - else { - s->avctx->pix_fmt = chroma_format == CHROMA_422 ? AV_PIX_FMT_YUV422P10 : AV_PIX_FMT_YUV444P10; - } - } - else { - avpriv_request_sample(s->avctx, "MPEG-4 Studio profile bit-depth %u", bits_per_raw_sample); - return AVERROR_PATCHWELCOME; - } - if (rgb != ctx->rgb || s->chroma_format != chroma_format) - s->context_reinit = 1; - s->avctx->bits_per_raw_sample = bits_per_raw_sample; - ctx->rgb = rgb; - s->chroma_format = chroma_format; - } - if (ctx->shape == RECT_SHAPE) { - check_marker(s->avctx, gb, "before video_object_layer_width"); - width = get_bits(gb, 14); /* video_object_layer_width */ - check_marker(s->avctx, gb, "before video_object_layer_height"); - height = get_bits(gb, 14); /* video_object_layer_height */ - check_marker(s->avctx, gb, "after video_object_layer_height"); - - /* Do the same check as non-studio profile */ - if (width && height) { - if (s->width && s->height && - (s->width != width || s->height != height)) - s->context_reinit = 1; - s->width = width; - s->height = height; - } - } - s->aspect_ratio_info = get_bits(gb, 4); - if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { - s->avctx->sample_aspect_ratio.num = get_bits(gb, 8); // par_width - s->avctx->sample_aspect_ratio.den = get_bits(gb, 8); // par_height - } else { - s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[s->aspect_ratio_info]; - } - skip_bits(gb, 4); /* frame_rate_code */ - skip_bits(gb, 15); /* first_half_bit_rate */ - check_marker(s->avctx, gb, "after first_half_bit_rate"); - skip_bits(gb, 15); /* latter_half_bit_rate */ - check_marker(s->avctx, gb, "after latter_half_bit_rate"); - skip_bits(gb, 15); /* first_half_vbv_buffer_size */ - check_marker(s->avctx, gb, "after first_half_vbv_buffer_size"); - skip_bits(gb, 3); /* latter_half_vbv_buffer_size */ - skip_bits(gb, 11); /* first_half_vbv_buffer_size */ - check_marker(s->avctx, gb, "after first_half_vbv_buffer_size"); - skip_bits(gb, 15); /* latter_half_vbv_occupancy */ - check_marker(s->avctx, gb, "after latter_half_vbv_occupancy"); - s->low_delay = get_bits1(gb); - s->mpeg_quant = get_bits1(gb); /* mpeg2_stream */ - - next_start_code_studio(gb); - extension_and_user_data(s, gb, 2); - - return 0; -} - /** * Decode MPEG-4 headers. * From patchwork Sat Jan 23 20:47:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25129 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 03B0944B48E for ; Sat, 23 Jan 2021 22:48:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5C19689F4F; Sat, 23 Jan 2021 22:48:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D69E9688175 for ; Sat, 23 Jan 2021 22:48:33 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id b5so8426299wrr.10 for ; Sat, 23 Jan 2021 12:48:33 -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=ZIwU2BMkY2R5g3R4QN1oVmhml9+nhDTP4IdRx2pVpk4=; b=upiRtYYG7HmbVaDuOwRAYsH8jFale46eNqmpnEtL8bjxB7Exz+UlXDAPMJ/M4VQ7Qp kgOlUmPxZaqcJL0YNKYknIDLLOxpv3jlb6o+EkhcXgWIAMbLKXJg/Rz1Vh9dM2oZwLon deh2+xWpBIUGqqoeLG5VZ5PtX9TulX1KgbGpSU5qhWyS4j0FcKyOv3zA7tYWJQUw7WDm gHlia8T90pV6a1n4RattdB/MiB8jO+tea2EY5/24o/JMrx1+PQhLWRwRAWcsiapuPh+p WoK43wWEUkJg5ZHOu9QQ0OpAfk4ZxIhINNeRkss6e7ijvWxrNcShzxWkPCz2wKLFxz7x fctA== 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=ZIwU2BMkY2R5g3R4QN1oVmhml9+nhDTP4IdRx2pVpk4=; b=lVZJO9nri9j5EEeDHO9lE5t2uuY2r2aLYg873yf1sNaWO+Hs3+V0NZOIZlWVC2cp8x Q4HZxk/uZJ6mOV9TY650muFBNg09i1FbpQbsSTOErCCd4KmSV3ZOnIjGxJNcZgoNhpc8 0eTS1jD7geOi63Kb5CnRAZm1XG/xRXKM8e4evKAeOom7niTSNjMBDgsdfKbzpJOvII/k A3bnM30mua7melM97epujT4upiszYAObLRs+iK7HRybeuVU7x74y9ZjZct1qoTZZ/9V8 ki4iDQxEkkn9xwtByfwP2zwrEtfQ5pGLCqPqRGBb5WQTMingqOfTuheR+nf1/7ZjFKm2 G33w== X-Gm-Message-State: AOAM533lu1Wpa7Z2bo/yZI9s3CJprBOKaIMBJjUUJqmnLXRXq/H0eG1j VqPxi2DkfK3o2T1Co2FFUQIo4tA/sXU= X-Google-Smtp-Source: ABdhPJxcH+UZs5HNbQw4MmqdxzTyjM34HnJhk+PtByv1PxXFFUs28j9pzNoEmtf77ZRSY7HtqSNxSw== X-Received: by 2002:a5d:6351:: with SMTP id b17mr7162507wrw.410.1611434913012; Sat, 23 Jan 2021 12:48:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:59 +0100 Message-Id: <20210123204800.689497-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] avcodec/mpeg4videodec: Fix indentation 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 was wrong since e03bf251d8784f4d1df2c22381c902087e151e31. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index e364e0b493..a4479f889b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3201,15 +3201,15 @@ static int decode_studiovisualobject(Mpeg4DecContext *ctx, GetBitContext *gb) MpegEncContext *s = &ctx->m; int visual_object_type; - skip_bits(gb, 4); /* visual_object_verid */ - visual_object_type = get_bits(gb, 4); - if (visual_object_type != VOT_VIDEO_ID) { - avpriv_request_sample(s->avctx, "VO type %u", visual_object_type); - return AVERROR_PATCHWELCOME; - } + skip_bits(gb, 4); /* visual_object_verid */ + visual_object_type = get_bits(gb, 4); + if (visual_object_type != VOT_VIDEO_ID) { + avpriv_request_sample(s->avctx, "VO type %u", visual_object_type); + return AVERROR_PATCHWELCOME; + } - next_start_code_studio(gb); - extension_and_user_data(s, gb, 1); + next_start_code_studio(gb); + extension_and_user_data(s, gb, 1); return 0; } From patchwork Sat Jan 23 20:48:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25131 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 2CF2244B48E for ; Sat, 23 Jan 2021 22:48:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C354689E7D; Sat, 23 Jan 2021 22:48:39 +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 9824B689C76 for ; Sat, 23 Jan 2021 22:48:34 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id 6so8444064wri.3 for ; Sat, 23 Jan 2021 12:48:34 -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=Pfnc8GJk/Ulq6AHlqiFWzQln0LRA31QFKefu14w+Ndc=; b=FrrYGhWkfV2Hfdj/nkAKAZl68vgjJfcL1fptnullAtrHNNYKCsFhCL85u/YdQ7iYjq 0s/nsz/fREBq6WX2c4XCFVdRfGP5xkMPBc7VvUHAompyRVgILrwT7kTqjr0iqLNbwmsK Bc6MtFv0d/Wh2SKuCWVEnVvprtLm7Tm7DVWOvBX8fCVvm+p67/6XDaNHFi0xt25vyL4+ dbYoe4SwFqTvNfjbjNw2pgMqk3kEHjT+G6JYczPm69Bcx7CgLyo/rInXFan0m/y7dEeH KsrJT+MqFQwpeqQiP6ZR9w8Q+6uaCpBHtndPddeT3afwZ85CKqBj7nmDfLVgwhiUevcy i/6w== 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=Pfnc8GJk/Ulq6AHlqiFWzQln0LRA31QFKefu14w+Ndc=; b=Afu2+nCWl4Bu59PnxbePIcqEFn9rxXtNhGzbFWEldSIDaworPh3vCSRLKuTREPaSRD T+StEJ0frXhsEtauXImPE+JDWa2KfJX/5Bo1LjYI6Hz5cPBJiWv0WEVSyNDnyNh/hsVU cxMRAaDAhQz3yIWduM0DVyxxpiMW/gpfvkRoXrzPN5/o1EHi6HFwdlepKy/MlDqHebu/ xsANcsFyeR8KiZVjx/8+RqQ0govMtn6dii7Gt826CtU3O1soxslV9Zk8SJ8vnbw1z4Mb cC2l3b8d4MQmErvjP66SCUv24HHSsmisX38VlAcPXCunSCIsn3Sp6Cz+94VMZA2MswW4 WRIQ== X-Gm-Message-State: AOAM530ju8x07CxizpW9xqauUJ3WJrwaYHIs1B1YNYuunEKl3PtXajuf 0JQxz7koAhvceSirc4/VQqnGt7Qrnto= X-Google-Smtp-Source: ABdhPJxTpvENCf7FOEKdA3UyCU4RML48cLbNmqgF+Llf3/4+idbZDaBsQCap2Y4p4m3FuecE/kYUJg== X-Received: by 2002:adf:e80f:: with SMTP id o15mr732996wrm.366.1611434913983; Sat, 23 Jan 2021 12:48:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:48:00 +0100 Message-Id: <20210123204800.689497-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/10] Revert "mpeg4videodec: raise an error if sprite_trajectory.table is NULL" 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 reverts commit 6ac0e7818399a57e4684202bac79f35b3561ad1e. The mpeg4video parser can reach code that presumes that a certain VLC has been initialized; yet Libav did not ensure this and Libav bug #1012 [1] is about an ensuing crash. Instead of fixing the root cause a simple check for whether said VLC has already been initialized was added; said check is inherently racy. The proper fix is of course to ensure that the VLC is initialized and commit 7c76eaeca2791261d3f4f5c98c95f44abdbd879a already ensured this, so there was no need to merge 6ac0e7818399a57e4684202bac79f35b3561ad1e at all. This commit therefore reverts said commit. [1]: https://bugzilla.libav.org/show_bug.cgi?id=1012 Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index a4479f889b..5bfac4ea5a 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -197,10 +197,6 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g if (w <= 0 || h <= 0) return AVERROR_INVALIDDATA; - /* the decoder was not properly initialized and we cannot continue */ - if (sprite_trajectory.table == NULL) - return AVERROR_INVALIDDATA; - for (i = 0; i < ctx->num_sprite_warping_points; i++) { int length; int x = 0, y = 0;