From patchwork Fri Jun 17 13:04:42 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: 36304 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp121012pzb; Fri, 17 Jun 2022 06:06:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sKiv7gYGL86rr5Vt8zyDLT/wq8NUqsC2z9tCBe5cGs4cLqNW+hIg8EF7KmhiUXI/Cz5m18 X-Received: by 2002:a05:6402:3805:b0:435:61d8:8da0 with SMTP id es5-20020a056402380500b0043561d88da0mr3136492edb.63.1655471178316; Fri, 17 Jun 2022 06:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655471178; cv=none; d=google.com; s=arc-20160816; b=NdZ+k/X2Pc4JXxc+lpvEYg7NHO1Y96jrsCVdbCYI/0l6e67aSl63DyAbZ05mUWGJyx 7vxNjfu7oajBRodxl0uy7xM02h7LSW10V7A0JICH2hhKRKXABXnJIs6/3R+Zuw4zR/04 QehqJ2uJV5lTh3Xe6aYF2IsD0sBi6lhMcRqrXCcCVdhz7sQhyI9MrDyYD9Ei1Q6qrmSu W+2dCxfzRLYPiXfeJE3RfcuqVv+P4bFcgA8w1HKxLqYjFryZwUGj5yl7VO0bn8+XzvL+ gruG94G261PBtwhc0yczb0gZdiU0FkVm8hTEIbZ+Z51EvKOkjVqViPKiceGnbWJcqtxM HinA== 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=TugizUz3TMIBueOI9kPIw0U/QmvJUt6zHyYNvKaFU7Q=; b=lcL0BfCWcisVbKGGoDMGzUtjvTJaJTYNtCPxL5BV00lJ0+1e7JFO6H8Xl4QslUHLFR z7xJ23iCTMvR8mfwzGIdv5UJ3hoteYOY2bHlMtpVHkje8PWJe5XscgrXt2nGV4YtrfvD wbZ4UdryW17FQnkzOHfWwjia5zCtJ9wN6SB3j1LyuvjuFDcau4hyXZ9xML0//0+MFFF7 YKmKnjQlhcXwsdaSr072OQi2sKJ9r1joRATcnaJtCFWrxhkC0UkqOgLccEyAjjYczj1o DkAsMYS1POcMFx3Uj4eVpwE/fcw+ocQSP1op2caorGwhA/hv2sX9XO0jKF4S6aQrWVBI 8RKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=peVhqq+V; 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 f18-20020a0564021e9200b0042dcf5f5921si6141333edf.597.2022.06.17.06.06.16; Fri, 17 Jun 2022 06:06:18 -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=peVhqq+V; 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 4BA7068B8C1; Fri, 17 Jun 2022 16:05:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 026D168B8A5 for ; Fri, 17 Jun 2022 16:04:55 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id i29so6868128lfp.3 for ; Fri, 17 Jun 2022 06:04:54 -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=LVBIwjS6rQYX+lRQFgiD1VyK0mX+qwID/sGBKUW45TU=; b=peVhqq+V/RRCukKDzvuQLwQBtjUDFNyg2iq7tcpBfnDfc5gu9s7V5oAUYw+4Y75n93 wcUYPHiEyynpMhOTWUHEJLHS38j5fQN/aJMGTVj1J4myyeygDRzVcbVUAgOcWCuYh6Xw pkr3mwDDWPDg7KrNREijFmW5EsEb1epQSm+prBPgOaLiLhze8VG+nJs/Vo2nuzAOS4sy iFT/ZmN8iIuANSGFxBsTuF3dE1NtuRa3foVjHfT+TjGM5viYAMsIp8V20NPlcslABKiL ZfCC7WwBabxVFQRQXEZXUQmkVrADpyJLQ2wugMdggMqPnBoA0XU5ZNikUE0AsmuhMabv C+hQ== 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=LVBIwjS6rQYX+lRQFgiD1VyK0mX+qwID/sGBKUW45TU=; b=dJ2bXPiSnxcvVGyh/MG983L1MuQKdDf141LmhCOdDSLorurLPMMXy3StQ6bpGhueqs owjwuLc1RHTm0GiOixL9wJ1nRuUzIC/Crwst3K3VnN9R7J3j5isQmMs400oVlDsQfHQO QDDKf3Zi07Zgp8h2roooz1G3GFdPBnZgb4Sxq6F+5YfhwDkVA7jB8tZU7Ci7ejSeSa7s TQlzR6D7EdvraEktBOcOInnuLePlX0iN6cfWNLAI/OMtlzLxgG3McF28RvJqkIiD0sIT nwwZ8qcdiE5+g74K6PdBXYwBNy1PkyNtNsGXavFZ8aLec5JI7kuY+WpJp6XGOR966nAX Fdbg== X-Gm-Message-State: AJIora9O6VrEbYPcmwzaHzDVAFSuCkPE6ikLVRBRU3vVf1ZyQ7sN6cbp WMJbSZ/IlRYAh3ZbLOrFrz6Ygown4Q0= X-Received: by 2002:ac2:4c49:0:b0:47d:d5e6:6501 with SMTP id o9-20020ac24c49000000b0047dd5e66501mr5687728lfk.295.1655471094227; Fri, 17 Jun 2022 06:04:54 -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.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 06:04:53 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 16:04:42 +0300 Message-Id: <20220617130443.188377-6-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 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: GYVKOEl2dng9 From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/Makefile | 1 + libavformat/ac3_bitrate_tab.c | 22 ++++++++++++++ libavformat/movenc.c | 55 +++++++++++++++++------------------ 3 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 libavformat/ac3_bitrate_tab.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 1416bf31bd..c71de95b2f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -699,6 +699,7 @@ SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o +SHLIBOBJS-$(CONFIG_MOV_MUXER) += ac3_bitrate_tab.o SHLIBOBJS-$(CONFIG_MP3_MUXER) += mpegaudiotabs.o SHLIBOBJS-$(CONFIG_MXF_MUXER) += golomb_tab.o SHLIBOBJS-$(CONFIG_NUT_MUXER) += mpegaudiotabs.o diff --git a/libavformat/ac3_bitrate_tab.c b/libavformat/ac3_bitrate_tab.c new file mode 100644 index 0000000000..57b6181511 --- /dev/null +++ b/libavformat/ac3_bitrate_tab.c @@ -0,0 +1,22 @@ +/* + * AC-3 bit rate table + * copyright (c) 2001 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavcodec/ac3_bitrate_tab.h" diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 103f958d75..a071f1cdd5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -36,6 +36,7 @@ #include "av1.h" #include "avc.h" #include "libavcodec/ac3_parser_internal.h" +#include "libavcodec/ac3tab.h" #include "libavcodec/dnxhddata.h" #include "libavcodec/flac.h" #include "libavcodec/get_bits.h" @@ -362,44 +363,42 @@ struct eac3_info { static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { - GetBitContext gbc; + struct eac3_info *info = track->eac3_priv; + int8_t ac3_bit_rate_code = -1; 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); } - avio_wb32(pb, 11); - ffio_wfourcc(pb, "dac3"); + for (unsigned int i = 0; i < FF_ARRAY_ELEMS(ff_ac3_bitrate_tab); i++) { + if (info->data_rate == ff_ac3_bitrate_tab[i]) { + ac3_bit_rate_code = i; + break; + } + } - 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 + if (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); } - lfeon = get_bits1(&gbc); + + avio_wb32(pb, 11); + ffio_wfourcc(pb, "dac3"); 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, ac3_bit_rate_code); // bit_rate_code put_bits(&pbc, 5, 0); // reserved flush_put_bits(&pbc); @@ -5975,8 +5974,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; @@ -6053,7 +6051,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;