From patchwork Fri Jun 3 12:46:18 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: 36064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp4604603pzj; Fri, 3 Jun 2022 05:47:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEt92Lx8m6NCyLFIj5UYmvxC/BDRIwdzKKu3MlRpH7E7itA08lIAnfmHVDg115YQfih9iF X-Received: by 2002:a17:907:d88:b0:6fe:baac:25f5 with SMTP id go8-20020a1709070d8800b006febaac25f5mr8008822ejc.244.1654260438519; Fri, 03 Jun 2022 05:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654260438; cv=none; d=google.com; s=arc-20160816; b=tOiOZV6Jzcoz5VYhJatDgtuhdYnikyEZGwrIOSmYb4fnQESqKtsC2DgPz7z2ZFJedk ZAGWvMj0ojCye7/IeCmjoiL3GVm2JqjX+rcO0FyMo72YxsyUi0Xnrs2nhXq4EU1fBoyb be4HQvKyiWud4BhETRYl97kIrsKHJPa5UudiP5uvGdhdv8T8Zwk2hPa1h/GNtUY7GVZ5 78djD/dMJ56JBtrnxlkOsyCeSmw2ggSzJhgMkLIeMK+vehtOZMu81zSLT45HKfYy6c5K /dVV5ylveAPMo8PSmFnByHqcuWafo7zA2nrU74rfNyXWwMZJNR1jjwcHIwrDmyWVNsct SD9w== 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=KuEtqBkp5FsKTkAvOoZ4sPe3VI5L7jcjXMMPeMtRPqE=; b=k+Qt8cBFtnzLwuxlvhkMi7dNFq+YDJFF/J1fW6t/kerHCpkdG1Lt72cXoGpJFf+bEw PnlJd5q+3Le7X43LLmanTjxmold7NY1Ti76OG1uhECkvG8aVh8p0mkuDuCvw7xIiK6NR RpV0klCvDmmvbDnOxhcK3l+hsWvL43Jf2y+7YpiBdZOtNPZWwnXrzlsZ9C0C9zGxffMy VglqHtd35q+lAhkbyOZre69IHWqR5ERXgoU/RRrqTjn29jkdn0ZK9Buz2FEFYlroWHbv IjnBvWlWPOXfYWm4ZaLvZ8tW4PJeYSUgPvJxfOVZ9CghBxMApHncvckJNfBqUfjwe0Jh Sxtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LJNcCy3a; 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 ga35-20020a1709070c2300b006ff0f9209f8si1002523ejc.606.2022.06.03.05.47.18; Fri, 03 Jun 2022 05:47: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=LJNcCy3a; 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 CA9EE68B82F; Fri, 3 Jun 2022 15:46:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4CF968B815 for ; Fri, 3 Jun 2022 15:46:29 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id s13so8311763ljd.4 for ; Fri, 03 Jun 2022 05:46:29 -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=4d3Hlu9958uDIfJ67OUXWB4Idj3Bw/Nb+1/LGsQgqz8=; b=LJNcCy3acJ/QrNztuBaiO9QXyMfSVbh6nHNkC/ETCEUKCBA9MO5ntK58QQSkDE9zyW 3InY0jl07kyehEULyG8uNlrfQZHAaHSVCi+Uc95ETQIFQhjEWTmqs3lngdJIq4BwVamt TiJh9dm0ZKCRaNLnBmn0uqlMk4BIC93tO7q4u3w0WUxz3hcojOKqc+HmUvHn1cNfijQM ew3tsqim6q0asEmLZ0/KCXY9uEmeyfIbHr+ZKM2dbdiFzLFlAo1R06Yv0RLr7ibbbmOU WFNvTQZ/KiosknQ7a+VVFLhBm5dVGeRYtQwa4FKTsUu0xO44/SyUZ321evx8VhL8LrgW dKLw== 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=4d3Hlu9958uDIfJ67OUXWB4Idj3Bw/Nb+1/LGsQgqz8=; b=KpnSg1rv3GFslowjdBSIdcQq02CfGeLmBruytJ2fifx0aIfpitfr+0Sp1SvYbR/eyQ bTH1FzORxqaZGQDbGEHmCVRm/q9V82Pxp/ch60kamFiaLlkmC3MINpQZ30fOtSZyoKoU hhwE1mbiP8OIOkMGfR4PQBA80q8IEJ7ZXNVCt1D5XGYIHSB4sSlCiKXlaQZ8E0/SdTWO bzlhVNq9RqvL7Qh59LpvFCDITZraVJ43IaaD78GXB0ZIoihUl+VVXz7S9DKAMm/Lh/X1 2nbDW+Wtv8V7MF6Amio2nsGdIwIc4hx1bkX0Slq3NlUloXcrgzynLAAQtubL32Go1BiH IXyg== X-Gm-Message-State: AOAM530258gRMcte3qQKjxpyTen0536r3SVwXAR6T98iqUypxhykIlMI PLOHsF1BIJwrKLgc778HiMl3d2E3tjg= X-Received: by 2002:a05:651c:1198:b0:253:c443:cdcb with SMTP id w24-20020a05651c119800b00253c443cdcbmr42962991ljo.22.1654260388932; Fri, 03 Jun 2022 05:46:28 -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.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 05:46:28 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jun 2022 15:46:18 +0300 Message-Id: <20220603124620.15099-5-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 4/6] avformat/movenc: move eac3_info definition so that it can be used 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: zy7z4qnTMWSJ From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/movenc.c | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2589f2f4bb..5bc1f4c7a4 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -327,6 +327,39 @@ static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track) return 0x11; } +struct eac3_info { + AVPacket *pkt; + uint8_t ec3_done; + uint8_t num_blocks; + + /* Layout of the EC3SpecificBox */ + /* maximum bitrate */ + uint16_t data_rate; + int8_t ac3_bit_rate_code; + /* number of independent substreams */ + uint8_t num_ind_sub; + struct { + /* sample rate code (see ff_ac3_sample_rate_tab) 2 bits */ + uint8_t fscod; + /* bit stream identification 5 bits */ + uint8_t bsid; + /* one bit reserved */ + /* audio service mixing (not supported yet) 1 bit */ + /* bit stream mode 3 bits */ + uint8_t bsmod; + /* audio coding mode 3 bits */ + uint8_t acmod; + /* sub woofer on 1 bit */ + uint8_t lfeon; + /* 3 bits reserved */ + /* number of dependent substreams associated with this substream 4 bits */ + uint8_t num_dep_sub; + /* channel locations of the dependent substream(s), if any, 9 bits */ + uint16_t chan_loc; + /* if there is no dependent substream, then one bit reserved instead */ + } substream[1]; /* TODO: support 8 independent substreams */ +}; + static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { GetBitContext gbc; @@ -375,39 +408,6 @@ static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *trac return 11; } -struct eac3_info { - AVPacket *pkt; - uint8_t ec3_done; - uint8_t num_blocks; - - /* Layout of the EC3SpecificBox */ - /* maximum bitrate */ - uint16_t data_rate; - int8_t ac3_bit_rate_code; - /* number of independent substreams */ - uint8_t num_ind_sub; - struct { - /* sample rate code (see ff_ac3_sample_rate_tab) 2 bits */ - uint8_t fscod; - /* bit stream identification 5 bits */ - uint8_t bsid; - /* one bit reserved */ - /* audio service mixing (not supported yet) 1 bit */ - /* bit stream mode 3 bits */ - uint8_t bsmod; - /* audio coding mode 3 bits */ - uint8_t acmod; - /* sub woofer on 1 bit */ - uint8_t lfeon; - /* 3 bits reserved */ - /* number of dependent substreams associated with this substream 4 bits */ - uint8_t num_dep_sub; - /* channel locations of the dependent substream(s), if any, 9 bits */ - uint16_t chan_loc; - /* if there is no dependent substream, then one bit reserved instead */ - } substream[1]; /* TODO: support 8 independent substreams */ -}; - static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) { AC3HeaderInfo *hdr = NULL;