From patchwork Fri Jul 16 17:18:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 28942 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1971166ios; Fri, 16 Jul 2021 10:26:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/tRv2kizw6HTKtWYeEhtdMrBAuMe6WONNyAMICbPBMlceAIfMa4uOmg+8YZ4RbA1eomZu X-Received: by 2002:a17:906:5e5a:: with SMTP id b26mr12126287eju.471.1626456363753; Fri, 16 Jul 2021 10:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626456363; cv=none; d=google.com; s=arc-20160816; b=JQnoeDP/nWqPlOvG/aA2RM74TJKxSek6eWieeJ5ii5IH45f89QWW4MfxCH05ceG//X jjQtwrQJs/50f2NtzmABYEB3Aoe7vpj/d6sQvd/hfGA1Em3RKviYDrthA7MauV+LFRYS NwR23tSMX4GwxgIE6GRpMijqYgoYzlDUyYx4RGn46hrNU4qJJCmoxv2RI4uesJgJ+tCp JKLYNhaJNb5B85FeivmKC6T6RZdU4tra88bZjMSBsl4AdGT00dbrgKSGHTU59TAUvM7J SymGIOVAA7gi8vRs7iZEHwvrzayKxOz4LV9z6mdhbp2EwFFWicDG9Ru3UIl9nAhgsQiU DbLQ== 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=HkyAZUb344MJNoLG0G/ftvCYbMdc4sa+nO0Dz4OQg8I=; b=Ocq1+lWTS5HwDV7px9YDnLcgszvzi1sxSdc38hHApqW87+u0euPsKamsGxxlM22OEF JJeY+hxLEK8d0bvp+aFvQB0oYMte7MIqdHdzBNE/yjIkoRPpk3/Rt+ouTIsYuEtAq8kd LHr2wBuFQXcPU3aAnhuhGcCmdamuJ0WlpzYsyawSIWMEgUpSQhP7NzKZ+M6k8qSTP43a U1d/b0gVDO1L6hAqlBNR3H1zM8Rvpt2t+MQd9Ww9GUmBhKXrEf136Gg2EZXlhV73lPCh 5DHmg+cv6I7qA+/mk7yoivBvN2DRjRkMbx2SbpDw6sVbAO/PXO+Sg3vqzBUHo8eJ43Wo 65cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZnLWlhLk; 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 bo15si3152599ejb.381.2021.07.16.10.26.03; Fri, 16 Jul 2021 10:26:03 -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=20161025 header.b=ZnLWlhLk; 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 9EBB968A60C; Fri, 16 Jul 2021 20:26:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CA6168A16C for ; Fri, 16 Jul 2021 20:25:54 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id my10so6769767pjb.1 for ; Fri, 16 Jul 2021 10:25:54 -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=ZnLWlhLkkar6vdf+o1G+3EFgUrICKiq0Vb7FFe9ABbWeaE/cas+kGI1fCXFrFjpqNZ k7WVO60bCwYbcL1cOxwy+/izVT0ky4yahpDn9fozXi9Feefy9UmeSGTnrQeoFzdzbQxB m2JcfNyp4LQbkS8p3mYoIaptVo0lYGwg2/W5+sqmUHDTk9YVKqRZRsgHiNWtBe3w+d+3 S8qifNLqA/THV9bTaCV8HFu/x3OxcJ3gFd3oyAKfjejKy5KvOSA0Hq+sGcY4hqPsgZiV QeKDIkI8Nkzj2fjG442JBFN+mIR79PLwXP7OwH6UMK0sMEtAjv2if8cdPjqcBweEwMGh 32EA== 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=HTO7iDPPdL1KeNHsQMzCt9aCHZYM2JUfy14ixfSBBaGgcoeD/C+lhlI7h9y6XV6lN9 fG16fxBDhVwVMCKqqKyPZRPG5j9DzqN3jLWg9IrbQ3zzd82vTAyiqZupJXRIRzguY5S9 cLQ/izP+euiqJvmvO8O/Iyl1V43VO0AcxvrkjDIX+GfpAk6D8iVTlQ0UJAmOS4dkdsDi Uqkl6jq8GiW5bMECSLX6o7oRsrvrdw57oCdi4AcU+PCZPFvCxu6xhRanH0iZsfJLlGDS a17t7682GByPilF9u+vBvAJ1Im0oQViD1oJr0CZjsiVK/fqLst2/Wq7j94pk5jJsdFOI r5xQ== X-Gm-Message-State: AOAM533XlYIGNuaL9HLrB9TAtCUeLG8XSUVEhD0e1zZk0Z84lEsdgjb6 6FqfRt+S+SKQ2JuFfmiPF43lP3R+UE0H62cQ X-Received: by 2002:aa7:978c:0:b029:32a:403e:88cc with SMTP id o12-20020aa7978c0000b029032a403e88ccmr11766583pfp.7.1626455949611; Fri, 16 Jul 2021 10:19:09 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:30cb:56ce:2598:843e:f055:e9fc]) by smtp.gmail.com with ESMTPSA id j25sm1839775pfh.77.2021.07.16.10.19.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jul 2021 10:19:09 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jul 2021 22:48:54 +0530 Message-Id: <20210716171854.5409-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: 9Q3R95OkY+zF 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 +}