From patchwork Sat Oct 22 21:02:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38914 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1439186pzb; Sat, 22 Oct 2022 14:03:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM48XHM2ntRALXXBbDoqw/fp2mrmDo6Ucg6YPHg5gyGga+R8PWKiHO+YUTFWRDhKuvIesCqk X-Received: by 2002:aa7:c78e:0:b0:456:c524:90ec with SMTP id n14-20020aa7c78e000000b00456c52490ecmr23709024eds.192.1666472624640; Sat, 22 Oct 2022 14:03:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666472624; cv=none; d=google.com; s=arc-20160816; b=SYtKBAFBdw0762G0xcPC9+MvdnQcd2mOrP5ZrLLj8FWmGgi48wQB0ouC3wNCHuMt3c orP/XzwNxhpDVpM3aT8jakhavrIQe/njCxjLDTiKtH5VMZA6l06TGX2BtqRVA8rbNFHz j1FpoNC5tmHJBpQmEiN0zXEGpAuyZA/6MmmKwDq4lQurwgHvchULljdEslL5jl51Senz Thj4pyyWF+7F6u4e0RxUtC8m28wLwYNErDbMZepSw+BUFY3IPC29tsGU9HbO7Isdwf4h aaa8VMCRIZ5tEeYU4lYA+8QFeWw+uy9LYCtNpny4U/fvcUnePptNiwsHIMxQ314rWOsl Bunw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=to3IiGiV0jCMUFGJN+K4c7nj3pZdAKLGO34QJuY7KI4=; b=iyzu7YlcCqRV08y/jFNCu+wz0625UJtW7EWXt4N3HKxuzkC/kVk3ELjVLil6GGBMvv 1eBdSxgO0ZXFhkNqD5Y4xStHcbTXNMy2h+IblLtGicOejkq86p4LCBZZ3lNBEarT4P6t MfctZkPq9nsXMn/0NwAanbp2h2ObQS0uY4Js0cXtLjoWMDr5Hf5rJmwlP1YRT0+TcnUO Tc1ONVWnYN+qDoWBM5blHmq1EZEr8c6kHQzMkMX2vsQhjmUKnGSSnDSpZi/T7bIgMwUN hUnlrDDH2b8089kbtFOeRiTzvwKrKtv2nNTGMguiAKip4NMC7BxASb4doi2KLDJfZMN7 UrOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hg+Fa77j; 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 l15-20020a170906794f00b0078333d9f17bsi25627270ejo.819.2022.10.22.14.03.44; Sat, 22 Oct 2022 14:03:44 -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=hg+Fa77j; 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 BE14F68BCC2; Sun, 23 Oct 2022 00:03:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 188F968BCB8 for ; Sun, 23 Oct 2022 00:03:24 +0300 (EEST) Received: by mail-ot1-f47.google.com with SMTP id z11-20020a05683020cb00b00661a95cf920so3865309otq.5 for ; Sat, 22 Oct 2022 14:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SaPk2v3HhgvjzH9t54f8MukptjxWysbGcLhP4WKN4w0=; b=hg+Fa77jdyZhWSpD0gOlfxgmS0nYaWaPPGadVI0PH1qQRg5gPcPNCLTCiwnmM+Qnrj w+T55jG8z0Tnn3x6ZJQyB1VqU9HW2lcnsRgM7s/sPj59Sb9WwhXK9Bi455l0bJ5ThzO4 eVzhL9ojATPyrUx3qFDDpSofWD7Ts1bwmEnjf1D3zFQuXFkAez3NklxXQ4whdmh2j6uE rAcYPBzd8ZELUyEn2SCL+mSLIjOAl88UPYPC20tXtZssDfKLHl+6j6xQki+DSrnAEhZc yYjOMQGJPpI+Q8TLQFYfoiSW3YhKvGGnHN7/MvIPNQ7vH51NeM75daNkenVkTZBSBcXs /pJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SaPk2v3HhgvjzH9t54f8MukptjxWysbGcLhP4WKN4w0=; b=l3rKYnko62qbrt7Lmkx0RPZFkCBECXS0fKqQkHr43DL1ZX0FfN9R7adXv8U+SpZZiG jn3jBCtNfXMRWmbddG03IdAtqbeoXf505fnZjS/jDha5wfUN5H20gdIf7Lu0x7vyfY/l P7wboy3lmj4EkiZL6DOngZLnvHaMYB15XjjPy+j5WgBEX5b8Pr+NaUFCOHllAiArsUjf cWK4tvcVR1scfGi31SSGRzd/sn/wt4mruCNDeBUgthdNU9aSkzX4wq647nP5/gEcTnmV mtbkyNwgtjpZsqoUchnD4KMm6tpS3lYQbEol8HjEv4pEdsw4WP3NQ9hldtMbA5AxLlM5 tIag== X-Gm-Message-State: ACrzQf3DzCnS64We66Fc4Bh6kWl4Yo30m5KefHDrmzWUgTnOq5JpkXWd burlbXYO9wIUaPRK7a5tvUgYf6A3z+E= X-Received: by 2002:a9d:5e04:0:b0:661:b01c:9817 with SMTP id d4-20020a9d5e04000000b00661b01c9817mr13101483oti.52.1666472602108; Sat, 22 Oct 2022 14:03:22 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id q9-20020a05683033c900b006622d085a7fsm1850663ott.50.2022.10.22.14.03.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:03:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Oct 2022 18:02:23 -0300 Message-Id: <20221022210226.2200-2-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221022210226.2200-1-jamrial@gmail.com> References: <20221022210226.2200-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/aac_ac3_parser: don't fill stream info in the sync function 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 52HBxSqxzXgv Have it only find frame boundaries. The stream props will then be filled once we have an assembled frame. Signed-off-by: James Almer --- libavcodec/aac_ac3_parser.c | 63 +++++++++++++++++++++++++++++-------- libavcodec/aac_ac3_parser.h | 12 +------ libavcodec/aac_parser.c | 7 +---- libavcodec/ac3_parser.c | 16 +--------- 4 files changed, 53 insertions(+), 45 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index b14b1e31f9..6df064e28d 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -26,6 +26,8 @@ #include "libavutil/common.h" #include "parser.h" #include "aac_ac3_parser.h" +#include "ac3_parser_internal.h" +#include "adts_header.h" int ff_aac_ac3_parse(AVCodecParserContext *s1, AVCodecContext *avctx, @@ -48,7 +50,7 @@ get_next: len=0; for(i=s->remaining_size; istate = (s->state<<8) + buf[i]; - if((len=s->sync(s->state, s, &s->need_next_header, &new_frame_start))) + if((len=s->sync(s->state, &s->need_next_header, &new_frame_start))) break; } if(len<=0){ @@ -79,42 +81,77 @@ get_next: *poutbuf = buf; *poutbuf_size = buf_size; - /* update codec info */ - if(s->codec_id) - avctx->codec_id = s->codec_id; - if (got_frame) { + int bit_rate; + /* Due to backwards compatible HE-AAC the sample rate, channel count, and total number of samples found in an AAC ADTS header are not reliable. Bit rate is still accurate because the total frame duration in seconds is still correct (as is the number of bits in the frame). */ if (avctx->codec_id != AV_CODEC_ID_AAC) { - avctx->sample_rate = s->sample_rate; + AC3HeaderInfo hdr, *phrd = &hdr; + int offset = ff_ac3_find_syncword(buf, buf_size); + + if (offset < 0) + return i; + + buf += offset; + buf_size -= offset; + while (buf_size > 0) { + int ret = avpriv_ac3_parse_header(&phrd, buf, buf_size); + + if (ret < 0 || hdr.frame_size > buf_size) + return i; + + if (buf_size > hdr.frame_size) { + buf += hdr.frame_size; + buf_size -= hdr.frame_size; + continue; + } + break; + } + + avctx->sample_rate = hdr.sample_rate; + + if (hdr.bitstream_id > 10) + avctx->codec_id = AV_CODEC_ID_EAC3; + if (!CONFIG_EAC3_DECODER || avctx->codec_id != AV_CODEC_ID_EAC3) { av_channel_layout_uninit(&avctx->ch_layout); - if (s->channel_layout) { - av_channel_layout_from_mask(&avctx->ch_layout, s->channel_layout); + if (hdr.channel_layout) { + av_channel_layout_from_mask(&avctx->ch_layout, hdr.channel_layout); } else { avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - avctx->ch_layout.nb_channels = s->channels; + avctx->ch_layout.nb_channels = hdr.channels; } #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS avctx->channels = avctx->ch_layout.nb_channels; - avctx->channel_layout = s->channel_layout; + avctx->channel_layout = hdr.channel_layout; FF_ENABLE_DEPRECATION_WARNINGS #endif } - s1->duration = s->samples; - avctx->audio_service_type = s->service_type; + s1->duration = hdr.num_blocks * 256; + avctx->audio_service_type = hdr.bitstream_mode; + if (hdr.bitstream_mode == 0x7 && hdr.channels > 1) + avctx->audio_service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE; + bit_rate = hdr.bit_rate; + } else { + AACADTSHeaderInfo hdr, *phrd = &hdr; + int ret = avpriv_adts_header_parse(&phrd, buf, buf_size); + + if (ret < 0) + return i; + + bit_rate = hdr.bit_rate; } /* Calculate the average bit rate */ s->frame_number++; if (!CONFIG_EAC3_DECODER || avctx->codec_id != AV_CODEC_ID_EAC3) { avctx->bit_rate += - (s->bit_rate - avctx->bit_rate) / s->frame_number; + (bit_rate - avctx->bit_rate) / s->frame_number; } } diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h index 8b93cbf84f..560bba54f5 100644 --- a/libavcodec/aac_ac3_parser.h +++ b/libavcodec/aac_ac3_parser.h @@ -39,24 +39,14 @@ typedef enum { typedef struct AACAC3ParseContext { ParseContext pc; - int frame_size; int header_size; - int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info, - int *need_next_header, int *new_frame_start); - - int channels; - int sample_rate; - int bit_rate; - int samples; - uint64_t channel_layout; - int service_type; + int (*sync)(uint64_t state, int *need_next_header, int *new_frame_start); int remaining_size; uint64_t state; int need_next_header; int frame_number; - enum AVCodecID codec_id; } AACAC3ParseContext; int ff_aac_ac3_parse(AVCodecParserContext *s1, diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index f3baf7cde3..f295dfccdd 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -27,8 +27,7 @@ #include "get_bits.h" #include "mpeg4audio.h" -static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, - int *need_next_header, int *new_frame_start) +static int aac_sync(uint64_t state, int *need_next_header, int *new_frame_start) { GetBitContext bits; AACADTSHeaderInfo hdr; @@ -46,10 +45,6 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, return 0; *need_next_header = 0; *new_frame_start = 1; - hdr_info->sample_rate = hdr.sample_rate; - hdr_info->channels = ff_mpeg4audio_channels[hdr.chan_config]; - hdr_info->samples = hdr.samples; - hdr_info->bit_rate = hdr.bit_rate; return size; } diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 425e1b4742..8885e1c72e 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -215,8 +215,7 @@ int av_ac3_parse_header(const uint8_t *buf, size_t size, return 0; } -static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, - int *need_next_header, int *new_frame_start) +static int ac3_sync(uint64_t state, int *need_next_header, int *new_frame_start) { int err; union { @@ -238,19 +237,6 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, if(err < 0) return 0; - hdr_info->sample_rate = hdr.sample_rate; - hdr_info->bit_rate = hdr.bit_rate; - hdr_info->channels = hdr.channels; - hdr_info->channel_layout = hdr.channel_layout; - hdr_info->samples = hdr.num_blocks * 256; - hdr_info->service_type = hdr.bitstream_mode; - if (hdr.bitstream_mode == 0x7 && hdr.channels > 1) - hdr_info->service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE; - if(hdr.bitstream_id>10) - hdr_info->codec_id = AV_CODEC_ID_EAC3; - else if (hdr_info->codec_id == AV_CODEC_ID_NONE) - hdr_info->codec_id = AV_CODEC_ID_AC3; - *new_frame_start = (hdr.frame_type != EAC3_FRAME_TYPE_DEPENDENT); *need_next_header = *new_frame_start || (hdr.frame_type != EAC3_FRAME_TYPE_AC3_CONVERT); return hdr.frame_size;