From patchwork Sun Aug 1 14:53:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 29165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp871887ioh; Sun, 1 Aug 2021 08:20:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyC6RoyIhIB3K7Ag6MahgmHtGYKhna/19qS2VR21qD7QThZ/gE02UH9h6GndLvMta9ZF9Pj X-Received: by 2002:a50:9b16:: with SMTP id o22mr11778644edi.342.1627831234170; Sun, 01 Aug 2021 08:20:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627831234; cv=none; d=google.com; s=arc-20160816; b=p4S2DUCubQzs//7m8L634hlteWNYHhyyNPdQmaaMEBnVMG4nR+ZRSlsKrGHltH3B6x e1oK5rRUrJHZmAtu5I9a09zX/F7F5o0K+ycCkszbnLstJavVMgS87iUBc5I+Bovjvmdu IiUpmxqaUMC1BJfT3hUt+aWm3xt61anyNHdsUIfxUdMaVrFcDcAbgaLoUn0F90FaGGla r9Tffo9Mq+MeieWzG1kEvECHhXOwgBeBglwklEuw4Cxty6ewjUS6EHsSVExhBYQ+SbFh 8ICPJJeTti+g1oWoDJOWMfz4peqXzUdxjOThUrvfZVdh7UgcxgYq35bZGapB/9crHTQD WJLA== 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=MonuY2iuSlfv/HX3iusA82pV1QVSA35a9CWFV3mYhvmWNCemRzuudKPXEGrgVunWLb RujsYbBTdyTlwYKGF8RuqPOznJvbQUGwyvILmJHPQZDyPSQaXp1cjiePNKElqsd9i8ce ky3S9FwReWm1GhBbDNcq2nkXUp1ziTtAFdIQcQBlT0/ZpZXbVTYQy8xpdOzkOI9xM3FS FVLxoyY8iXOCyDFTu0U7hfXMKx24MQsQwzERbUYcZcLXS2kbV93aH8kI8DOt1SzXlDtH vOQ59Uyt/ZEZ9XH8XOMNEwQpH5cfqfy4ZjzhDHVaRvm5BKs+YQ7NmWEB6cmhR5QHT+NT 6HBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=c8yooWhY; 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 e13si8391138edz.32.2021.08.01.08.20.33; Sun, 01 Aug 2021 08:20:34 -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=c8yooWhY; 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 57D1368A58D; Sun, 1 Aug 2021 18:20:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D80C689CF7 for ; Sun, 1 Aug 2021 18:20:23 +0300 (EEST) Received: by mail-oi1-f173.google.com with SMTP id w6so21113981oiv.11 for ; Sun, 01 Aug 2021 08:20:23 -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=c8yooWhYFF/1lg78QLbQDu+jSg2MUzgjhBPc7m89QjdaMxrzxRzkjfwqnQT59DxDpa Zisx+sjwzSodgI9MG1qnPqbMlAlj9njRyFPoXOIvnr2lPcghq/ZZhxgaajHe4DqE71I6 i4WlPtk1dTaqMjetCZTPbFzPXZtIEobr9Tcb4FC/cqwTmyFVY5vKM0Q4TI1vJ6ajMdiK EEGFKbcGs1Jn3ZiMvoFpv81Stay8kbuQX5nZUR9YX9h8EYPc2vYa0utTXsR39OuGE5X4 cwFxK1a/CIdZ+ZyvJ+Jc7ZAsWGtuv366ryv49nKFpedVvAO2YaMjRbgZz+voezAl0cyX Cr2g== 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=shnCbXfKWhgPm0rLc+dNvGZFhdCtVBm9GRgoIt7UACP+rNBDvWqZuphxoHqo6PXRu3 TczAQCg9T+TuTK2vwhHiltRq0iCoNGczJxzzkr1DZ7ouAzzkZ/UEOYI5/qS82/nNVOCO Y+g4/GtcRf3oj8mZ4MsAMvSVFBYCD15YUBnjnAkDThKtdLz/GALk7olxsZ+UVHXt6klM 09+jIB7j8KOTs9/KNvSt6lEyMyJ8i+kJGGZlIbg/dAeGZ9KwwBd0Li7XzvbBwEYMV+RK eX2rOlGK1nnTT7ncmyHt90CcNtofQy0AqHWlK+T2qPydU1ncoy96vkQ5mQe0M8doi0e9 J84A== X-Gm-Message-State: AOAM532mW1bH39zR7ipkHAPMCSCOxEFojf936rjE2Khvtl6QtmCT/qnj IMN8ckMvx1I0l4y0wehN7JRwJCvJVgtl4A== X-Received: by 2002:a17:90a:4a88:: with SMTP id f8mr4365075pjh.226.1627829599392; Sun, 01 Aug 2021 07:53:19 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:445c:2b5c:adf7:1067:f5db:d755]) by smtp.gmail.com with ESMTPSA id d2sm9809908pgk.57.2021.08.01.07.53.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 07:53:19 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Aug 2021 20:23:02 +0530 Message-Id: <20210801145302.15290-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: xc6XPgJMrkfb 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 +}