From patchwork Tue Sep 21 18:40:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 30427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2703488iob; Tue, 21 Sep 2021 11:41:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQpGPK171+LEDYUtvQof6RNu/3EcGGGwE+OG5TBWC6Ht4FfoJZfa7Q377/NsaWgRB05ast X-Received: by 2002:aa7:c806:: with SMTP id a6mr36758297edt.354.1632249692019; Tue, 21 Sep 2021 11:41:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632249692; cv=none; d=google.com; s=arc-20160816; b=X9N4UBbD3wFagnU6W2MqlvA5DAeua9XB6+jdkj2RtOtxievWxylz/S+AIgh6bKat/p M9TNCGONZTz9dHLIoqA3y3KQRvsvTskcJZjW3eJ4w+GVB0bxUkcIhlH4FRml71P7u4fR nFi5R1af/qI7lsnVOaNQ1ZO06DrpsoYIUcTetJ+NR41YDkiTa5fIYk4l8Mt3y7ADTKjY JtxwBCae+WeB5xuS42ykvYa3UFRZz+onJxE16SMLrCmz5wXSLh3VJ0q1eA8jIjhNhChu 9yB3Xfi2WYHfLAahvjtpvx5x7kfy6T21VMmV5D6Vsj5RbaYZER+twzQL1MNJa3xFHi14 hrrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=Eto9gB9FqBqW5nlz0JJ1665eefYp23cQgyKJNKN0Dkk=; b=gLoOVZATae3XU+1uYQvwUnnRXCVZpv0t3cLcONR6N9Jma7Z7eHn3AwPxSs6tFUdxu6 HVq/YNU7TDbJ5m9BbYKbhPUS8K/1UiTMo7Q1jM0qYcvY81+OJfhbf5Pr+syeAXFtzsLn etG2+Ffm9yho5vldp3uTVFCw92tUrACbykEcBX+4/wDwBivjpo0EEeMCn0d5gEo3U6ny pL5vFHnbzklgk/TdIm0SDEJ1SMJYjWgx/uSx3XIabLwGJ48sUfde0elShak13iowYUqh hO/SnqYJ8obuH2mUackgQpEXVHtpILm59YjqeoTsuMwXWnll0fo0JQc1HEdOklpLWylr tC9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kJtqxUli; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u13si17959837eju.576.2021.09.21.11.41.31; Tue, 21 Sep 2021 11:41:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kJtqxUli; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC30F68AF5C; Tue, 21 Sep 2021 21:41:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C9B968A96A for ; Tue, 21 Sep 2021 21:41:22 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id q23so350239pfs.9 for ; Tue, 21 Sep 2021 11:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=mTqGeTHrwV32ZQQwh2nu++aRZliDfvf3gV9vGhnb0t4=; b=kJtqxUlih3QL88m/HvFCy+RU5iSkRlL3VRb01x6t5KREqfOK1dS6LoAaD1QEXPqTD6 CLIKeP2vlsezzKxxZKOenWz7h4O73V8h9RgLqwP3Eo78k15LSGDiYzVyghpfAOcopzoC jwWj9ifXFiZ2Gur6vMG28xQoVw2CmkDcVQ//Wp61v6rVn13rRl7dJ1vcHE/0QwbYqDKT q2SPdH5Pm6C5LPjKv/4zlRp/CuIhYxeSLIgZmz9WCt15xEyKI0OYcapi6b8ap/T0Lo8R Bq5UohEZtWGNDkETeeNopzI/70wVyGjZATEn9eJxl+Y2RFcpppFCvRviaS63PbLQcfpW 58Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id; bh=mTqGeTHrwV32ZQQwh2nu++aRZliDfvf3gV9vGhnb0t4=; b=XLSutUubxzNR/jBg5ilgfLTq96KnymzR0s0yMdptwrAYTrlvoOHMTCFMmq5ykUAcXh usGcwg4dNcaWRyXfJMPTwT9P2bS2C1JdLlRZpEczMvBj1CvlFEm3wHiCsnLyjap3UnFN K2QcQrx1Z3CLJzfmd4kbqasnAZ8O7y2jUPuE2oDRruK76z8VUor7Xr6XvosZbtmLcXJX +eC/h9P2PixvwfbjdGVipFwZEyypRsR+HZi3g/ZK0OKqRlgT32UML1F2hLXjSNaEBgJx aVRcpB1u0zXIi9EFiu1hfaUrTJZifbHb1rKSQVprOSNYv2VuEYU4faoMcI/omgOS+oKq 6T+g== X-Gm-Message-State: AOAM530Uk3/RRD/lNAsOdYB/6qxCZjcukv7S6QvRwtmKZFynYE4GdbBs hGnlVBf5QN1b4NYYDVj5CYW0HgycSiQ= X-Received: by 2002:a63:f963:: with SMTP id q35mr29411396pgk.132.1632249678715; Tue, 21 Sep 2021 11:41:18 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:5023:907:6d04:a3b6:841a:1d61]) by smtp.gmail.com with ESMTPSA id fh3sm3347244pjb.8.2021.09.21.11.41.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:41:18 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 00:10:58 +0530 Message-Id: <20210921184058.3156-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.29 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" X-TUID: bJjZF5OHPltq 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 | 15 +++++++++++++++ libavcodec/adts_parser.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 47 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..354d07e1f8 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,18 @@ 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. After using the header + * information, the allocated memory must be freed by using av_free. + * @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..4a1a8fd5f4 100644 --- a/libavcodec/adts_parser.c +++ b/libavcodec/adts_parser.c @@ -42,3 +42,34 @@ 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 (!phdr || !buf || size < AV_AAC_ADTS_HEADER_SIZE) + return AVERROR_INVALIDDATA; + + *phdr = av_mallocz(sizeof(AACADTSHeaderInfo)); + if (!*phdr) + return AVERROR(ENOMEM); + + ret = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); + if (ret < 0) { + av_freep(phdr); + return ret; + } + + ret = ff_adts_header_parse(&gb, *phdr); + if (ret < 0) { + av_freep(phdr); + return ret; + } + + return 0; +#else + return AVERROR(ENOSYS); +#endif +}