From patchwork Fri Jun 17 13:04:41 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: 36303 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp120818pzb; Fri, 17 Jun 2022 06:06:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v5j5weHN5GF7YqzD6vXkg5+SyIk8eA7GRURIegjuXAE27tZLq20o1nuD5KbOVxjn5Mm9De X-Received: by 2002:a05:6402:3705:b0:435:5e48:b6c7 with SMTP id ek5-20020a056402370500b004355e48b6c7mr4105257edb.396.1655471161062; Fri, 17 Jun 2022 06:06:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655471161; cv=none; d=google.com; s=arc-20160816; b=FoC3IrD+6vugmdHZZCycywjXdftw4J8vbn0bH1PXXOcMwSBzs6c/7zfJXoweooTVQi 5xNY5OcZEF+GlN9uqAIMEdjIwVyNGh2piVpWko7GnK88nHdEX8kxQWC3tvReYKDGxamS iuuaHxxhpiT5r/3J4urOS3y0y/Hfd9TaJWqUoiln1EKeIlNWFDl7/PJY26Lk9c48/9yY 0b49hj6S2OmqE6YkBTbX6iDHPPuQklRI+hkGixudRWcHdd2WVvFNybnKk+MIgV1OLXPe 573qsp7qhIBzA579HSPTyNbeB0goXRKBY0orvu0qiBGf/ygEV8x0mgG8R197erEwhLkx ctCg== 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=GJ49DOI68hzfrAPowoxotMBkqfXfcn3r3hfhDknJO/WIakchc7O67FE6QSPQTWMszy pZQcR54fvk419ApPeQR+NP/lxzOcfCic7g0PFnah38lvJxDm+bd2rPafaCXdiY204lu3 EpfV1EnCvSqGbHpPvfnLE4vOeq6emPalSYrSJ42jRCtUihrKLzVhvigt9oEtEEVjlzaf NbieimxEQzcexH4kHagohFfOPRRwC6si/IJT0V1bjt6Xn5F6gUT1NbY9LKnsiHzLP1X4 9dleqQwoFBTr9jK6A6CMYREA1bVOHFnCWl/9bCFNKRifAHgqjv1YhAOswKEyBsxxaQj+ 9svg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Otle7nSd; 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 i26-20020a1709067a5a00b007152a3ee50asi3380240ejo.122.2022.06.17.06.06.00; Fri, 17 Jun 2022 06:06:01 -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=Otle7nSd; 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 52DF568B8B7; Fri, 17 Jun 2022 16:05:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A726C68B8C0 for ; Fri, 17 Jun 2022 16:04:54 +0300 (EEST) Received: by mail-lj1-f170.google.com with SMTP id h23so4679676ljl.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=w7E5vS2/iXahngwLJcBfF4dDww50uiYogXpY8YDLNgA=; b=Otle7nSd93/Gf4vj3wwFQCEZfGtcNHxJf3qOduuio+flQGdWkrzRiSFrM4hZo3vGQL zcOTasy0NWrJnmt7HQAMv0aryODnFDmCLuTNwN38fadlCCNx3kEZFXeQncQE95ZP0F/T fiAQuYhmJ6svKdz0BqNpFyTdRbsQyrN/EvM1DZDlsNTEkM3ZKeq5cdQMra69TZwtNNUs /Dy487dWvhAPWwcTJhDIJlxwzcQpCs2QfvXU+/eKXu9TuqlcqwND2rZ+TNMT1r9r5BU3 irCWj6JZ4XGcnKWzb2tjcYM9KgOiYVLlwpPuvGREGDLTHLzNeak/iF3Oy0pjqXJZ+bnT qKRA== 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=ESSoQaphVFJC6WLazxKnTeq0HfZRZv/JNXTpRluBWAK1kmUAECmV0rtysypc1WRrks 7pjrok0Tnb7DCTnRx4ZLc+zWiE6ux3cDsqNC2gkBYHvm2qtVLhgG/GSakr5tlYVF+efr Ep9zi4M5fI0eRCt8lqWdqobQRQtqMU3bcoI8ZUQ+xHJr7Pfz1Xr6xN64BJnt874dOUwn SsdHlyrIAwrkKD8vP5TZ0rpEBipC7a8wh0NvJL2QDAsfND2HpjqFFyQxMrKNAsicbB3M 5GCJjKR8RnrxGbDxv4XhC6WfjQMPTOqxFNZLJLzKjYAAexc84v81sKyP88eoZ31ZOn/g 4BiQ== X-Gm-Message-State: AJIora+T+5VvOOoIdOhJriqQJ+6Xq/6Ne9i1w46+kUUkHkK//xdY8At3 mZBlLZy3tZxFZQ5AE+lCd8gLC1/qK0o= X-Received: by 2002:a2e:a236:0:b0:259:c94:3144 with SMTP id i22-20020a2ea236000000b002590c943144mr4903682ljm.466.1655471093483; Fri, 17 Jun 2022 06:04:53 -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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 06:04:52 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 16:04:41 +0300 Message-Id: <20220617130443.188377-5-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 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: /h8LrINuaa7v 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;