From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 75463435A8 for ; Fri, 17 Jun 2022 13:06:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1430968B8E3; Fri, 17 Jun 2022 16:05:03 +0300 (EEST) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 026D168B8A5 for ; Fri, 17 Jun 2022 16:04:55 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id i29so6868128lfp.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=LVBIwjS6rQYX+lRQFgiD1VyK0mX+qwID/sGBKUW45TU=; b=peVhqq+V/RRCukKDzvuQLwQBtjUDFNyg2iq7tcpBfnDfc5gu9s7V5oAUYw+4Y75n93 wcUYPHiEyynpMhOTWUHEJLHS38j5fQN/aJMGTVj1J4myyeygDRzVcbVUAgOcWCuYh6Xw pkr3mwDDWPDg7KrNREijFmW5EsEb1epQSm+prBPgOaLiLhze8VG+nJs/Vo2nuzAOS4sy iFT/ZmN8iIuANSGFxBsTuF3dE1NtuRa3foVjHfT+TjGM5viYAMsIp8V20NPlcslABKiL ZfCC7WwBabxVFQRQXEZXUQmkVrADpyJLQ2wugMdggMqPnBoA0XU5ZNikUE0AsmuhMabv C+hQ== 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=LVBIwjS6rQYX+lRQFgiD1VyK0mX+qwID/sGBKUW45TU=; b=dJ2bXPiSnxcvVGyh/MG983L1MuQKdDf141LmhCOdDSLorurLPMMXy3StQ6bpGhueqs owjwuLc1RHTm0GiOixL9wJ1nRuUzIC/Crwst3K3VnN9R7J3j5isQmMs400oVlDsQfHQO QDDKf3Zi07Zgp8h2roooz1G3GFdPBnZgb4Sxq6F+5YfhwDkVA7jB8tZU7Ci7ejSeSa7s TQlzR6D7EdvraEktBOcOInnuLePlX0iN6cfWNLAI/OMtlzLxgG3McF28RvJqkIiD0sIT nwwZ8qcdiE5+g74K6PdBXYwBNy1PkyNtNsGXavFZ8aLec5JI7kuY+WpJp6XGOR966nAX Fdbg== X-Gm-Message-State: AJIora9O6VrEbYPcmwzaHzDVAFSuCkPE6ikLVRBRU3vVf1ZyQ7sN6cbp WMJbSZ/IlRYAh3ZbLOrFrz6Ygown4Q0= X-Google-Smtp-Source: AGRyM1uLDPIEgmV0WSdEdGbU7gBFyKewfPLCZOvlkdlzzhTiSKwjmyYQicWvKqEb2aiEGtmFOx6N7A== X-Received: by 2002:ac2:4c49:0:b0:47d:d5e6:6501 with SMTP id o9-20020ac24c49000000b0047dd5e66501mr5687728lfk.295.1655471094227; Fri, 17 Jun 2022 06:04:54 -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.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 06:04:53 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 16:04:42 +0300 Message-Id: <20220617130443.188377-6-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 5/6] avformat/movenc: utilize existing AC-3 parsing workflow 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: RnJvbTogSmFuIEVrc3Ryw7ZtIDxqYW4uZWtzdHJvbUAyNGkuY29tPgoKU2lnbmVkLW9mZi1ieTog SmFuIEVrc3Ryw7ZtIDxqYW4uZWtzdHJvbUAyNGkuY29tPgotLS0KIGxpYmF2Zm9ybWF0L01ha2Vm aWxlICAgICAgICAgIHwgIDEgKwogbGliYXZmb3JtYXQvYWMzX2JpdHJhdGVfdGFiLmMgfCAyMiAr KysrKysrKysrKysrKwogbGliYXZmb3JtYXQvbW92ZW5jLmMgICAgICAgICAgfCA1NSArKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA1MCBpbnNlcnRp b25zKCspLCAyOCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBsaWJhdmZvcm1hdC9h YzNfYml0cmF0ZV90YWIuYwoKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L01ha2VmaWxlIGIvbGli YXZmb3JtYXQvTWFrZWZpbGUKaW5kZXggMTQxNmJmMzFiZC4uYzcxZGU5NWIyZiAxMDA2NDQKLS0t IGEvbGliYXZmb3JtYXQvTWFrZWZpbGUKKysrIGIvbGliYXZmb3JtYXQvTWFrZWZpbGUKQEAgLTY5 OSw2ICs2OTksNyBAQCBTSExJQk9CSlMtJChDT05GSUdfRkxWX01VWEVSKSAgICAgICAgICAgICs9 IG1wZWc0YXVkaW9fc2FtcGxlX3JhdGVzLm8KIFNITElCT0JKUy0kKENPTkZJR19ITFNfREVNVVhF UikgICAgICAgICAgKz0gYWMzX2NoYW5uZWxfbGF5b3V0X3RhYi5vCiBTSExJQk9CSlMtJChDT05G SUdfTUFUUk9TS0FfREVNVVhFUikgICAgICs9IG1wZWc0YXVkaW9fc2FtcGxlX3JhdGVzLm8KIFNI TElCT0JKUy0kKENPTkZJR19NT1ZfREVNVVhFUikgICAgICAgICAgKz0gYWMzX2NoYW5uZWxfbGF5 b3V0X3RhYi5vCitTSExJQk9CSlMtJChDT05GSUdfTU9WX01VWEVSKSAgICAgICAgICAgICs9IGFj M19iaXRyYXRlX3RhYi5vCiBTSExJQk9CSlMtJChDT05GSUdfTVAzX01VWEVSKSAgICAgICAgICAg ICs9IG1wZWdhdWRpb3RhYnMubwogU0hMSUJPQkpTLSQoQ09ORklHX01YRl9NVVhFUikgICAgICAg ICAgICArPSBnb2xvbWJfdGFiLm8KIFNITElCT0JKUy0kKENPTkZJR19OVVRfTVVYRVIpICAgICAg ICAgICAgKz0gbXBlZ2F1ZGlvdGFicy5vCmRpZmYgLS1naXQgYS9saWJhdmZvcm1hdC9hYzNfYml0 cmF0ZV90YWIuYyBiL2xpYmF2Zm9ybWF0L2FjM19iaXRyYXRlX3RhYi5jCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjU3YjYxODE1MTEKLS0tIC9kZXYvbnVsbAorKysgYi9s aWJhdmZvcm1hdC9hYzNfYml0cmF0ZV90YWIuYwpAQCAtMCwwICsxLDIyIEBACisvKgorICogQUMt MyBiaXQgcmF0ZSB0YWJsZQorICogY29weXJpZ2h0IChjKSAyMDAxIEZhYnJpY2UgQmVsbGFyZAor ICoKKyAqIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEZGbXBlZy4KKyAqCisgKiBGRm1wZWcgaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNl bnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIK KyAqIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBs YXRlciB2ZXJzaW9uLgorICoKKyAqIEZGbXBlZyBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0 aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRo b3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiBMZXNzZXIg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91 bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMK KyAqIExpY2Vuc2UgYWxvbmcgd2l0aCBGRm1wZWc7IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUg U29mdHdhcmUKKyAqIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGgg Rmxvb3IsIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSBVU0EKKyAqLworCisjaW5jbHVkZSAibGliYXZj b2RlYy9hYzNfYml0cmF0ZV90YWIuaCIKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L21vdmVuYy5j IGIvbGliYXZmb3JtYXQvbW92ZW5jLmMKaW5kZXggMTAzZjk1OGQ3NS4uYTA3MWYxY2RkNSAxMDA2 NDQKLS0tIGEvbGliYXZmb3JtYXQvbW92ZW5jLmMKKysrIGIvbGliYXZmb3JtYXQvbW92ZW5jLmMK QEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJhdjEuaCIKICNpbmNsdWRlICJhdmMuaCIKICNp bmNsdWRlICJsaWJhdmNvZGVjL2FjM19wYXJzZXJfaW50ZXJuYWwuaCIKKyNpbmNsdWRlICJsaWJh dmNvZGVjL2FjM3RhYi5oIgogI2luY2x1ZGUgImxpYmF2Y29kZWMvZG54aGRkYXRhLmgiCiAjaW5j bHVkZSAibGliYXZjb2RlYy9mbGFjLmgiCiAjaW5jbHVkZSAibGliYXZjb2RlYy9nZXRfYml0cy5o IgpAQCAtMzYyLDQ0ICszNjMsNDIgQEAgc3RydWN0IGVhYzNfaW5mbyB7CiAKIHN0YXRpYyBpbnQg bW92X3dyaXRlX2FjM190YWcoQVZGb3JtYXRDb250ZXh0ICpzLCBBVklPQ29udGV4dCAqcGIsIE1P VlRyYWNrICp0cmFjaykKIHsKLSAgICBHZXRCaXRDb250ZXh0IGdiYzsKKyAgICBzdHJ1Y3QgZWFj M19pbmZvICppbmZvID0gdHJhY2stPmVhYzNfcHJpdjsKKyAgICBpbnQ4X3QgYWMzX2JpdF9yYXRl X2NvZGUgPSAtMTsKICAgICBQdXRCaXRDb250ZXh0IHBiYzsKICAgICB1aW50OF90IGJ1ZlszXTsK LSAgICBpbnQgZnNjb2QsIGJzaWQsIGJzbW9kLCBhY21vZCwgbGZlb24sIGZybXNpemVjb2Q7CiAK LSAgICBpZiAodHJhY2stPnZvc19sZW4gPCA3KSB7CisgICAgaWYgKCFpbmZvIHx8ICFpbmZvLT5l YzNfZG9uZSkgewogICAgICAgICBhdl9sb2cocywgQVZfTE9HX0VSUk9SLAogICAgICAgICAgICAg ICAgIkNhbm5vdCB3cml0ZSBtb292IGF0b20gYmVmb3JlIEFDMyBwYWNrZXRzLiIKICAgICAgICAg ICAgICAgICIgU2V0IHRoZSBkZWxheV9tb292IGZsYWcgdG8gZml4IHRoaXMuXG4iKTsKICAgICAg ICAgcmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKICAgICB9CiAKLSAgICBhdmlvX3diMzIocGIsIDEx KTsKLSAgICBmZmlvX3dmb3VyY2MocGIsICJkYWMzIik7CisgICAgZm9yICh1bnNpZ25lZCBpbnQg aSA9IDA7IGkgPCBGRl9BUlJBWV9FTEVNUyhmZl9hYzNfYml0cmF0ZV90YWIpOyBpKyspIHsKKyAg ICAgICAgaWYgKGluZm8tPmRhdGFfcmF0ZSA9PSBmZl9hYzNfYml0cmF0ZV90YWJbaV0pIHsKKyAg ICAgICAgICAgIGFjM19iaXRfcmF0ZV9jb2RlID0gaTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICB9CisgICAgfQogCi0gICAgaW5pdF9nZXRfYml0cygmZ2JjLCB0cmFjay0+dm9zX2RhdGEg KyA0LCAodHJhY2stPnZvc19sZW4gLSA0KSAqIDgpOwotICAgIGZzY29kICAgICAgPSBnZXRfYml0 cygmZ2JjLCAyKTsKLSAgICBmcm1zaXplY29kID0gZ2V0X2JpdHMoJmdiYywgNik7Ci0gICAgYnNp ZCAgICAgICA9IGdldF9iaXRzKCZnYmMsIDUpOwotICAgIGJzbW9kICAgICAgPSBnZXRfYml0cygm Z2JjLCAzKTsKLSAgICBhY21vZCAgICAgID0gZ2V0X2JpdHMoJmdiYywgMyk7Ci0gICAgaWYgKGFj bW9kID09IDIpIHsKLSAgICAgICAgc2tpcF9iaXRzKCZnYmMsIDIpOyAvLyBkc3VybW9kCi0gICAg fSBlbHNlIHsKLSAgICAgICAgaWYgKChhY21vZCAmIDEpICYmIGFjbW9kICE9IDEpCi0gICAgICAg ICAgICBza2lwX2JpdHMoJmdiYywgMik7IC8vIGNtaXhsZXYKLSAgICAgICAgaWYgKGFjbW9kICYg NCkKLSAgICAgICAgICAgIHNraXBfYml0cygmZ2JjLCAyKTsgLy8gc3VybWl4bGV2CisgICAgaWYg KGFjM19iaXRfcmF0ZV9jb2RlIDwgMCkgeworICAgICAgICBhdl9sb2cocywgQVZfTE9HX0VSUk9S LAorICAgICAgICAgICAgICAgIk5vIHZhbGlkIEFDMyBiaXQgcmF0ZSBjb2RlIGZvciBkYXRhIHJh dGUgb2YgJWQhXG4iLAorICAgICAgICAgICAgICAgaW5mby0+ZGF0YV9yYXRlKTsKKyAgICAgICAg cmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKICAgICB9Ci0gICAgbGZlb24gPSBnZXRfYml0czEoJmdi Yyk7CisKKyAgICBhdmlvX3diMzIocGIsIDExKTsKKyAgICBmZmlvX3dmb3VyY2MocGIsICJkYWMz Iik7CiAKICAgICBpbml0X3B1dF9iaXRzKCZwYmMsIGJ1Ziwgc2l6ZW9mKGJ1ZikpOwotICAgIHB1 dF9iaXRzKCZwYmMsIDIsIGZzY29kKTsKLSAgICBwdXRfYml0cygmcGJjLCA1LCBic2lkKTsKLSAg ICBwdXRfYml0cygmcGJjLCAzLCBic21vZCk7Ci0gICAgcHV0X2JpdHMoJnBiYywgMywgYWNtb2Qp OwotICAgIHB1dF9iaXRzKCZwYmMsIDEsIGxmZW9uKTsKLSAgICBwdXRfYml0cygmcGJjLCA1LCBm cm1zaXplY29kID4+IDEpOyAvLyBiaXRfcmF0ZV9jb2RlCisgICAgcHV0X2JpdHMoJnBiYywgMiwg aW5mby0+c3Vic3RyZWFtWzBdLmZzY29kKTsKKyAgICBwdXRfYml0cygmcGJjLCA1LCBpbmZvLT5z dWJzdHJlYW1bMF0uYnNpZCk7CisgICAgcHV0X2JpdHMoJnBiYywgMywgaW5mby0+c3Vic3RyZWFt WzBdLmJzbW9kKTsKKyAgICBwdXRfYml0cygmcGJjLCAzLCBpbmZvLT5zdWJzdHJlYW1bMF0uYWNt b2QpOworICAgIHB1dF9iaXRzKCZwYmMsIDEsIGluZm8tPnN1YnN0cmVhbVswXS5sZmVvbik7Cisg ICAgcHV0X2JpdHMoJnBiYywgNSwgYWMzX2JpdF9yYXRlX2NvZGUpOyAvLyBiaXRfcmF0ZV9jb2Rl CiAgICAgcHV0X2JpdHMoJnBiYywgNSwgMCk7IC8vIHJlc2VydmVkCiAKICAgICBmbHVzaF9wdXRf Yml0cygmcGJjKTsKQEAgLTU5NzUsOCArNTk3NCw3IEBAIGludCBmZl9tb3Zfd3JpdGVfcGFja2V0 KEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBrdCkKICAgICBpZiAoKHBhci0+Y29kZWNf aWQgPT0gQVZfQ09ERUNfSURfRE5YSEQgfHwKICAgICAgICAgIHBhci0+Y29kZWNfaWQgPT0gQVZf Q09ERUNfSURfSDI2NCB8fAogICAgICAgICAgcGFyLT5jb2RlY19pZCA9PSBBVl9DT0RFQ19JRF9I RVZDIHx8Ci0gICAgICAgICBwYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lEX1RSVUVIRCB8fAot ICAgICAgICAgcGFyLT5jb2RlY19pZCA9PSBBVl9DT0RFQ19JRF9BQzMpICYmICF0cmstPnZvc19s ZW4gJiYKKyAgICAgICAgIHBhci0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfVFJVRUhEKSAmJiAh dHJrLT52b3NfbGVuICYmCiAgICAgICAgICAhVEFHX0lTX0FWQ0kodHJrLT50YWcpKSB7CiAgICAg ICAgIC8qIGNvcHkgZnJhbWUgdG8gY3JlYXRlIG5lZWRlZCBhdG9tcyAqLwogICAgICAgICB0cmst PnZvc19sZW4gID0gc2l6ZTsKQEAgLTYwNTMsNyArNjA1MSw4IEBAIGludCBmZl9tb3Zfd3JpdGVf cGFja2V0KEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBrdCkKICAgICAgICAgICAgIH0K ICAgICAgICAgfQogCi0gICAgfSBlbHNlIGlmIChwYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lE X0VBQzMpIHsKKyAgICB9IGVsc2UgaWYgKHBhci0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfRUFD MyB8fAorICAgICAgICAgICAgICAgcGFyLT5jb2RlY19pZCA9PSBBVl9DT0RFQ19JRF9BQzMpIHsK ICAgICAgICAgc2l6ZSA9IGhhbmRsZV9lYWMzKG1vdiwgcGt0LCB0cmspOwogICAgICAgICBpZiAo c2l6ZSA8IDApCiAgICAgICAgICAgICByZXR1cm4gc2l6ZTsKLS0gCjIuMzYuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxp bmcgbGlzdApmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1h bi9saXN0aW5mby9mZm1wZWctZGV2ZWwKClRvIHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3Zl LCBvciBlbWFpbApmZm1wZWctZGV2ZWwtcmVxdWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAi dW5zdWJzY3JpYmUiLgo=