From patchwork Fri Jun 3 12:46:19 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: 36065 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp4604680pzj; Fri, 3 Jun 2022 05:47:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0OfOp5UzkTbi1qVWIeJrUAf1KIaXo4fqUBIhDHRU5hkMpZyyO/FFFsjCw8TmRfj9XsyIe X-Received: by 2002:a05:6402:5211:b0:42e:2e1c:5bce with SMTP id s17-20020a056402521100b0042e2e1c5bcemr3690140edd.198.1654260447532; Fri, 03 Jun 2022 05:47:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654260447; cv=none; d=google.com; s=arc-20160816; b=FTC0UIbE/am2OiWfVfE5xE0DhW7t2NvryaHi9geJDpgRg5KFi2p6uHSHY28zajWnlH XKns6fzD4uYzPF7nJ0D5IDDCW8c3pTP5hy0ttd60GEHircswQbmzRbZO+kjeAfRJyvF4 qq27pQrZuoD6keYAyJZQi8tK40v9oQUO5Oqzg+MCTSRuod1XrmniBS2WaIVfa2YDKz7S ljBZ9LxNBbbCz2j/v6rZcF75r32XPzTKZVp3uxI/xLegS6AeU7yOo60AMmB2TGn+nq1Y jsVGQuMu2gMXVEzS4J5EsmF60q8fkFlc4y8euaALIoaA0PtmL8X9n6N2cszktQU188Yy yM4A== 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=e/Tc31/mUDy8XOyDm58aiXeBwYjrZFEwREdMtsumvOw=; b=D/nF2ZoDUMJ3hQMbvaugy8de29LKadJOnxRR/doj8jciHjiQGSEN1wgp6Trfpy0U+k 4jU9rDoQcGCupcw48xtpTlte5okI+ABqssnJ4WTAagjpB3rDWp8PNddg/LxrO1TIxJrH oiNAp6C6Dl0e8iLVunCV5bFFtdar6LkLLFWrk7LpKSvB9T1nq84XBHi2wykiECw8nD3M nqxqiBpopU+GU12STXiYUeic33TUblqZz5sm+qZXlKKG7WOPvjdPdfizOsf+XdoXyHvi QePhZMsn48rJsy8NV8e12yzsW3BgQS+QzxKRT+8dr+FvnOX6SJog5x/Sq8JZfleBYELy jzKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=X87PmeOe; 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 ga9-20020a1709070c0900b006febc8696acsi3891234ejc.770.2022.06.03.05.47.26; Fri, 03 Jun 2022 05: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=X87PmeOe; 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 D0B6168B850; Fri, 3 Jun 2022 15:46:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BBDA68B815 for ; Fri, 3 Jun 2022 15:46:30 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id 1so8308226ljp.8 for ; Fri, 03 Jun 2022 05:46:30 -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=RGbJzkTilZhjBdp1ADJB78AYjoRskjXP+cjoJ6eJu+w=; b=X87PmeOeo832JLDVkb4s/m6g+najPVEz4vV2Ms/TNOUp6+Jrs+kYIrRsXCd2GRO12Q t9KHvYW8yhZdsyMuGQZVD9pF0QblxuoYQLQQzfoH0NhMANRCHjkjSJNnwQNQ+jkeaYrT AzW9O/R63dQ+u3zPr2OzZjTLYQvS9BfKu5fwQ1ElNYFHunbw/t4UdBPgdij1Qc+yIOLk JAfxSWLas+Xw/C5n4rcs+mDG5KUT3P+2fF/AwdyNfwKKCFHHR03lbVO7xmJ+Y1zBejyJ dAAC48eLByhB79+4yWeNApf3AB+jYL+1shq0bidfSLBwimgWQBkSulkl5OhQ1YVaEd+H ZwYA== 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=RGbJzkTilZhjBdp1ADJB78AYjoRskjXP+cjoJ6eJu+w=; b=GKi8bW8s6wIMBUR/KV93O92n4eoaO/JKryjV3zX4Anx0BbzwhqyzaIUVwY8JTwGQsq UXKhRq9/j+YghLJGgOyOJAC2xcV5NCdpeJI+BFEbVHBGrwQDhB3Z4RWchQ/bJnWrAhPY ZVh6+L7xSKbPs6xcjdR9U3TaqARAG8rck2cr+TOu+Q8eONcVi+JlbSsDCET/wXKs5roU n1v2t6GMQjeaZzXC08GRpfiM7NUMv+Ku7zhjTYGsWuuj+6xfAJZgtavZoBDgfCqSQiFG tm4RaEq24z7zKtnvn6Pu3oMzg+27Irf3RNsicMU0aF18IgFHSM192mlNOIA15Niov8GH OWRQ== X-Gm-Message-State: AOAM530gFCAtlE85DuFY2Z1GWAV/pV2o3AP469hQ7sKg+PlBK+rTCLzh 7Fw2k4D6gTq41oTau0RcFTwXOuwDQ/M= X-Received: by 2002:a05:651c:88f:b0:253:f747:2fd8 with SMTP id d15-20020a05651c088f00b00253f7472fd8mr29864911ljq.496.1654260389584; Fri, 03 Jun 2022 05:46:29 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id m4-20020a0565120a8400b00477b624c0a8sm1561081lfu.180.2022.06.03.05.46.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 05:46:29 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jun 2022 15:46:19 +0300 Message-Id: <20220603124620.15099-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603124620.15099-1-jeebjp@gmail.com> References: <20220603124620.15099-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/movenc: utilize existing AC-3 parsing workflow for AC-3 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: v/yjcWcjZTUv From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/movenc.c | 46 +++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5bc1f4c7a4..a1daf3598b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -362,44 +362,34 @@ struct eac3_info { static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { - GetBitContext gbc; + struct eac3_info *info = track->eac3_priv; PutBitContext pbc; uint8_t buf[3]; - int fscod, bsid, bsmod, acmod, lfeon, frmsizecod; - if (track->vos_len < 7) { + if (!info || !info->ec3_done) { av_log(s, AV_LOG_ERROR, "Cannot write moov atom before AC3 packets." " Set the delay_moov flag to fix this.\n"); return AVERROR(EINVAL); } + if (info->ac3_bit_rate_code < 0) { + av_log(s, AV_LOG_ERROR, + "No valid AC3 bit rate code for data rate of %d!\n", + info->data_rate); + return AVERROR(EINVAL); + } + avio_wb32(pb, 11); ffio_wfourcc(pb, "dac3"); - init_get_bits(&gbc, track->vos_data + 4, (track->vos_len - 4) * 8); - fscod = get_bits(&gbc, 2); - frmsizecod = get_bits(&gbc, 6); - bsid = get_bits(&gbc, 5); - bsmod = get_bits(&gbc, 3); - acmod = get_bits(&gbc, 3); - if (acmod == 2) { - skip_bits(&gbc, 2); // dsurmod - } else { - if ((acmod & 1) && acmod != 1) - skip_bits(&gbc, 2); // cmixlev - if (acmod & 4) - skip_bits(&gbc, 2); // surmixlev - } - lfeon = get_bits1(&gbc); - init_put_bits(&pbc, buf, sizeof(buf)); - put_bits(&pbc, 2, fscod); - put_bits(&pbc, 5, bsid); - put_bits(&pbc, 3, bsmod); - put_bits(&pbc, 3, acmod); - put_bits(&pbc, 1, lfeon); - put_bits(&pbc, 5, frmsizecod >> 1); // bit_rate_code + put_bits(&pbc, 2, info->substream[0].fscod); + put_bits(&pbc, 5, info->substream[0].bsid); + put_bits(&pbc, 3, info->substream[0].bsmod); + put_bits(&pbc, 3, info->substream[0].acmod); + put_bits(&pbc, 1, info->substream[0].lfeon); + put_bits(&pbc, 5, info->ac3_bit_rate_code); // bit_rate_code put_bits(&pbc, 5, 0); // reserved flush_put_bits(&pbc); @@ -5981,8 +5971,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if ((par->codec_id == AV_CODEC_ID_DNXHD || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || - par->codec_id == AV_CODEC_ID_TRUEHD || - par->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len && + par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ trk->vos_len = size; @@ -6059,7 +6048,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } } - } else if (par->codec_id == AV_CODEC_ID_EAC3) { + } else if (par->codec_id == AV_CODEC_ID_EAC3 || + par->codec_id == AV_CODEC_ID_AC3) { size = handle_eac3(mov, pkt, trk); if (size < 0) return size;