From patchwork Wed Sep 1 14:38:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 29940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp620573iov; Wed, 1 Sep 2021 07:39:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznHZuikj9ymCvpFtV/KJuY4yF0O4ztT9LJQLjYNg5T3fSaGhVSrhnAWkf9jWkFufdcAvwR X-Received: by 2002:a05:6402:18ec:: with SMTP id x44mr35706450edy.331.1630507142813; Wed, 01 Sep 2021 07:39:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630507142; cv=none; d=google.com; s=arc-20160816; b=mpfm625SRbzm6IxuNHImxdd1u8El7twm7tRvAD2ofzLdugS+GmSZ9hZ8bLTcejZzT0 KEwkg1YP9UNfhYrmVuM4/mppCZK9Jqfw4zNp4MpdMlg3uBbXdRw8Fovmdb5Uq2fuTTMf aLirSCTstLJGndXhVSUqGU8moX37J94uqyj4vlK7nTjB65p00cZpIbm/PEnut/CCjnab t5MzitX9H5odASSahVqYPb2L8oqPYGpLKDqtJs+Kta+2mwZH+r2ovOGvsdVz85AXXnU8 1zwbGkvUCbrKNyXw5+iW+Uz/eBxjjxiIQ7LDbMFVJ4kJCzl+sS45d+ZJEcYPlOcPzsXN uBdg== 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=BMWWN2KNv2Ax+SKLPfLILJjVepsM4Acs1nkG7e5LdJI=; b=etA5/CyViG1jGB03diRl8iYO422D5glFW1h75oBHNSoT+xAXegWoEYBbdZE8luaPU1 qFagZAynYWLWqyhWjH/vscTLd0nWP3fD4SEQHyuLoqhlFUglIjGJ2Br2c2Uk5uYpLukM lhRhXt7y6PTdVvcSMRKdhp+tlZNl1xrzv3nHX0C9sHZvBkAmUHUE2R7KqaISafkCBQvE Jz7jdrnWv003xmpAxauMAVl48WS3z/I/l56kBBhVMHR21DlylqNKe9w3MsgILo+cHiHb m0DbNREsgAH277qYgv866c6GzyngFnBriRNX0eFHW86uAWd1dh1reEYAWFCoC3H6sbZx jEvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Q6LbW05R; 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 ka6si68746ejc.26.2021.09.01.07.39.00; Wed, 01 Sep 2021 07:39:02 -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=Q6LbW05R; 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 5BF9668A4EC; Wed, 1 Sep 2021 17:38:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DB146809A7 for ; Wed, 1 Sep 2021 17:38:49 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d17so1597244plr.12 for ; Wed, 01 Sep 2021 07:38:49 -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=MrJ0rGQ8p0UcbOmdCWrmAQlgstpTZfbKe3Id2HVyPC8=; b=Q6LbW05Rr7GmMTcfwQnFMYpdaVGa0aibntTZrgJvgerGWNilZCMo7Mvsll8o2xsgQ9 EmGsto040ublo5Yte9GTXv+gCKpLUvbnRhZR7d+3YiVjDTBT3twOXgy5H59Q0d33V3ri JLKz8/LaHxiE+iZ/vhAri1RnMXQFtrU+Kt8fv++DITetiLetUsR7UNQc3EMamxSsqais Pf/UKGnPY+5W5qU6oA+ZJIdnwF43EfE0XlMflymGodoRPXNbS3gt3fLkzauiPPIhZRUo mz3PF7+lej6pP5Gtb40XiTNUqlgkmvDADF6kMaZ/KaEzW7VUnDOx38dKOvCpiADnEb6R ZJ7A== 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=MrJ0rGQ8p0UcbOmdCWrmAQlgstpTZfbKe3Id2HVyPC8=; b=YJquxxsufuiBH3OFLYROUU0NSVdsCc2r+7TAMdGslgp6F9lIAGsK/jb6Onyf9PdDSr AMOTA11hmKzZQxs7pbRQmjL7Ej8qD8q5gYujC4yj5Qsl1R6poFR6PTVsBkgiH+8mKsQx GVbzPArwYx+2rv9Db8dOHnjiA5E3F2C9h6k7YgDdaMCy8ofpHl1+GBR9B9uhESc3mcdE hkIt7uBe1W/h/LwTOFu65oJ6WP+7DaoekEEFHHnR5PMfA/NyilC0IiSYQqNnmwHjDfRK uvIpnlQE/qJ9FnXeZbyRR4NvV6O5qgpFlQWrFAqh9/SmvAXEaccNEIt7tE1avs3C2wjW J3yw== X-Gm-Message-State: AOAM532TQoqjoyf4xySp7Os2h71Nj7KSZWjUo0j9X3lMdJ9Npf6bIQQv IJAkYjZtkBtROHXOt26ZuiEEpR8Y2oF1hg== X-Received: by 2002:a17:902:a710:b029:12b:9b9f:c461 with SMTP id w16-20020a170902a710b029012b9b9fc461mr9828453plq.59.1630507126860; Wed, 01 Sep 2021 07:38:46 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:30c1:1a96:2c52:550:c51d:1955]) by smtp.gmail.com with ESMTPSA id u24sm235171pfm.81.2021.09.01.07.38.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 07:38:46 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Sep 2021 20:08:26 +0530 Message-Id: <20210901143826.4575-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: kBU54z4bTYoL 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..166a28ffc9 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 +}