From patchwork Tue Jun 21 06:46:31 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: 36367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp2050827pzb; Mon, 20 Jun 2022 23:47:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tGGVCCK/m/rJOi0s0vT+KY5b1yHNUsAJDmeltmiYUF3NgDsMsWZ2BfrTIdMCPm5d4DLH27 X-Received: by 2002:a17:906:77d1:b0:713:cc5e:e908 with SMTP id m17-20020a17090677d100b00713cc5ee908mr23763804ejn.254.1655794047097; Mon, 20 Jun 2022 23:47:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655794047; cv=none; d=google.com; s=arc-20160816; b=a75URq90myp7vMJrNsxq8uwkccIbbmJln+Tnjo02dtrZo6pfgtIMfGiVkk5sefi0Ad W9XAGOydh3enqUdi1yAJKYVEz+Sakp8eNHRg8swoZ+9Yc6XZFg8SaeS4V859QrOvLNtt wH2dVcxkSSKqk2L+73UDbI9bL5zR+0FXNDXis9BGt20g5BUc6WZSvSii6cfv0qBGgXAK eGHa/i64OnpmuNb6CWQ8IOK0J8Xx6/dntWlGeeMzl960NeaxMKAS85asm2535OH/j6ma sVpaCuwxXr2gESuWVzXQ8o3ci3gRQfZrZbq4yw0N9fi9tPUfksghn/3AfQZ4/R8/EDuK T2ig== 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=ATpjFvu+25rXJCNNN7gIeeV3C10SnLdyhaKQ3mrlxpgCgRd/6rrMA7n3kAZKq9okTL sdOc/itf4lYAEuIDscydKcNEZ8HVpS7GFs3vnWru5cRjLGXGl6yVBrR7nRL87Ra03u6h 8ynHDp85IjDbZgEAihjqNWA1jH6sDXQ9jf8pSsH57BbJC4fKAt/I/ewuRvfkZPksvPgn X2YI4kcHRoeat00WGlBlfmNmQDe0qli1A+EvI83Z0SAksHXrzspVb/DPonpbEuKFBOK4 uaG6vDfZXS7n3O6onqc6doAGh2FggkkxVrusDjNe5zPPU9QcbKNmn5Eh0I/0o073F7dv Yypg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=phL5YxMR; 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 du6-20020a17090772c600b00708f4d9dbdbsi14607217ejc.79.2022.06.20.23.47.26; Mon, 20 Jun 2022 23:47:27 -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=phL5YxMR; 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 7935568B697; Tue, 21 Jun 2022 09:46:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB26468B641 for ; Tue, 21 Jun 2022 09:46:43 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id s14so7541423ljs.3 for ; Mon, 20 Jun 2022 23:46:43 -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=phL5YxMRHHwSA2BAuqDlySF+glzaTRI6gLayVD0IPvYN3ALg9oRTd2nJ760ECuHfuk mvzA87t8YF2gcC7BpfRU9agMb1ArZGbn6nDyjbvfRHbEfBcRhzT4zFVPL+oDncRjt+C7 aOPKd4AVMWkqxvBeqGOMXZel+X9juZtGlCzBWUW9qRyB+YTFRpx1ZUzoWNgkN0mvYupu bKZ/0z7xTiMC/ueTQMn/jPzbZAMzX2XXl9Y0fWYYGddJCARADJbRGAbWeHUpssQbwayk pSVqtDl11gizVf7x27HgvNmc5vYIqrkzaGLTg5OAWLO6CLfgooWpSfPZ6C7HobNkfE8H MT9g== 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=7WrJ2G7BGzhYQvy3ShJWy0tpeJC9SHHbfX8RN2869SJdhX55s3IOEI+woRv9SVZeBR 881g0zuSJ2s4Yw6v9mThzKi+iE/VENSpspiRlu/Bv4rk95ARCZTeIaey/uk9FSm1TiO3 28ypMSkCF/dR06mLtZynr2/NKZWhRT6nmpILvYI8f9LazGLU3osfdLCLPKv2uaNUZux8 ydLQFcWmGG9MwImHekghixG6Oq3H4Al507dCu+8UX+ZfrmCbVsEN350lsv0kvwUi0bqI cETYrMwaFNYKQ+DshEv0604V21Xu4BRIhqPCrXXTy9PikxB3nxdD4PzqM+hFKYu4l19z okLQ== X-Gm-Message-State: AJIora83nqaENU7ABvWArPIn3DX7PUDwjUaYGNCHQE3yPPbd6VRP93UO 73pv2nFIJEqsXFNIHlVyEKGh57+SLXE= X-Received: by 2002:a2e:a484:0:b0:255:5bf9:144 with SMTP id h4-20020a2ea484000000b002555bf90144mr13089574lji.8.1655794003022; Mon, 20 Jun 2022 23:46:43 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id u18-20020a199212000000b0047255d211c7sm2046767lfd.246.2022.06.20.23.46.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 23:46:42 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jun 2022 09:46:31 +0300 Message-Id: <20220621064634.16797-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621064634.16797-1-jeebjp@gmail.com> References: <20220621064634.16797-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: GhWEZs0FiECf 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;