From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3C27249408 for ; Fri, 10 May 2024 17:02:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85C1B68D595; Fri, 10 May 2024 20:02:25 +0300 (EEST) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C12568D467 for ; Fri, 10 May 2024 20:02:18 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6f45020ac2cso1862137b3a.0 for ; Fri, 10 May 2024 10:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715360536; x=1715965336; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=CLc7CmKVlNY2GJrwDw4vADkNsdFnqh3n5vd4FftXIaE=; b=Lp9rrrV6S9D2cMSLmedKTfekRVQnCkU9E94tToZYNWj51KgRmAoPEZjooZoe462udG r8RwPJw5NZ+5qeQx5HeocVC+XTTfCrLiwuyv63RZYoHWm5seF2d1WLNSSSvBqL1M2/Bs KUal/P1eyqmt/qwN6cR7JNRAlU/+LtO9BnyDmuzmNNB2KmEngImBvkVKWPbN2wtcRPm9 8MJT8p5SIq+cAxQcBwVJIydCp3WCpmHk+IHGaqHPWLPDwXHkI54EBAEuVazxdDkBnND5 JvVb6YYcwZclmFKc1IAgfrrFa9ZzhN6R55pjoCHXzBkj3QOlFkjDITObzzFHjycNcpUt sYPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715360536; x=1715965336; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CLc7CmKVlNY2GJrwDw4vADkNsdFnqh3n5vd4FftXIaE=; b=dfRetu7iz0L/P2A4PIewUuzZEZPdidWFw9gY43TV5XffF7IpbHtcAN6fvuaxFXAQmg cg5+9IpGlwOXPF2Y5eeFeIkJg6wZfDWIZo/lVXXYKZiXrongLvo4QuFuIIBFeae85wEZ NuezmJWXb7G+UcvYH6C3+c+VimHJ8trLKpSYtMrS1gnB8ISRlKzZNLrgz8ARwRwhtlFL BkCwtdRoscZ4nCOK4fmo1QBED37VctlgEuZ/h8X7l7nbLLilc/9eyObncrVnBZP2eRtx IRnIN+xyHh5w5+va1V0xgQWD+DJ1PuT5s9lK2AVo2/NfYi+P4f5Z74f6u+OQF3f0jO7y WlAw== X-Gm-Message-State: AOJu0YzvU3n2Cyf0FIFMgC40vfHTw74k0AHmWEXWtEgCuFv6ovv86xxZ w2f87PAYEEEqeq7NgJCZqL37NDqIpU1XAsq877znUwyRrzoHZerwcqj6vQ== X-Google-Smtp-Source: AGHT+IFAoh5PfB5kF1ZexjPcIZkmDaTV5A/jpDHV2MYgnqvCEW0N+OZdtY9UTDVs2eK+sa3VGfIh2g== X-Received: by 2002:a05:6a00:1901:b0:6ec:cec1:8fe3 with SMTP id d2e1a72fcca58-6f4e02ac5a3mr3413135b3a.11.1715360536159; Fri, 10 May 2024 10:02:16 -0700 (PDT) Received: from [192.168.0.10] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a9d9acsm3249403b3a.90.2024.05.10.10.02.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 May 2024 10:02:15 -0700 (PDT) Message-ID: <2ca4b2bc-0317-4d92-9449-deaf8e942d17@gmail.com> Date: Fri, 10 May 2024 14:02:14 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 3/4] avcodec/adts_header: Add ff_adts_header_parse_buf() 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 5/10/2024 1:56 PM, Andreas Rheinhardt wrote: > Most users of ff_adts_header_parse() don't already have > an opened GetBitContext for the header, so add a convenience > function for them. > Also use a forward declaration of GetBitContext in adts_header.h > as this avoids (implicit) inclusion of get_bits.h in some of > the users that now no longer use a GetBitContext of their own. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/aac_parser.c | 16 +++++----------- > libavcodec/adts_header.c | 10 ++++++++++ > libavcodec/adts_header.h | 14 ++++++++++++-- > libavcodec/adts_parser.c | 18 ++++-------------- > libavcodec/bsf/aac_adtstoasc.c | 6 ++---- > libavcodec/ftr_parser.c | 7 ++----- > 6 files changed, 35 insertions(+), 36 deletions(-) > diff --git a/libavcodec/adts_header.h b/libavcodec/adts_header.h > index d89d487025..4f62edcbac 100644 > --- a/libavcodec/adts_header.h > +++ b/libavcodec/adts_header.h > @@ -23,7 +23,8 @@ > #ifndef AVCODEC_ADTS_HEADER_H > #define AVCODEC_ADTS_HEADER_H > > -#include "get_bits.h" > +#include "adts_parser.h" > +#include "defs.h" > > typedef enum { > AAC_PARSE_ERROR_SYNC = -0x1030c0a, > @@ -43,6 +44,8 @@ typedef struct AACADTSHeaderInfo { > uint32_t frame_length; > } AACADTSHeaderInfo; > > +struct GetBitContext; > + > /** > * Parse the ADTS frame header to the end of the variable header, which is > * the first 54 bits. > @@ -51,7 +54,14 @@ typedef struct AACADTSHeaderInfo { > * @return Returns the size in bytes of the header parsed on success > * and AAC_PARSE_ERROR_* values otherwise. > */ > -int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); > +int ff_adts_header_parse(struct GetBitContext *gbc, AACADTSHeaderInfo *hdr); > + > +/** > + * Wrapper around ff_adts_header_parse() for users that already have > + * a proper GetBitContext. That have or don't have? > + */ > +int ff_adts_header_parse_buf(const uint8_t buf[AV_AAC_ADTS_HEADER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE], > + AACADTSHeaderInfo *hdr); > > /** > * Parse the ADTS frame header contained in the buffer, which is _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".