From patchwork Thu Jun 23 07:24:05 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: 36387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp3301465pzb; Thu, 23 Jun 2022 00:25:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tmRV590dPPHtzNTz9ybwGopSfu2xBB2cwlL0HFiiRdIcmaMhHCtFihZlmAn3F8kR7w/wDJ X-Received: by 2002:a05:6402:2077:b0:435:a428:76e4 with SMTP id bd23-20020a056402207700b00435a42876e4mr8901699edb.367.1655969109870; Thu, 23 Jun 2022 00:25:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655969109; cv=none; d=google.com; s=arc-20160816; b=HjaazfaYPE6bx2QBOdbqWe6Uw0C+SAi5GqJT0ZFs94zljmbSdxgDRP9dzD0MhUb/oT YWxjlws5SRzU9lVV7QmKcYui+1sw3AC25ey1U3gugiEuYCx8xPxCN1vYyOlL1SWB4+n2 Ljk1+bdgtP+3LzXuma4RKtXBvjBeCqdI8jKC7pGFrcaFizjrEAsn0aDZ5u5IXT/4B1Ci tprpxG1WgcnpT9OTkGaZeuh7Zq6LNf+tvmA45hdzuJ62RXVIW9f4EwcenGTmZ6uScabd ZZYmaZoronmT+3PWDZ9G4w7QNdX/epuAkxlAPbkn5c7ZBVZomXKQWXsFvlVl0E6h6HTj nkjQ== 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=N0DVPMVbjvNUDhyXCo5GDfG82rzjd6FrJVeb0yxGHBs=; b=nE2swJFr3mgEVdVHuCm2Dsx9W2KWD2OjrKFpGgp2jOZStiakfmQL2BvjnW15gl/lpT AwpM0xMEHMXJ0O2YluTFdBJkbKcNKJtc14vyayXEpyo7aMB6rgeUWcllcjRvEjQ0iMkK UrrZrUlD6T4xo0CN/hd2kfR4F092rWMfLguG9XlZvQG5G7kfUh/ZhON40FbkTcxVcqnC fvrIDDe4ajkOjnqPGdJiPGbBX4MKObKA9qTdmc2VmRJNQz1yRkDlDBfWgr2KZrlD8GDx ZJ2FTN4zmeGEdnScV01FjYIaZ9fez7Iij9c6Nq0IHB5ID24Ab5MtZpTSMMhySH6wjoyO 79LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Tm+7n1Z+; 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 u13-20020a056402064d00b00435c2425755si2208413edx.103.2022.06.23.00.25.09; Thu, 23 Jun 2022 00:25:09 -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=Tm+7n1Z+; 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 097C268B6D3; Thu, 23 Jun 2022 10:24:27 +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 A0C4468B6CC for ; Thu, 23 Jun 2022 10:24:18 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id t25so31783700lfg.7 for ; Thu, 23 Jun 2022 00:24:18 -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=w7E5vS2/iXahngwLJcBfF4dDww50uiYogXpY8YDLNgA=; b=Tm+7n1Z+a+ngcguWeF5QK+2ZtJ4T7akAbmw2BHYyUnPT+ir3bbMAu11SMBYb3jGYUY pdM8GIhCNxd81WjLiW4CrhV+krwowhTdZHaDVskRChx3XqHj52jqwq91D2ExFjBMzLSf gT163mblHz3yC5XQ32ikCZYgsY5mYa/ctxtSn3toG+5rdAiDV61g+kar0C4imHidXkqU xu6reSknWNiL5lEIS/wgo63TZS67Jj/6Uk0TOIdmaZjh0VmTRN+H9qiuvtQHxiHz3yhk WER33bEHBc8wlmbyhSLf/fptPbqHGC1keRRFb/SuihqpCyjraAefKoftS7N7XpLKko2Z 5uug== 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=w7E5vS2/iXahngwLJcBfF4dDww50uiYogXpY8YDLNgA=; b=h5uxVIxV+KZLPumKWqpFTZ/nqXJ0fkIwHV2RweJC0XEg9Q4LAlFidBMpCkJ111NfYa pjJhBgXvc1bvhv7hOWkGDwzmTMFfAUY3APHz23QSJkWXfxCVeCRPPbQGWQL2kWeMTolb ZcIRlQKfYmEqKlNcNqU5p5ORoqBuOYrc0yv0L+F3SZuLHQ9y6OwiBQef3PCj3RAJQWpQ ISSFt9OQidZzvwsouXDTSoCqecJElPIgseUhD+VBzeDXIwJJ4pCY02fXgZ7CSU77sNre DaIEcydOnXcW0MpgFVK54kZNfl+lCm3Nr4BihnVBVGDM9J4ExZWIMjZDXE2Epz96zGDD L3Qw== X-Gm-Message-State: AJIora+76mJ1Tvr9MJ7wCs5v1ORmJfptKyhHoav4N5lv5hBdNCto1Wco 7nw9Sqoi5+oOVX95Nk4C5gSmenmwD6g= X-Received: by 2002:a05:6512:108f:b0:479:48b0:b650 with SMTP id j15-20020a056512108f00b0047948b0b650mr4634945lfg.33.1655969057983; Thu, 23 Jun 2022 00:24:17 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id a15-20020a056512200f00b0047f8ec3ca4esm732843lfb.87.2022.06.23.00.24.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 00:24:17 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jun 2022 10:24:05 +0300 Message-Id: <20220623072408.38977-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623072408.38977-1-jeebjp@gmail.com> References: <20220623072408.38977-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 4/7] 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: ZUDId0dtioJA From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/movenc.c | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c24b11cf5f..103f958d75 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -328,6 +328,38 @@ 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; + /* 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; @@ -376,38 +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; - /* 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;