From patchwork Sun Oct 4 21:35:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 22729 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 E377A448187 for ; Mon, 5 Oct 2020 00:35:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0D1668AF83; Mon, 5 Oct 2020 00:35:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-oln040092254031.outbound.protection.outlook.com [40.92.254.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE99C680297 for ; Mon, 5 Oct 2020 00:35:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MQGL0WAgEgKxqV17AZqQBBc7vjvn/KnRr3oLeWA0UZl/waCqHAM5J/K1kwdf4Fk62imJnCdBWwMenINrmsE3JnaOTPggNkjjnumS8MDFa9IXh9RM+LlCh/0CeghsZqTtaf5/1DxyVBWgPibxCrFB5+NZ/jtrmC9uMFibXdwsaHDddux/SFLbZqR7r8SFnlNeEndQQ3/p5KFgXJZ+btd5iX01UqR40ADedmigaHeeFwslUBRHf5iuj/rtluseXvxra4SyECweQCP0v3BJISL4tYishFMQPeK8BCVrhbvk3KTLAo7WNHp6C4s6qCUMkv35Bdxciuf7+HBCxyCHV6f4Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uJf3ZW402iev7kbx5ydeuh0YkS/JwKutApItUX3v81o=; b=APm1MMvsJWz4HSvJbzVwGNkO5Hg9q/pN3bhwqcTyZ6t3X1dVCh20Jh03ZZQbUJx9D76dgtJtSahZmyMndhN4YrTu+LUuna3D1UupCZq9IqVy/w3HXuqqlINyZ9eT3+ngZsg5pGxDTauwbJwe1HyRAWNUcUlWECnSYzv1+mL5Xm0vb3lmaZHxfU4lK5hj5Ly5ZoqO0nhJIkZLUMj0QDTL7HD5erAmPayi2iRMLZ1u2FM9f7C1z0dRE1/Q5BdDTyvIVovElaZ6MEJy4ccLsjMch8kCQa3/qEFBpDVJF940r72JLXGe/bnNsH1PG6AOP2SSqgjbyiVTf4r78WISIxlyMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uJf3ZW402iev7kbx5ydeuh0YkS/JwKutApItUX3v81o=; b=eAvA6oOtj+5HrxgxNWPjsn46CqHHSAGuzjglOoneumHVMM0pVrcAM/DEbj0saLNpWSyMYwA/2nuBtMFxyBdlGSidhouQAs4p2oKQxPPCWpTbbRWjxLt+gfiLAPHgv7wTst7hNvJRqxosLMzrb6RI9SpjD3Ae7fjqA84poSZzRw5Zb+bsMp2And4AwDqVhwpMjp7gGyBNCwpeYIGzv+e5jPpwYH0lW56Y3+ogiaIJLi2zqArfMvceUG9TbWss525KIU3MuVY01EVLTnoPYIQbYMvzSH6Qva8oCSEi60ae+aHiI12gapytrWtQaa5rIxOOpxlu+Xse9up8wld3p7n/JA== Received: from PU1APC01FT013.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::46) by PU1APC01HT137.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.34; Sun, 4 Oct 2020 21:35:32 +0000 Received: from SG2PR01MB2693.apcprd01.prod.exchangelabs.com (2a01:111:e400:7ebe::4d) by PU1APC01FT013.mail.protection.outlook.com (2a01:111:e400:7ebe::78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.34 via Frontend Transport; Sun, 4 Oct 2020 21:35:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8B7466C823B0776F0C8885A7747C040CFF9AD1B50417C25042FBE966155D6574; UpperCasedChecksum:64F2A855625718F0B8E9FB70BDA92D928E7E632E3757C658263ED23145DA965A; SizeAsReceived:7454; Count:43 Received: from SG2PR01MB2693.apcprd01.prod.exchangelabs.com ([fe80::8138:eb6f:5a98:b647]) by SG2PR01MB2693.apcprd01.prod.exchangelabs.com ([fe80::8138:eb6f:5a98:b647%7]) with mapi id 15.20.3433.044; Sun, 4 Oct 2020 21:35:31 +0000 From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Oct 2020 03:05:09 +0530 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [5NjE+9+NJYtJ5jOuNta5J51v4yfA5oslQTVSo5ZvD1izyn6UuFWSGVGpMn+wAhn8fJqgR16avgw=] X-ClientProxiedBy: BMXPR01CA0065.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:2c::29) To SG2PR01MB2693.apcprd01.prod.exchangelabs.com (2603:1096:4:7f::14) X-Microsoft-Original-Message-ID: <20201004213509.5692-1-nachiket.tarate@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2401:4900:30c4:52a4:7822:1619:5ae3:2e76) by BMXPR01CA0065.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:2c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.34 via Frontend Transport; Sun, 4 Oct 2020 21:35:31 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ee5cb03a-3484-4e0b-6d82-08d868ad6b90 X-MS-TrafficTypeDiagnostic: PU1APC01HT137: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C46muq5uTTnDHwcV6Lbgn9JJAcbwQDrB/v0+EwdAS44VJHcMsi7NlwmtbueL0N+tW4CppqcFhddPGEhJrmR0DJ9eMI0yAp3wYv0yYy0KMSzkYyw7D5ldeXtqyqXxFh2lHObmGKFp3+/cEVWlXVhxT/9xab21an2eiSWWUicnL7Bi9lM4pjl0eGK7VyxS/IfhIoyMqNir8utR7LyVdXE40w== X-MS-Exchange-AntiSpam-MessageData: 2gNGxXwYmQfgJqwu2xelENFguCQKDqANxpT0Pj0zjP5/n4ERNxoSMhDutr/NrQQ6Gs6AP80nSKkWWV6LWCeD8mmp+xZNzmD5Fn/hh+kr9wKMcS8xo90CbUR/cKuCwAoSGy9BuL8XRLN12wi0nb7blsMS3C8SRSyn97IFaUrgCDBYstV5kllOunTGGt/1VRPUgqt8XK9D1T7nqp6nUsApcw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee5cb03a-3484-4e0b-6d82-08d868ad6b90 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2020 21:35:31.8691 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: PU1APC01FT013.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT137 Subject: [FFmpeg-devel] [PATCH 2/2] libavcodec/ac3tab: rename ff_ac3_sample_rate_tab to avpriv_ac3_sample_rate_tab so that it can be used in libavformat 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will be used by HLS demuxer to parse EC3SpecificBox (dec3) during SAMPLE-AES decryption. Signed-off-by: Nachiket Tarate --- libavcodec/ac3_parser.c | 6 +++--- libavcodec/ac3enc.c | 2 +- libavcodec/ac3enc_fixed.c | 2 +- libavcodec/ac3enc_float.c | 2 +- libavcodec/ac3tab.c | 2 +- libavcodec/ac3tab.h | 2 +- libavcodec/eac3enc.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index ba171653ef..1c08c5f2b5 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -102,7 +102,7 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->lfe_on = get_bits1(gbc); hdr->sr_shift = FFMAX(hdr->bitstream_id, 8) - 8; - hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code] >> hdr->sr_shift; + hdr->sample_rate = avpriv_ac3_sample_rate_tab[hdr->sr_code] >> hdr->sr_shift; hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift; hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2; @@ -126,11 +126,11 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) int sr_code2 = get_bits(gbc, 2); if(sr_code2 == 3) return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; - hdr->sample_rate = ff_ac3_sample_rate_tab[sr_code2] / 2; + hdr->sample_rate = avpriv_ac3_sample_rate_tab[sr_code2] / 2; hdr->sr_shift = 1; } else { hdr->num_blocks = eac3_blocks[get_bits(gbc, 2)]; - hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code]; + hdr->sample_rate = avpriv_ac3_sample_rate_tab[hdr->sr_code]; hdr->sr_shift = 0; } diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 37dc0fb2ef..914fc5e5be 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2128,7 +2128,7 @@ static av_cold int validate_options(AC3EncodeContext *s) the generated files are correct. */ max_sr = s->eac3 ? 2 : 8; for (i = 0; i <= max_sr; i++) { - if ((ff_ac3_sample_rate_tab[i % 3] >> (i / 3)) == avctx->sample_rate) + if ((avpriv_ac3_sample_rate_tab[i % 3] >> (i / 3)) == avctx->sample_rate) break; } if (i > max_sr) { diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 428bbfb3c5..82829c12dc 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -156,7 +156,7 @@ AVCodec ff_ac3_fixed_encoder = { AV_SAMPLE_FMT_NONE }, .priv_class = &ac3enc_class, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .supported_samplerates = ff_ac3_sample_rate_tab, + .supported_samplerates = avpriv_ac3_sample_rate_tab, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 99863a9722..80478878f7 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -150,7 +150,7 @@ AVCodec ff_ac3_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3enc_class, - .supported_samplerates = ff_ac3_sample_rate_tab, + .supported_samplerates = avpriv_ac3_sample_rate_tab, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index ef2a41bc59..215fd18000 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -126,7 +126,7 @@ const uint8_t ff_ac3_dec_channel_map[8][2][6] = { }; /* possible frequencies */ -const int ff_ac3_sample_rate_tab[] = { 48000, 44100, 32000, 0 }; +const int avpriv_ac3_sample_rate_tab[] = { 48000, 44100, 32000, 0 }; /* possible bitrates */ const uint16_t ff_ac3_bitrate_tab[19] = { diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index 1d1264e3fc..dec2f11abd 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -33,7 +33,7 @@ extern const uint8_t ff_ac3_channels_tab[8]; extern av_export_avcodec const uint16_t avpriv_ac3_channel_layout_tab[8]; extern const uint8_t ff_ac3_enc_channel_map[8][2][6]; extern const uint8_t ff_ac3_dec_channel_map[8][2][6]; -extern const int ff_ac3_sample_rate_tab[]; +extern av_export_avcodec const int avpriv_ac3_sample_rate_tab[]; extern const uint16_t ff_ac3_bitrate_tab[19]; extern const uint8_t ff_ac3_rematrix_band_tab[5]; extern const uint8_t ff_eac3_default_cpl_band_struct[18]; diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 8e1032f268..7cf7d62fab 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -263,7 +263,7 @@ AVCodec ff_eac3_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &eac3enc_class, - .supported_samplerates = ff_ac3_sample_rate_tab, + .supported_samplerates = avpriv_ac3_sample_rate_tab, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,