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 10DF64093F for ; Fri, 3 Jun 2022 12:47:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F86E68B85B; Fri, 3 Jun 2022 15:46:39 +0300 (EEST) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BBDA68B815 for ; Fri, 3 Jun 2022 15:46:30 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id 1so8308226ljp.8 for ; Fri, 03 Jun 2022 05:46:30 -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=RGbJzkTilZhjBdp1ADJB78AYjoRskjXP+cjoJ6eJu+w=; b=X87PmeOeo832JLDVkb4s/m6g+najPVEz4vV2Ms/TNOUp6+Jrs+kYIrRsXCd2GRO12Q t9KHvYW8yhZdsyMuGQZVD9pF0QblxuoYQLQQzfoH0NhMANRCHjkjSJNnwQNQ+jkeaYrT AzW9O/R63dQ+u3zPr2OzZjTLYQvS9BfKu5fwQ1ElNYFHunbw/t4UdBPgdij1Qc+yIOLk JAfxSWLas+Xw/C5n4rcs+mDG5KUT3P+2fF/AwdyNfwKKCFHHR03lbVO7xmJ+Y1zBejyJ dAAC48eLByhB79+4yWeNApf3AB+jYL+1shq0bidfSLBwimgWQBkSulkl5OhQ1YVaEd+H ZwYA== 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=RGbJzkTilZhjBdp1ADJB78AYjoRskjXP+cjoJ6eJu+w=; b=GKi8bW8s6wIMBUR/KV93O92n4eoaO/JKryjV3zX4Anx0BbzwhqyzaIUVwY8JTwGQsq UXKhRq9/j+YghLJGgOyOJAC2xcV5NCdpeJI+BFEbVHBGrwQDhB3Z4RWchQ/bJnWrAhPY ZVh6+L7xSKbPs6xcjdR9U3TaqARAG8rck2cr+TOu+Q8eONcVi+JlbSsDCET/wXKs5roU n1v2t6GMQjeaZzXC08GRpfiM7NUMv+Ku7zhjTYGsWuuj+6xfAJZgtavZoBDgfCqSQiFG tm4RaEq24z7zKtnvn6Pu3oMzg+27Irf3RNsicMU0aF18IgFHSM192mlNOIA15Niov8GH OWRQ== X-Gm-Message-State: AOAM530gFCAtlE85DuFY2Z1GWAV/pV2o3AP469hQ7sKg+PlBK+rTCLzh 7Fw2k4D6gTq41oTau0RcFTwXOuwDQ/M= X-Google-Smtp-Source: ABdhPJxJPC73TapVSUMEjQ151wBz1ds1EMszEiAruDEiigjKz0C7vVD/RbT07MxOyqQ2ywR83UDc9A== X-Received: by 2002:a05:651c:88f:b0:253:f747:2fd8 with SMTP id d15-20020a05651c088f00b00253f7472fd8mr29864911ljq.496.1654260389584; Fri, 03 Jun 2022 05:46:29 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id m4-20020a0565120a8400b00477b624c0a8sm1561081lfu.180.2022.06.03.05.46.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 05:46:29 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jun 2022 15:46:19 +0300 Message-Id: <20220603124620.15099-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603124620.15099-1-jeebjp@gmail.com> References: <20220603124620.15099-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 SmFuIEVrc3Ryw7ZtIDxqYW4uZWtzdHJvbUAyNGkuY29tPgotLS0KIGxpYmF2Zm9ybWF0L21vdmVu Yy5jIHwgNDYgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9saWJhdmZvcm1hdC9tb3ZlbmMuYyBiL2xpYmF2Zm9ybWF0L21vdmVuYy5jCmluZGV4IDVi YzFmNGM3YTQuLmExZGFmMzU5OGIgMTAwNjQ0Ci0tLSBhL2xpYmF2Zm9ybWF0L21vdmVuYy5jCisr KyBiL2xpYmF2Zm9ybWF0L21vdmVuYy5jCkBAIC0zNjIsNDQgKzM2MiwzNCBAQCBzdHJ1Y3QgZWFj M19pbmZvIHsKIAogc3RhdGljIGludCBtb3Zfd3JpdGVfYWMzX3RhZyhBVkZvcm1hdENvbnRleHQg KnMsIEFWSU9Db250ZXh0ICpwYiwgTU9WVHJhY2sgKnRyYWNrKQogewotICAgIEdldEJpdENvbnRl eHQgZ2JjOworICAgIHN0cnVjdCBlYWMzX2luZm8gKmluZm8gPSB0cmFjay0+ZWFjM19wcml2Owog ICAgIFB1dEJpdENvbnRleHQgcGJjOwogICAgIHVpbnQ4X3QgYnVmWzNdOwotICAgIGludCBmc2Nv ZCwgYnNpZCwgYnNtb2QsIGFjbW9kLCBsZmVvbiwgZnJtc2l6ZWNvZDsKIAotICAgIGlmICh0cmFj ay0+dm9zX2xlbiA8IDcpIHsKKyAgICBpZiAoIWluZm8gfHwgIWluZm8tPmVjM19kb25lKSB7CiAg ICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJST1IsCiAgICAgICAgICAgICAgICAiQ2Fubm90IHdy aXRlIG1vb3YgYXRvbSBiZWZvcmUgQUMzIHBhY2tldHMuIgogICAgICAgICAgICAgICAgIiBTZXQg dGhlIGRlbGF5X21vb3YgZmxhZyB0byBmaXggdGhpcy5cbiIpOwogICAgICAgICByZXR1cm4gQVZF UlJPUihFSU5WQUwpOwogICAgIH0KIAorICAgIGlmIChpbmZvLT5hYzNfYml0X3JhdGVfY29kZSA8 IDApIHsKKyAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwKKyAgICAgICAgICAgICAgICJO byB2YWxpZCBBQzMgYml0IHJhdGUgY29kZSBmb3IgZGF0YSByYXRlIG9mICVkIVxuIiwKKyAgICAg ICAgICAgICAgIGluZm8tPmRhdGFfcmF0ZSk7CisgICAgICAgIHJldHVybiBBVkVSUk9SKEVJTlZB TCk7CisgICAgfQorCiAgICAgYXZpb193YjMyKHBiLCAxMSk7CiAgICAgZmZpb193Zm91cmNjKHBi LCAiZGFjMyIpOwogCi0gICAgaW5pdF9nZXRfYml0cygmZ2JjLCB0cmFjay0+dm9zX2RhdGEgKyA0 LCAodHJhY2stPnZvc19sZW4gLSA0KSAqIDgpOwotICAgIGZzY29kICAgICAgPSBnZXRfYml0cygm Z2JjLCAyKTsKLSAgICBmcm1zaXplY29kID0gZ2V0X2JpdHMoJmdiYywgNik7Ci0gICAgYnNpZCAg ICAgICA9IGdldF9iaXRzKCZnYmMsIDUpOwotICAgIGJzbW9kICAgICAgPSBnZXRfYml0cygmZ2Jj LCAzKTsKLSAgICBhY21vZCAgICAgID0gZ2V0X2JpdHMoJmdiYywgMyk7Ci0gICAgaWYgKGFjbW9k ID09IDIpIHsKLSAgICAgICAgc2tpcF9iaXRzKCZnYmMsIDIpOyAvLyBkc3VybW9kCi0gICAgfSBl bHNlIHsKLSAgICAgICAgaWYgKChhY21vZCAmIDEpICYmIGFjbW9kICE9IDEpCi0gICAgICAgICAg ICBza2lwX2JpdHMoJmdiYywgMik7IC8vIGNtaXhsZXYKLSAgICAgICAgaWYgKGFjbW9kICYgNCkK LSAgICAgICAgICAgIHNraXBfYml0cygmZ2JjLCAyKTsgLy8gc3VybWl4bGV2Ci0gICAgfQotICAg IGxmZW9uID0gZ2V0X2JpdHMxKCZnYmMpOwotCiAgICAgaW5pdF9wdXRfYml0cygmcGJjLCBidWYs IHNpemVvZihidWYpKTsKLSAgICBwdXRfYml0cygmcGJjLCAyLCBmc2NvZCk7Ci0gICAgcHV0X2Jp dHMoJnBiYywgNSwgYnNpZCk7Ci0gICAgcHV0X2JpdHMoJnBiYywgMywgYnNtb2QpOwotICAgIHB1 dF9iaXRzKCZwYmMsIDMsIGFjbW9kKTsKLSAgICBwdXRfYml0cygmcGJjLCAxLCBsZmVvbik7Ci0g ICAgcHV0X2JpdHMoJnBiYywgNSwgZnJtc2l6ZWNvZCA+PiAxKTsgLy8gYml0X3JhdGVfY29kZQor ICAgIHB1dF9iaXRzKCZwYmMsIDIsIGluZm8tPnN1YnN0cmVhbVswXS5mc2NvZCk7CisgICAgcHV0 X2JpdHMoJnBiYywgNSwgaW5mby0+c3Vic3RyZWFtWzBdLmJzaWQpOworICAgIHB1dF9iaXRzKCZw YmMsIDMsIGluZm8tPnN1YnN0cmVhbVswXS5ic21vZCk7CisgICAgcHV0X2JpdHMoJnBiYywgMywg aW5mby0+c3Vic3RyZWFtWzBdLmFjbW9kKTsKKyAgICBwdXRfYml0cygmcGJjLCAxLCBpbmZvLT5z dWJzdHJlYW1bMF0ubGZlb24pOworICAgIHB1dF9iaXRzKCZwYmMsIDUsIGluZm8tPmFjM19iaXRf cmF0ZV9jb2RlKTsgLy8gYml0X3JhdGVfY29kZQogICAgIHB1dF9iaXRzKCZwYmMsIDUsIDApOyAv LyByZXNlcnZlZAogCiAgICAgZmx1c2hfcHV0X2JpdHMoJnBiYyk7CkBAIC01OTgxLDggKzU5NzEs NyBAQCBpbnQgZmZfbW92X3dyaXRlX3BhY2tldChBVkZvcm1hdENvbnRleHQgKnMsIEFWUGFja2V0 ICpwa3QpCiAgICAgaWYgKChwYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lEX0ROWEhEIHx8CiAg ICAgICAgICBwYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lEX0gyNjQgfHwKICAgICAgICAgIHBh ci0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfSEVWQyB8fAotICAgICAgICAgcGFyLT5jb2RlY19p ZCA9PSBBVl9DT0RFQ19JRF9UUlVFSEQgfHwKLSAgICAgICAgIHBhci0+Y29kZWNfaWQgPT0gQVZf Q09ERUNfSURfQUMzKSAmJiAhdHJrLT52b3NfbGVuICYmCisgICAgICAgICBwYXItPmNvZGVjX2lk ID09IEFWX0NPREVDX0lEX1RSVUVIRCkgJiYgIXRyay0+dm9zX2xlbiAmJgogICAgICAgICAgIVRB R19JU19BVkNJKHRyay0+dGFnKSkgewogICAgICAgICAvKiBjb3B5IGZyYW1lIHRvIGNyZWF0ZSBu ZWVkZWQgYXRvbXMgKi8KICAgICAgICAgdHJrLT52b3NfbGVuICA9IHNpemU7CkBAIC02MDU5LDcg KzYwNDgsOCBAQCBpbnQgZmZfbW92X3dyaXRlX3BhY2tldChBVkZvcm1hdENvbnRleHQgKnMsIEFW UGFja2V0ICpwa3QpCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgIH0gZWxzZSBpZiAo cGFyLT5jb2RlY19pZCA9PSBBVl9DT0RFQ19JRF9FQUMzKSB7CisgICAgfSBlbHNlIGlmIChwYXIt PmNvZGVjX2lkID09IEFWX0NPREVDX0lEX0VBQzMgfHwKKyAgICAgICAgICAgICAgIHBhci0+Y29k ZWNfaWQgPT0gQVZfQ09ERUNfSURfQUMzKSB7CiAgICAgICAgIHNpemUgPSBoYW5kbGVfZWFjMyht b3YsIHBrdCwgdHJrKTsKICAgICAgICAgaWYgKHNpemUgPCAwKQogICAgICAgICAgICAgcmV0dXJu IHNpemU7Ci0tIAoyLjM2LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmZmbXBlZy1kZXZlbCBtYWlsaW5nIGxpc3QKZmZtcGVnLWRldmVsQGZmbXBlZy5v cmcKaHR0cHM6Ly9mZm1wZWcub3JnL21haWxtYW4vbGlzdGluZm8vZmZtcGVnLWRldmVsCgpUbyB1 bnN1YnNjcmliZSwgdmlzaXQgbGluayBhYm92ZSwgb3IgZW1haWwKZmZtcGVnLWRldmVsLXJlcXVl c3RAZmZtcGVnLm9yZyB3aXRoIHN1YmplY3QgInVuc3Vic2NyaWJlIi4K