From patchwork Tue Jun 21 06:46:32 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: 36368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp2050882pzb; Mon, 20 Jun 2022 23:47:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vTHe9byyBAQrexSe0wpFVDdD+HxUvRekSDCcv41v7GirKJHNItec52HVDiWTW5Xl3NsRKM X-Received: by 2002:a05:6402:3514:b0:431:7164:f1d9 with SMTP id b20-20020a056402351400b004317164f1d9mr33272324edd.99.1655794059228; Mon, 20 Jun 2022 23:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655794059; cv=none; d=google.com; s=arc-20160816; b=Ao1BQkVO+nJxzjYPenRAkgEN7sKihj3PJPHn4/lEZK1QVXv0i2hg3aI+i+BD38vUWH 5IC6XtEJmz8rXtu8eb67026+QajWwX2Wxiyc/XeW96gdAH6vnFag8IyqROUWXj65AkY8 QoE8VL5Hg6yrK/eTrYGiSOPhWVFahHjHkTEMvadcmncHEjySOihoJApr9XSmliGzdQmD p8C2idrT2zY3P3wLAKZQ8JopTAOmcFv9XVRJkqvzYdznPebgKZgTnKOPyumu7AwmA3Rf YD1lltH1ZTs1+RRyrtfpNYpAHMgMRSsNZfKQ6QauW6k8njA4ofCSP4IEYkZ3qe3jrvxn p7KQ== 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=BJlLUBUs/XA8n6DhkzWnwv1MqMoplvzZyyqO2n7v3Nu+O5WFdvtrGd5MJD7ND8VGPs 21lUi8jyhAGUU5gjtOzmo2Mma4K5GQue9vkZi1lP17w268V+hjpoLdfqENzzN15mptH5 LQDBRLEnIjPRX5aZp2yDYMvcdtRXMnEVDoGvY6ToNfrWdbVaAmGSXhhhTKf6s1ZDuUPr K0Xc4ZTW88Qfxcr+TCAgUhX4gzQtRKOI00l0G0o7gPWRWxuvxfj5DdhEAym1c7XfjuNJ QHmCEmjKiFZpQh9saNChC6uhuJMBdDcaDA4D5fLvI//kjHbzF3tU584VJkklm2xdy0l5 iErA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HtKp3apX; 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 g13-20020aa7c84d000000b004356df8591csi8650482edt.373.2022.06.20.23.47.38; Mon, 20 Jun 2022 23:47:39 -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=HtKp3apX; 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 B07E668B6A1; Tue, 21 Jun 2022 09:46:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 729AF68B666 for ; Tue, 21 Jun 2022 09:46:44 +0300 (EEST) Received: by mail-lj1-f171.google.com with SMTP id b7so14292994ljr.6 for ; Mon, 20 Jun 2022 23:46:44 -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=HtKp3apX+boS4HMWa6QyiloqWsQbEcHYRJpiWMX3/7Sjp+Kaq9wU2DZKESAWgwtBQ/ Cvxz+EoJhgXqBcdA+siSZpQ7ssYDqa464Qvz0q2xstpRqoUNh/oGVbcKzFDJzF1hkPxs 5Rv5wVLkwX8QzrIMr7UmJ85v+6aVfYHpRFEg8BKyW+5EpFM96fJy1OWvtJbImzm5601p /wGpt67im1H/qJ6B1ogm3Fq5SCz/1wHXwYtwoxXYrpEc9vVS54Hc8tFlQV55QsYXCyFh b1Pe1mtvgcnOyTgMpcKhd4cZZTauin7S6sviuV1mGzzJtla0Zf9XkAHcZytGJ4ZZ1Yyc CUjg== 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=ETBj+ffTNpCvLOnrEz/xvroUdmJTUioWX1l+m3CQFv6CEJywiC1lVZLQabNpb5klNO tuDm21uItWDkIiuAgo2nZ9kTUiLoXiwC+vE6ZwXPOpiZzvyLBlIqk8nqqpX8mMAJPHVA sti5VgFHNM10zwGg8tebA0AS6rSzo6kyvobGwUgvoPaTtMApkFne2Zls+yftimYrYbDG SOFbb8ls4EAKonzRJn7T92SesPptb9l0PfQY/3xEQINNg3mQ+9ruIKpIXrj8+H9LOjXq xZu7Km43c9xt1UAztdTsH2wARGS5KpusMeD51CJ4x71Q8JPCwI0SYrpUL1EYOdICLmqJ o+AQ== X-Gm-Message-State: AJIora+FLo4MiySaGKqrdC+qjv62bovU+reTm0OLeO+vgc++Ftq9MC72 Hz87yEKdCgLBkzEMx7ELzdxtA1YuWkg= X-Received: by 2002:a2e:9f57:0:b0:25a:6867:1db with SMTP id v23-20020a2e9f57000000b0025a686701dbmr5913005ljk.264.1655794003751; Mon, 20 Jun 2022 23:46:43 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id u18-20020a199212000000b0047255d211c7sm2046767lfd.246.2022.06.20.23.46.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 23:46:43 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jun 2022 09:46:32 +0300 Message-Id: <20220621064634.16797-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621064634.16797-1-jeebjp@gmail.com> References: <20220621064634.16797-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: 1PXaG6VPSN59 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;