From patchwork Fri Feb 12 06:27:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 25595 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 DEB1644A0B6 for ; Fri, 12 Feb 2021 08:28:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC6B268AC14; Fri, 12 Feb 2021 08:28:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15FFC68AAFB for ; Fri, 12 Feb 2021 08:28:22 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id u15so4608599plf.1 for ; Thu, 11 Feb 2021 22:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Qc9Pd67Tl5UuPBZ15aCZ0Zk//YxKK1SrESgXRwetd2c=; b=jXa9nnpwCCy580Yl0uHqu+8dW5O4CN7HVUZtiqSQHNamfFao88aAOjp6GzC5Xiy7U5 JYfP8FTdSri3Mgk8eLAxtZDmRlFmDxnghKrQbrhjlB7g/gH2F4RDEyWa6IvlrKrmv0v0 2uschtMwabON1qugkYDlqwgWy9rpISveQmAf5eedWWEU8BaGss2Wpy5tkYoqgqM8xX+F jAh3nFZGnBSUBw4mt7eD2InIAcqfejBU/uTBxpYyA09lY2+A/oVssBj/FcpCYtWAMfKo tyeBK4AjHMhifLMgZn2ZGrK3XmSs6liP+TZ+Pp0rx8PgdVPJWdgR0uCYF17BV/vlgPft 1U3Q== 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=Qc9Pd67Tl5UuPBZ15aCZ0Zk//YxKK1SrESgXRwetd2c=; b=d6CRN8eogVofx4/GEBxSOaaUkoNTO6+u7pBQqRtPxaCfeScoWS5+W/msfphAeuRMiI klOfGWTFysZ2J37BmPhP78U77oUg+g1y+rYQg1YNYpGkEmDLpGBfoGkczLBiKbChvUA0 BGlw0innh6N3B1pGbp/VoFG4nfxGA6AI4g4vTP3i+17isKMHZFrHHh+f8bfe1uP76yHk G1CHoeu38Tkppg0CUyOuDbMn7C9zwMpcghfENHZEwzXoy+z3MSD6ufBNz5waIh+enJDT tUSbQ2izAFOKjfYevGdsi39hS3g6ole383l4pIjsLKNqLpJTcl3dWFRWaql8PRA//IhE khzA== X-Gm-Message-State: AOAM530Kou5CfOoB/rJ6wL/9woOhqSc/qTgWxaPe0kBO5kHCEsg5UTEL b3E3NzRyT3rGiYx6ATQClC8gglU2fgFNAQ== X-Google-Smtp-Source: ABdhPJxyZPLzZq5K9tFZKCRobJWgBbooznX33EPVSmUzZheO4NZXn5n4+vrpTfLG1jVfyL4lpQdrvg== X-Received: by 2002:a17:90b:885:: with SMTP id bj5mr1403758pjb.195.1613111299999; Thu, 11 Feb 2021 22:28:19 -0800 (PST) Received: from localhost.localdomain ([2401:4900:4454:8c94:547e:47ee:d442:3ecd]) by smtp.gmail.com with ESMTPSA id o129sm6704296pgo.27.2021.02.11.22.28.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 22:28:19 -0800 (PST) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Feb 2021 11:57:53 +0530 Message-Id: <20210212062753.12510-1-nachiket.programmer@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] 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-AES 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 +}