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 6333540987 for ; Fri, 3 Jun 2022 12:47:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC33F68B84A; Fri, 3 Jun 2022 15:46:37 +0300 (EEST) 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 DBEA868B722 for ; Fri, 3 Jun 2022 15:46:28 +0300 (EEST) Received: by mail-lj1-f171.google.com with SMTP id l18so982548lje.13 for ; Fri, 03 Jun 2022 05:46:28 -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=BiZ9ClQv27brCRHEs+QhQ/vNu0Gg8Jztb8DM+VctURU=; b=gqjEEXlFI249HPjWernPOWArKwAUVjFrH29LeRQQkJ9oabLPE8atNa74SbYWxJo9Sn CT7tLEbGo8idLv0eP9INyj4fd3w3emYvRdoULHpLQy3ElQ6hIsVZZ9TKf4ZjNBT2AepN qgDq8bD9tdMT9qvoDDLgmwQ2EYsUFXmuxiesV1tyMBWRJBLMERb36I1uEVLleIct4skq kTHRMdUpDN37jSjPHoRLodeY0Z3Uhzbv1SJu8G1sYr46DPKBHz1RnZFnzkUBaA/ZV1RO cHo+3yU8fX5CiL16J2KPqbvXIqjcL44dHqSEHetpNuXexgnAZMmMNHp/Xsopj2GU72vk 0F6w== 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=BiZ9ClQv27brCRHEs+QhQ/vNu0Gg8Jztb8DM+VctURU=; b=slsW5twKz3QgR38NiUwI5lNqXwkdA+aIQcIBGNCgEJs2nfbuZY6c1RHB5jmO9vYcIF fbmN+CIJDTrltLJZS7iG8rwAUj+dn4wpkvDB5QucHOj0LLk7uTqpvjkt+0ropE/Da9Sr GAG1NwT1w/sBK+qmPCu9OJ6xPXvXIGLJ3iE/sAeCSq8P9idcFkDSdiIJn/kI7DgnJ0Ph dU/Px5SY0oP3+O5lq6WRZMvAGBFuRdQUF1jZS/+zB+4/sVS9ys2qYXTXZIW6F2l55k2m cvU9oIZYIVkHNxF7GoasQrhCg8lE12omnMMuF9Z0ODPDIWsdP2TtpBH4KE+GjosEcMaE hSmQ== X-Gm-Message-State: AOAM531Gnes6bL2T9BiwZov73SqfOrlVlejRGcuPWESXJmni49msLeRW +75mQXbfI0XzbTucWe2M0X8HJUrxyrk= X-Google-Smtp-Source: ABdhPJwJqIk+Afv7yJvVsFnVtKEZaNyhDok8yRjes/PW9Xs1JSrooVMrm15C14+vZ2UQd9vAIdRCwg== X-Received: by 2002:a2e:82c5:0:b0:247:e81f:8b02 with SMTP id n5-20020a2e82c5000000b00247e81f8b02mr44436817ljh.90.1654260388212; Fri, 03 Jun 2022 05:46:28 -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.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 05:46:27 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jun 2022 15:46:17 +0300 Message-Id: <20220603124620.15099-4-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 3/6] avformat/movenc: enable handle_eac3 to handle AC-3 tracks 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: RnJvbTogSmFuIEVrc3Ryw7ZtIDxqYW4uZWtzdHJvbUAyNGkuY29tPgoKQWRkIHRoZSBBQy0zIGZy YW1lIHR5cGUsIGFzIHdlbGwgYXMgZWFybHkgZXhpdCBmcm9tIGFkZGl0aW9uYWwgcGFja2V0CnBh cnNpbmcgaW4gY2FzZSBvZiBBQy0zLCBhcyBvbmx5IGEgc2luZ2xlIHBhY2tldCBpcyByZXF1aXJl ZCB0byBnZXQKdGhlIHJlcXVpcmVkIGluZm9ybWF0aW9uLgoKQWRkaXRpb25hbGx5LCBleHBvc2Ug YWMzX2JpdF9yYXRlX2NvZGUgdmlhIHRoZSBlYWMzX2luZm8gc3RydWN0IGFzCml0IGlzIHJlcXVp cmVkIGZvciBBQzNTcGVjaWZpY0JveC4KClNpZ25lZC1vZmYtYnk6IEphbiBFa3N0csO2bSA8amFu LmVrc3Ryb21AMjRpLmNvbT4KLS0tCiBsaWJhdmZvcm1hdC9tb3ZlbmMuYyB8IDIyICsrKysrKysr KysrKysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L21vdmVuYy5jIGIvbGliYXZmb3JtYXQv bW92ZW5jLmMKaW5kZXggNjM3MTNlNTY0MC4uMjU4OWYyZjRiYiAxMDA2NDQKLS0tIGEvbGliYXZm b3JtYXQvbW92ZW5jLmMKKysrIGIvbGliYXZmb3JtYXQvbW92ZW5jLmMKQEAgLTM4Myw2ICszODMs NyBAQCBzdHJ1Y3QgZWFjM19pbmZvIHsKICAgICAvKiBMYXlvdXQgb2YgdGhlIEVDM1NwZWNpZmlj Qm94ICovCiAgICAgLyogbWF4aW11bSBiaXRyYXRlICovCiAgICAgdWludDE2X3QgZGF0YV9yYXRl OworICAgIGludDhfdCAgIGFjM19iaXRfcmF0ZV9jb2RlOwogICAgIC8qIG51bWJlciBvZiBpbmRl cGVuZGVudCBzdWJzdHJlYW1zICovCiAgICAgdWludDhfdCAgbnVtX2luZF9zdWI7CiAgICAgc3Ry dWN0IHsKQEAgLTQxMyw4ICs0MTQsMTIgQEAgc3RhdGljIGludCBoYW5kbGVfZWFjMyhNT1ZNdXhD b250ZXh0ICptb3YsIEFWUGFja2V0ICpwa3QsIE1PVlRyYWNrICp0cmFjaykKICAgICBzdHJ1Y3Qg ZWFjM19pbmZvICppbmZvOwogICAgIGludCBudW1fYmxvY2tzLCByZXQ7CiAKLSAgICBpZiAoIXRy YWNrLT5lYWMzX3ByaXYgJiYgISh0cmFjay0+ZWFjM19wcml2ID0gYXZfbWFsbG9jeihzaXplb2Yo KmluZm8pKSkpCi0gICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7CisgICAgaWYgKCF0cmFj ay0+ZWFjM19wcml2KSB7CisgICAgICAgIGlmICghKHRyYWNrLT5lYWMzX3ByaXYgPSBhdl9tYWxs b2N6KHNpemVvZigqaW5mbykpKSkKKyAgICAgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7 CisKKyAgICAgICAgKChzdHJ1Y3QgZWFjM19pbmZvICopdHJhY2stPmVhYzNfcHJpdiktPmFjM19i aXRfcmF0ZV9jb2RlID0gLTE7CisgICAgfQogICAgIGluZm8gPSB0cmFjay0+ZWFjM19wcml2Owog CiAgICAgaWYgKCFpbmZvLT5wa3QgJiYgIShpbmZvLT5wa3QgPSBhdl9wYWNrZXRfYWxsb2MoKSkp CkBAIC00MzEsNiArNDM2LDggQEAgc3RhdGljIGludCBoYW5kbGVfZWFjMyhNT1ZNdXhDb250ZXh0 ICptb3YsIEFWUGFja2V0ICpwa3QsIE1PVlRyYWNrICp0cmFjaykKICAgICB9CiAKICAgICBpbmZv LT5kYXRhX3JhdGUgPSBGRk1BWChpbmZvLT5kYXRhX3JhdGUsIGhkci0+Yml0X3JhdGUgLyAxMDAw KTsKKyAgICBpbmZvLT5hYzNfYml0X3JhdGVfY29kZSA9IEZGTUFYKGluZm8tPmFjM19iaXRfcmF0 ZV9jb2RlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGRyLT5hYzNfYml0 X3JhdGVfY29kZSk7CiAgICAgbnVtX2Jsb2NrcyA9IGhkci0+bnVtX2Jsb2NrczsKIAogICAgIGlm ICghaW5mby0+ZWMzX2RvbmUpIHsKQEAgLTQ0Miw3ICs0NDksOCBAQCBzdGF0aWMgaW50IGhhbmRs ZV9lYWMzKE1PVk11eENvbnRleHQgKm1vdiwgQVZQYWNrZXQgKnBrdCwgTU9WVHJhY2sgKnRyYWNr KQogCiAgICAgICAgIC8qIHRoaXMgc2hvdWxkIGFsd2F5cyBiZSB0aGUgY2FzZSwgZ2l2ZW4gdGhh dCBvdXIgQUMtMyBwYXJzZXIKICAgICAgICAgICogY29uY2F0ZW5hdGVzIGRlcGVuZGVudCBmcmFt ZXMgdG8gdGhlaXIgaW5kZXBlbmRlbnQgcGFyZW50ICovCi0gICAgICAgIGlmIChoZHItPmZyYW1l X3R5cGUgPT0gRUFDM19GUkFNRV9UWVBFX0lOREVQRU5ERU5UKSB7CisgICAgICAgIGlmIChoZHIt PmZyYW1lX3R5cGUgPT0gRUFDM19GUkFNRV9UWVBFX0lOREVQRU5ERU5UIHx8CisgICAgICAgICAg ICBoZHItPmZyYW1lX3R5cGUgPT0gRUFDM19GUkFNRV9UWVBFX0FDM19DT05WRVJUKSB7CiAgICAg ICAgICAgICAvKiBzdWJzdHJlYW0gaWRzIG11c3QgYmUgaW5jcmVtZW50YWwgKi8KICAgICAgICAg ICAgIGlmIChoZHItPnN1YnN0cmVhbWlkID4gaW5mby0+bnVtX2luZF9zdWIgKyAxKSB7CiAgICAg ICAgICAgICAgICAgcmV0ID0gQVZFUlJPUihFSU5WQUwpOwpAQCAtNDc0LDYgKzQ4MiwxNCBAQCBz dGF0aWMgaW50IGhhbmRsZV9lYWMzKE1PVk11eENvbnRleHQgKm1vdiwgQVZQYWNrZXQgKnBrdCwg TU9WVHJhY2sgKnRyYWNrKQogICAgICAgICBpbmZvLT5zdWJzdHJlYW1baGRyLT5zdWJzdHJlYW1p ZF0uYWNtb2QgPSBoZHItPmNoYW5uZWxfbW9kZTsKICAgICAgICAgaW5mby0+c3Vic3RyZWFtW2hk ci0+c3Vic3RyZWFtaWRdLmxmZW9uID0gaGRyLT5sZmVfb247CiAKKyAgICAgICAgaWYgKHRyYWNr LT5wYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lEX0FDMykgeworICAgICAgICAgICAgLy8gd2l0 aCBBQy0zIHdlIG9ubHkgcmVxdWlyZSB0aGUgaW5mb3JtYXRpb24gb2YgYSBzaW5nbGUgcGFja2V0 LAorICAgICAgICAgICAgLy8gc28gd2UgY2FuIGZpbmlzaCBhcyBzb29uIGFzIHRoZSBiYXNpYyB2 YWx1ZXMgb2YgdGhlIGJpdCBzdHJlYW0KKyAgICAgICAgICAgIC8vIGhhdmUgYmVlbiBzZXQgdG8g dGhlIHRyYWNrJ3MgaW5mb3JtYXRpb25hbCBzdHJ1Y3R1cmUuCisgICAgICAgICAgICBpbmZvLT5l YzNfZG9uZSA9IDE7CisgICAgICAgICAgICBnb3RvIGNvbmNhdGVuYXRlOworICAgICAgICB9CisK ICAgICAgICAgLyogUGFyc2UgZGVwZW5kZW50IHN1YnN0cmVhbShzKSwgaWYgYW55ICovCiAgICAg ICAgIGlmIChwa3QtPnNpemUgIT0gaGRyLT5mcmFtZV9zaXplKSB7CiAgICAgICAgICAgICBpbnQg Y3VtdWxfc2l6ZSA9IGhkci0+ZnJhbWVfc2l6ZTsKLS0gCjIuMzYuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlz dApmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0 aW5mby9mZm1wZWctZGV2ZWwKClRvIHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBl bWFpbApmZm1wZWctZGV2ZWwtcmVxdWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJz Y3JpYmUiLgo=