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 5BA9C40BBB for ; Tue, 8 Mar 2022 03:30:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E6A168B201; Tue, 8 Mar 2022 05:30:34 +0200 (EET) Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BEBC68AF0A for ; Tue, 8 Mar 2022 05:30:27 +0200 (EET) Received: by mail-io1-f42.google.com with SMTP id k25so3667499iok.8 for ; Mon, 07 Mar 2022 19:30:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to :content-language; bh=E3xtX42oPm7x8AOpjSwS8p2AqT02xymL5otvnR/ZWpU=; b=K7WHb6qEV26Z9kY663hCveqHCDIeSwU36m8G2EstwN9nn51i1bx2cKIPk4zevL0A8e UVWs2nzDE4/3JnDPXxsqAyhS2BzixN7VsMsf+mEceaRFTluBl7pj88iTcBQbCTq06x4E qYaB+8k89/pQMZNBv2mIM/lG6voDX8BBoZV+j68QUjRmsAjCxpXGXCZJVSc5uqqnRva5 qMcDIaxLhhuBfBNG78SxKQvYEwA2uKOBB1zg7svfXA1IiycAtMxf6PvMlcBVnjlZiplW 28AmuYSGTHNWHtgMW+lBDpIjVK/32UIDSDZUjvpHOSnZRivIQ6+SOCAGqqcYLkYcYhgk AgKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:content-language; bh=E3xtX42oPm7x8AOpjSwS8p2AqT02xymL5otvnR/ZWpU=; b=OBViIj6mO2iKrSHWSkgM0TLIkp93Z3O6gKAmGbsbTugHyGfpEHRk4VEtAREGSg5asm lV5i2fcAVeEsRsuOQ05/lPVJmI/x/jlyBOyOZh6Lej7rwuNNFYgFwlCdcSRpKPNwImn+ da4vk2aijvTkv/Zg3t2mygsSwqSVL73PW0/GjwS6VqKLUhCwex0K6aL0lNOfbpJM61fU D6DjRSkEhQpUdXhFMy+9wTtPRnczqlIur3QYzgw8KujFF6QNwJr0hivxMhojUfQiKr4k 0cpaaRylB4Cp08jnwHnxOAq11bUxKBfLGhD3DsMXzXZnZfBKfWjghY4Vp30oyuRADWLq EkxA== X-Gm-Message-State: AOAM533MvyKOsDmlXnB1Uhzu914alqJ2hQ9+w+3FoYc7THH1gtyn8FFX unTx4Qbd7UDnjBJgrvIQC3axy4ezpLNKqg== X-Google-Smtp-Source: ABdhPJyOHuISFPEGQXemC1nQxoAtSCc+7V2G6EJR3rChb1MbudimRs+1CagF4NgOUXt4TLVGHxdTew== X-Received: by 2002:a6b:c842:0:b0:645:c339:38c7 with SMTP id y63-20020a6bc842000000b00645c33938c7mr7216828iof.26.1646710225569; Mon, 07 Mar 2022 19:30:25 -0800 (PST) Received: from [192.168.7.86] (c-68-40-205-18.hsd1.mi.comcast.net. [68.40.205.18]) by smtp.gmail.com with ESMTPSA id i3-20020a056602134300b0064620a85b6dsm612785iov.12.2022.03.07.19.30.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Mar 2022 19:30:24 -0800 (PST) Content-Type: multipart/mixed; boundary="------------v7JLuYQ0yYzU0X7tAw2HAEMY" Message-ID: <193e12fa-5bea-5fab-6def-a5ebd3a4be63@gmail.com> Date: Mon, 7 Mar 2022 22:30:24 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 From: Jack Bruienne To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v7 3/3] libavformat: Added DFPWM WAV container support 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" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------v7JLuYQ0yYzU0X7tAw2HAEMY Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit This commit adds support for storing DFPWM audio in a WAV container. It uses the WAVEFORMATEXTENSIBLE structure, following these conventions: https://gist.github.com/MCJack123/90c24b64c8e626c7f130b57e9800962c The implementation is very simple: it just adds the GUID to the list of WAV GUIDs, and modifies the WAV muxer to always use WAVEFORMATEXTENSIBLE format with that GUID. This creates a standard container format for DFPWM besides raw data. It will allow users to transfer DFPWM audio in a standard container format, with the sample rate and channel count contained in the file as opposed to being an external parameter as in the raw format. This format is already supported in my AUKit library, which is the CC analog to libav (albeit much smaller). Support in other applications is TBD. Signed-off-by: Jack Bruienne --- libavformat/riff.c | 3 +++ libavformat/riffenc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) --------------v7JLuYQ0yYzU0X7tAw2HAEMY Content-Type: text/x-patch; charset=UTF-8; name="v7-0003-libavformat-Added-DFPWM-WAV-container-support.patch" Content-Disposition: attachment; filename*0="v7-0003-libavformat-Added-DFPWM-WAV-container-support.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L3JpZmYuYyBiL2xpYmF2Zm9ybWF0L3JpZmYuYwpp bmRleCAwYzE5ZDNmLi5mMDk4YzFkIDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9yaWZmLmMK KysrIGIvbGliYXZmb3JtYXQvcmlmZi5jCkBAIC01ODcsNiArNTg3LDggQEAgY29uc3QgQVZD b2RlY1RhZyBmZl9jb2RlY193YXZfdGFnc1tdID0gewogICAgIHsgQVZfQ09ERUNfSURfQUFD LCAgICAgICAgICAgICAweEExMDYgfSwKICAgICB7IEFWX0NPREVDX0lEX1NQRUVYLCAgICAg ICAgICAgMHhBMTA5IH0sCiAgICAgeyBBVl9DT0RFQ19JRF9GTEFDLCAgICAgICAgICAgIDB4 RjFBQyB9LAorICAgIC8qIERGUFdNIGRvZXMgbm90IGhhdmUgYW4gYXNzaWduZWQgZm9ybWF0 IHRhZzsgaXQgdXNlcyBhIEdVSUQgaW4gV0FWRUZPUk1BVEVYIGluc3RlYWQgKi8KKyAgICB7 IEFWX0NPREVDX0lEX0RGUFdNLCAgICAgICAgICAgMHhGRkZFIH0sCiAgICAgeyBBVl9DT0RF Q19JRF9BRFBDTV9TV0YsICAgICAgICgnUycgPDwgOCkgKyAnRicgfSwKICAgICAvKiBIQUNL L0ZJWE1FOiBEb2VzIFZvcmJpcyBpbiBXQVYvQVZJIGhhdmUgYW4gKGluKW9mZmljaWFsIElE PyAqLwogICAgIHsgQVZfQ09ERUNfSURfVk9SQklTLCAgICAgICAgICAoJ1YnIDw8IDgpICsg J28nIH0sCkBAIC02MzcsNSArNjM5LDYgQEAgY29uc3QgQVZDb2RlY0d1aWQgZmZfY29kZWNf d2F2X2d1aWRzW10gPSB7CiAgICAgeyBBVl9DT0RFQ19JRF9FQUMzLCAgICAgeyAweEFGLCAw eDg3LCAweEZCLCAweEE3LCAweDAyLCAweDJELCAweEZCLCAweDQyLCAweEE0LCAweEQ0LCAw eDA1LCAweENELCAweDkzLCAweDg0LCAweDNCLCAweEREIH0gfSwKICAgICB7IEFWX0NPREVD X0lEX01QMiwgICAgICB7IDB4MkIsIDB4ODAsIDB4NkQsIDB4RTAsIDB4NDYsIDB4REIsIDB4 Q0YsIDB4MTEsIDB4QjQsIDB4RDEsIDB4MDAsIDB4ODAsIDB4NUYsIDB4NkMsIDB4QkIsIDB4 RUEgfSB9LAogICAgIHsgQVZfQ09ERUNfSURfQURQQ01fQUdNLHsgMHg4MiwgMHhFQywgMHgx RiwgMHg2QSwgMHhDQSwgMHhEQiwgMHgxOSwgMHg0NSwgMHhCRCwgMHhFNywgMHg1NiwgMHhE MywgMHhCMywgMHhFRiwgMHg5OCwgMHgxRCB9IH0sCisgICAgeyBBVl9DT0RFQ19JRF9ERlBX TSwgICAgeyAweDNBLCAweEMxLCAweEZBLCAweDM4LCAweDgxLCAweDFELCAweDQzLCAweDYx LCAweEE0LCAweDBELCAweENFLCAweDUzLCAweENBLCAweDYwLCAweDdDLCAweEQxIH0gfSwK ICAgICB7IEFWX0NPREVDX0lEX05PTkUgfQogfTsKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0 L3JpZmZlbmMuYyBiL2xpYmF2Zm9ybWF0L3JpZmZlbmMuYwppbmRleCBmZmNjZmEzLi45Njc1 MGU3IDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9yaWZmZW5jLmMKKysrIGIvbGliYXZmb3Jt YXQvcmlmZmVuYy5jCkBAIC04MSw3ICs4MSw3IEBAIGludCBmZl9wdXRfd2F2X2hlYWRlcihB VkZvcm1hdENvbnRleHQgKnMsIEFWSU9Db250ZXh0ICpwYiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBhci0+Y2hhbm5lbHMgPT0gMSAmJiBwYXItPmNoYW5uZWxfbGF5b3V0ICYm IHBhci0+Y2hhbm5lbF9sYXlvdXQgIT0gQVZfQ0hfTEFZT1VUX01PTk8gfHwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHBhci0+Y2hhbm5lbHMgPT0gMiAmJiBwYXItPmNoYW5uZWxf bGF5b3V0ICYmIHBhci0+Y2hhbm5lbF9sYXlvdXQgIT0gQVZfQ0hfTEFZT1VUX1NURVJFTyB8 fAogICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyLT5zYW1wbGVfcmF0ZSA+IDQ4MDAw IHx8Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBwYXItPmNvZGVjX2lkID09IEFWX0NP REVDX0lEX0VBQzMgfHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhci0+Y29kZWNf aWQgPT0gQVZfQ09ERUNfSURfRUFDMyB8fCBwYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lE X0RGUFdNIHx8CiAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdl9nZXRfYml0c19wZXJf c2FtcGxlKHBhci0+Y29kZWNfaWQpID4gMTY7CiAKICAgICBpZiAod2F2ZWZvcm1hdGV4dGVu c2libGUpCkBAIC0xODgsNyArMTg4LDcgQEAgaW50IGZmX3B1dF93YXZfaGVhZGVyKEFWRm9y bWF0Q29udGV4dCAqcywgQVZJT0NvbnRleHQgKnBiLAogICAgICAgICAvKiBkd0NoYW5uZWxN YXNrICovCiAgICAgICAgIGF2aW9fd2wzMihwYiwgd3JpdGVfY2hhbm5lbF9tYXNrID8gcGFy LT5jaGFubmVsX2xheW91dCA6IDApOwogICAgICAgICAvKiBHVUlEICsgbmV4dCAzICovCi0g ICAgICAgIGlmIChwYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lEX0VBQzMpIHsKKyAgICAg ICAgaWYgKHBhci0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfRUFDMyB8fCBwYXItPmNvZGVj X2lkID09IEFWX0NPREVDX0lEX0RGUFdNKSB7CiAgICAgICAgICAgICBmZl9wdXRfZ3VpZChw YiwgZmZfZ2V0X2NvZGVjX2d1aWQocGFyLT5jb2RlY19pZCwgZmZfY29kZWNfd2F2X2d1aWRz KSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBhdmlvX3dsMzIocGIsIHBhci0+ Y29kZWNfdGFnKTsKCg== --------------v7JLuYQ0yYzU0X7tAw2HAEMY Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --------------v7JLuYQ0yYzU0X7tAw2HAEMY--