From patchwork Fri Jun 17 13:04:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 36302 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp120692pzb; Fri, 17 Jun 2022 06:05:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vLAK8yVTZp/NEyvrhwxnkaVpEnUemLhWwx+62FZwYOALZEwz+5VOvgo+yH9ReF93z44WVb X-Received: by 2002:aa7:c542:0:b0:435:75e:8a7b with SMTP id s2-20020aa7c542000000b00435075e8a7bmr6145171edr.108.1655471148636; Fri, 17 Jun 2022 06:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655471148; cv=none; d=google.com; s=arc-20160816; b=lIquU1YFZorpFTbsYp1KfFjaRKQLSDMH9Pu47KwWBgdzed8hnMQiJwXG/7pUnKXgwJ pzLU2LHmUTCo3IPCUaX6P9igJ7YHaSbSWI1ssCJgubuxMpZu9R2ghEr7aEFRTHxF4TDk 2WB5HBUN2vD6SM7bosMy+S6TKPw/8CMttBF8WJoAf1PSKAxsaHMRa1USpBfnjiwfkHbs 12fs+tloADd+juVLEeZYSh1b1MTW51Iv4Wj2HXDXkWZUbEYWvWsoaTb4F95uq1dBPbl0 pP3aqdE8FWPwFX7u40iOEu88V/qON3uPO8PN2GkIkfCQpvVql2NOE7n8tfPZZVht8MG1 DdNA== 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=DBxIfFrtMbD/40wDCTL1kKWESrpdpWbA8tJGW4Q8XP4=; b=Bn++x5Cy3aNoOgdqvGJEFfcuDA+/qyQTDQ0ir3xeqTnvDTpOnGexRVQ6INq3Pn+y9t 6PkBCLEBd5gz4aGu3gKTmXYde5H5aHB090hmKUlQYlGtKxF1l1HaJQevN+wHhMMASG8K zJBT9w76i0DXMvOvU87K+6xHvJTn5CkvorUJp8nEDghom53AvJudED9FG4jfwIMJ8us/ pxpGnKww5OzzJMljZEYJdnMjQIWJrzdCDDsHbEPJwtvNb/e7zng5tRIg8gL6YnNNfVyB k/fjVCHScWWMIgIHBDTi6Ljas3mQE17TJ5BWlepmsnnYoTPo5DYWlNTwytO57hfl8AcN uUvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bWHMbDIY; 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 ds14-20020a170907724e00b006e8d1d9dc28si5403253ejc.32.2022.06.17.06.05.47; Fri, 17 Jun 2022 06:05:48 -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=bWHMbDIY; 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 5C49968B8A6; Fri, 17 Jun 2022 16:05:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DA4968B8B8 for ; Fri, 17 Jun 2022 16:04:53 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id c4so6824679lfj.12 for ; Fri, 17 Jun 2022 06:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fcbExe8cG1I3ThLOlhh3fKmilCQtn9xvoksEk+gUrp4=; b=bWHMbDIY9vMaKbC9bW1zsc/E2hnkcSWmpMsvwxVuhMFm7ZAyfH1I7C8Gq1DtbTxoi4 dBOGxwdaiFEqc0PWWG5mjBDue7PN7UJB+X6QCX045ebF2AZuvJFWyQBYHB+z+2lv9QYJ 4tK68kRxLqIJDOja0gr3Mrtc69NCqefAGz+fybDSbIOkz2k/bDyiYzUf6luoJVkGh8uM m2slLMIbq1eAsFtikM60WxMg6XBgDpmMlZ20EUczba5Oc3iJk3iBPJxKwT58FjGhDkXx HWO3knSAYJQ6gC9nC+nSnnPUi1iHv+vTnJVeLHOYmrnKFS8CoMQP6FX4wExZQLTveM+3 C97w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fcbExe8cG1I3ThLOlhh3fKmilCQtn9xvoksEk+gUrp4=; b=H5hcSEi0AQObgcP29z29G7Anqc9zIVlPadvOmXoB7cHUVsxo3eUo8xzLB0L+3OipRW BykjZHlOrmwGY2O6mHeU862rPANChEKyl1W2BHTp81aKbphXN9qbMJX4DpR40FYhfJY5 CJW6Lf3l1kxZvZO4YUZgh4a407GbrrrYwnq93gX8XVnIx85VMoKBF2RxQooJjwNCzyxe I7t8KufUlOzEKBqQ4kGQPRAdJX7HpYpc5drzFX6yFcD2Or7kN1l3arkYixES8nvvhcbn ktOeJTckpnKodnmb5xeQHi4cQtpm6hUhcXk+MynWzH1knZBVnpUibAvo8/ZANPDAOWZI E8Lg== X-Gm-Message-State: AJIora9Wpg+xUWhZCbkZ2Apui2XfEyhJeSOOQPANnByJhm1sbtvJ7l1w aEZaHTrulDd1bF+g232pXGjmM4Wj3Mk= X-Received: by 2002:ac2:48b4:0:b0:479:9fb:6326 with SMTP id u20-20020ac248b4000000b0047909fb6326mr5878803lfg.130.1655471092700; Fri, 17 Jun 2022 06:04:52 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k20-20020a192d14000000b00477a287438csm638487lfj.2.2022.06.17.06.04.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 06:04:52 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 16:04:40 +0300 Message-Id: <20220617130443.188377-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220617130443.188377-1-jeebjp@gmail.com> References: <20220617130443.188377-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/movenc: enable handle_eac3 to handle AC-3 tracks 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: SItyCJ2L3psa From: Jan Ekström Add the AC-3 frame type, as well as early exit from additional packet parsing in case of AC-3, as only a single packet is required to get the required information. Signed-off-by: Jan Ekström --- libavformat/movenc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 87cd066c95..c24b11cf5f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -443,7 +443,8 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) /* this should always be the case, given that our AC-3 parser * concatenates dependent frames to their independent parent */ - if (hdr->frame_type == EAC3_FRAME_TYPE_INDEPENDENT) { + if (hdr->frame_type == EAC3_FRAME_TYPE_INDEPENDENT || + hdr->frame_type == EAC3_FRAME_TYPE_AC3_CONVERT) { /* substream ids must be incremental */ if (hdr->substreamid > info->num_ind_sub + 1) { ret = AVERROR(EINVAL); @@ -475,6 +476,14 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) info->substream[hdr->substreamid].acmod = hdr->channel_mode; info->substream[hdr->substreamid].lfeon = hdr->lfe_on; + if (track->par->codec_id == AV_CODEC_ID_AC3) { + // with AC-3 we only require the information of a single packet, + // so we can finish as soon as the basic values of the bit stream + // have been set to the track's informational structure. + info->ec3_done = 1; + goto concatenate; + } + /* Parse dependent substream(s), if any */ if (pkt->size != hdr->frame_size) { int cumul_size = hdr->frame_size;