From patchwork Thu Jun 30 06:42:35 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: 36540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106782pzh; Wed, 29 Jun 2022 23:43:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s2DC0PAnd/vwMnSI4BC+QvW2+5p9c17oNtp7VH3uQRBUii+Ug8Cogv7nQ9ppXUBJveX92q X-Received: by 2002:a17:906:2a86:b0:711:d8a5:cb0c with SMTP id l6-20020a1709062a8600b00711d8a5cb0cmr7350846eje.426.1656571416758; Wed, 29 Jun 2022 23:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571416; cv=none; d=google.com; s=arc-20160816; b=WlzzLxIdqIPt1EIUjG4pQZyVeAZupd2Qc4wU1KAOmF56TKpQSg4nDuEzrZzcmb8A4J hHrKVku3h+J/CvdKQA8nLlxmaEJzP7sVhbVPk5D2rBnNymtJRv+lVk3yH2GNTuxyWU/4 UAnFAuJ1pEXMSe0fbTfyRK3eLKFV92jQQdkXdO5i8mfqa7o4156bDD5cK1Bk2KZv1mcc wSFog0QXjyCPBLcEckMcyK45N5J1cSQpvR7DJi0TOIF/BLjTcozTCSen5TwBxDvB/LbO 6QTG7eYzO1ZA3G4MKv2UxkptTH8rN0Nq0aEJLJ/2Kn+ZSn8p04KzYW3T0kz1CNDlxXOy 7kXw== 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=597wdVO7X8+X/y5jDG7rRfVn1yKYIxE6N0wMcmZhu+4=; b=fMkEL6GMMOVoQyrOw2kfaU9QsgCtq7xiBoF9Js955CbMs+gE+BeSUafHCpfRe5Ze5T R8pHiYPLXXO6U1Pu0IEj796BwgMR45vu+vycrz3q0J7vysD0Jd6c5SuDa2F2IsI1z6zR JUJnVSDqMAzbvpu1gMytxZ71oBHHi460ZBStCyzp0fcWOTQOYECaWSBUjqnUh/kvEhVK A90Sztop5y1K76IAxw2pl4uBV6wUwbryd5O+zw79UcC8XBGZ2KnP9pMb/pRDel+0lx80 kEzeJq/kmkCu34PrTfrPtxxZdWDw9w6j8zeGn1tlZyBvV5B5sV+MYlMVnt3EToV0E+cr YoqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CWxuoNbM; 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 rv16-20020a17090710d000b006f3b16423ebsi1595080ejb.620.2022.06.29.23.43.36; Wed, 29 Jun 2022 23:43:36 -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=CWxuoNbM; 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 EBF1B68B7D1; Thu, 30 Jun 2022 09:42:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E532C68B797 for ; Thu, 30 Jun 2022 09:42:49 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id e12so7706080lfr.6 for ; Wed, 29 Jun 2022 23:42:49 -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=irXSlDAacbU0NSr4eZ5h4WhQdFvXfKqHMRqEjtsBE9I=; b=CWxuoNbMimwqlFWY4txwcQMMRi7KTz1xv3PbACuAcOGEdxZWUPKCD7apCw2uhu9nTw DD9YbOn4d3n0x78lHAmpiDF4fDmc3EhHwZQGhOvMH+2rKE36hc38jrIpzFWWOZ+gtGwd lKb3eOtRLOesDo5pM4Mo9rP68pzoW9oPgr3ikMYhpO70NofmUb3I5LVxRu00xeJB26jQ Ib54n3nZibx3t99JkYlAvn6jrh7AoncsUhc0qDqWeRG6gLcSRB4jUcFodj/YC1nUbQFf S4jlq8+0LQZb/s2QEAceR7rMWdNijr5iMIEs/oxJenCKSjZTAZCJXJfLaewYtOsZOwCS eQPA== 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=irXSlDAacbU0NSr4eZ5h4WhQdFvXfKqHMRqEjtsBE9I=; b=RSD3jGI6ZzHaL9WAMszi57Uq21ED4oQRnSrDrsiHdyJZcyJUH+nY17EEPINXQi1WJK /3YW14txsy8cx9w+sUU8tdMcChrRmgVA+1U9gV/9LSL3V/chvnmdiAZPel48IGZyuRj3 baog03aiLh1atv6tq5K9k062V//OjMQXGkjJG/l0CBdjWzx0qM1fcNEtkly69mYb+p6Y QQlKtBIW12X7H77hnyzFlDnmLqEt2HqUNxP3rU8AqWfjIL2ZgZ9inP8X/bNqMWGspor2 dVvDti6odgzQj5GJOBF5vFDJPNl4TaOx7SJZV759R0hc+0DSyxYz4OCa2VRwdAJoa4Ct rnLw== X-Gm-Message-State: AJIora8gHueb/orFmyF8C8fTIQ397GVQprgIOSKaNUH7Ik65gBOmEqit eHQ9P3J1S18XQIoub0Dd+izYwdzdWIM= X-Received: by 2002:a05:6512:31ca:b0:481:1319:a72b with SMTP id j10-20020a05651231ca00b004811319a72bmr4398066lfe.108.1656571369266; Wed, 29 Jun 2022 23:42:49 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c17-20020a056512075100b00479112bb555sm2948091lfs.60.2022.06.29.23.42.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:48 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:35 +0300 Message-Id: <20220630064238.45315-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630064238.45315-1-jeebjp@gmail.com> References: <20220630064238.45315-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: htOaXOiiORWm 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 8316fd9a45..b9e3f1a63e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -328,6 +328,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; @@ -376,39 +409,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;