From patchwork Sun Apr 11 19:03:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 26866 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 EDDBB44A5E4 for ; Sun, 11 Apr 2021 22:06:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDEBF68812C; Sun, 11 Apr 2021 22:06:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 097F768811D for ; Sun, 11 Apr 2021 22:06:11 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id kk2-20020a17090b4a02b02900c777aa746fso5794582pjb.3 for ; Sun, 11 Apr 2021 12:06:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=arnf5OLWfUUSURhx16nU17rn8NDv1LcmrIIMfLQcLVc=; b=UH/pCOrvifoP3biGGDsYuXoCAhXsw15XrLiFdpdTKYYPVblxTLHLDrjRgf6Z0x4rTr hXxf1gHQUjAcdH/MGjl31/b+MGguowVQ9DLi/iYaqqwuptSH23HE1I1ZAryei9wCZWxQ JpbxQiKKXE7j0lRkQe3iU4+0KeVhJ3K17oYPWkfjp/MjzOd1DieN7VWePxQH6xU1T1sM SV9Rt96KyYsoocVZFEJncTZ6S7+xmIinPUAa10E1tXydaynnL9ay6+iB2oLANrQZ5aIL yWhmQVDmi+QbrqBgVwEKy9iNVIoYNfDmDAUom3wzfsLgrlRfT4YDgf4uwpFyCbVT/VmG 3wKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=arnf5OLWfUUSURhx16nU17rn8NDv1LcmrIIMfLQcLVc=; b=UDLnVVPPIDQFtvvyznUtsiib2qNIv/KsNXCYkPPUPbpYI/KjJGxgUqDzsDSbYiP93d 8n0R9BUXAwvZXqW6jLerYwHZuluJS/8DoMcdK4R3XAINfOn2HYwOSCFyQ6jxIiPXUu6Q yXcEY81rTN11OgBFiIpxswPRe8tnESrSj+DitCIamrVX73G8vGP6cglM8hKD7iV3IzGY 5DMzgNq3hIqBPguiYxLV0dmI1/r4HLjE20me7zm+/t4QTEdN3iMMrr1U3Cf8tXzmmy5O GuPnQP0ZK8twrPIz57SWJSebBRJ9QTLzAna3Qeu8BtdWq91VcmDJUsi/RdiMeRFdHySI HjPg== X-Gm-Message-State: AOAM53370H9asPONi07gfIzGsx6hA6m3nRsBTBJUJoMnNWdwjcftOh9r ruwGAf0vvjrZHCbL0cf17a4lY/Hchqq+Vw== X-Google-Smtp-Source: ABdhPJyLo/rsJfIw4aF6RCFK4iMxDspB5mIe5SVa6OxpCSmXagHSRsAHfGDs0KeMgsukaH3TmzU8oA== X-Received: by 2002:a17:903:1c3:b029:e6:a15:751f with SMTP id e3-20020a17090301c3b02900e60a15751fmr23144991plh.44.1618167968824; Sun, 11 Apr 2021 12:06:08 -0700 (PDT) Received: from lab-21.india.rsystems.com ([106.198.149.254]) by smtp.gmail.com with ESMTPSA id e1sm9047267pgl.25.2021.04.11.12.06.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Apr 2021 12:06:08 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Apr 2021 00:33:46 +0530 Message-Id: <20210411190346.17584-1-nachiket.programmer@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] libavcodec/adts_header: add frame_length field and avpriv function to parse AAC ADTS header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These will be used by HLS demuxer in case of sample decryption. Signed-off-by: Nachiket Tarate --- libavcodec/adts_header.c | 1 + libavcodec/adts_header.h | 14 ++++++++++++++ libavcodec/adts_parser.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/libavcodec/adts_header.c b/libavcodec/adts_header.c index 0889820f8a..e4454529c4 100644 --- a/libavcodec/adts_header.c +++ b/libavcodec/adts_header.c @@ -66,6 +66,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) hdr->sample_rate = avpriv_mpeg4audio_sample_rates[sr]; hdr->samples = (rdb + 1) * 1024; hdr->bit_rate = size * 8 * hdr->sample_rate / hdr->samples; + hdr->frame_length = size; return size; } diff --git a/libavcodec/adts_header.h b/libavcodec/adts_header.h index f615f6a9f9..9ecd67fb5b 100644 --- a/libavcodec/adts_header.h +++ b/libavcodec/adts_header.h @@ -34,6 +34,7 @@ typedef struct AACADTSHeaderInfo { uint8_t sampling_index; uint8_t chan_config; uint8_t num_aac_frames; + uint32_t frame_length; } AACADTSHeaderInfo; /** @@ -47,4 +48,17 @@ typedef struct AACADTSHeaderInfo { */ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); +/** + * Parse the ADTS frame header contained in the buffer, which is + * the first 54 bits. + * @param[in] buf Pointer to buffer containing the first 54 bits of the frame. + * @param[in] size Size of buffer containing the first 54 bits of the frame. + * @param[out] phdr Pointer to pointer to struct AACADTSHeaderInfo for which + * memory is allocated and header info is written into it. + * @return Returns 0 on success, -1 if there is a sync word mismatch, + * -2 if the version element is invalid, -3 if the sample rate + * element is invalid, or -4 if the bit rate element is invalid. + */ +int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_t size); + #endif /* AVCODEC_ADTS_HEADER_H */ diff --git a/libavcodec/adts_parser.c b/libavcodec/adts_parser.c index 5c9f8ff6f2..7df714e227 100644 --- a/libavcodec/adts_parser.c +++ b/libavcodec/adts_parser.c @@ -42,3 +42,31 @@ int av_adts_header_parse(const uint8_t *buf, uint32_t *samples, uint8_t *frames) return AVERROR(ENOSYS); #endif } + +int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_t size) +{ +#if CONFIG_ADTS_HEADER + int ret = 0; + GetBitContext gb; + + if (size < AV_AAC_ADTS_HEADER_SIZE) + return AVERROR_INVALIDDATA; + + if (!*phdr) + *phdr = av_mallocz(sizeof(AACADTSHeaderInfo)); + if (!*phdr) + return AVERROR(ENOMEM); + + ret = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); + if (ret < 0) + return ret; + + ret = ff_adts_header_parse(&gb, *phdr); + if (ret < 0) + return ret; + + return 0; +#else + return AVERROR(ENOSYS); +#endif +}