From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 575034D157 for ; Mon, 10 Nov 2025 20:42:53 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'mqp8g0Phv3dEITe9A3JUIs0lpjQUYpBDGnWm5rppGrk=', expected b'WwH+zONglJRFCny+yE1jX93yd81IkPxC3DqCmJ3tz00=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762807365; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=mqp8g0Phv3dEITe9A3JUIs0lpjQUYpBDGnWm5rppGrk=; b=kM9kXpm+2Znd7g3bAnQhNBFsK4pGiZiPELuDLNRxjuUx/cKyrbVmElXxPp57/6/hODSHC AKPwCS/L7BngAewa60uFEguBciijJEbC69UYtVK+2SIMoTZoI3yUxLrPWrn5TDMEYMoOg2w VPUE1T94Z6/bbq46woMmJV/YSQCzgGK+uywF8SKCCnwm28zw93gpdw2wrguu9kdTrzygGwA uXqu0CLUWQnUYCdmUYIAXUYZARNhVaZyAr1snS2oIs471o+EVOhSS3+hLgfZ/uacKp07ZZ1 lO6Ys8/rK8+F77tGcZctBaf8aOtsUFFxaaArkLMmCDVm+z50uFgQlV0TZwAg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 02DC068FC34; Mon, 10 Nov 2025 22:42:45 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762807349; b=U1gnr21QnrzIcT4HOPs5DDKHLCkNn8zj0OpMgpmaJCwzUJn4WIDL6BpfUCOiriR8xY/A/ O3gIraASlDoasdVEP5ll8CBeQDGnY7IKnUgIzHOucdOkUdJ6wrrlyN8dQ1/+b4D0cZdDUPv EXfzRRECo1K50ZuXyYe9xg2CyX8LPFm60SJcBRnXouH7TGbftb+e+bqCB0ChQNhd0haVnVa 1oRdQgRNYSr/e3XO6Y1W0asMiSUsiRWMrfylNZ3zoxaxYdtQIBGSretsnQBxyDa+5+AQKjd 3+EnS9hZaJ1oKa+SLt+4q8t5AlTvedsHgsr/Dqtagy9gVNcdlQwI950YHEwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762807349; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=szj96jmaKH/h1i4zZ8Yzn0Tpl2k+hn3owB7IvLwymew=; b=qX8MeA+i66MnaQ8IHndhD8iPWxa5+Xe3djEOpqslIBQBu5sVFn/FBDIMRbxxh45j5X4sL +RYODrIIVPAYraCF63+ISja0ZzNrSGOtkOD+XeO14MHn3TJkh7ESrkV6GUo8Eq9W9wDB9bt CIKH2LaRFC3QtM2OR6OlhShktAtBk2pXMGvKgaUTN6wArJAacuwj5dYvBIzPzCVS9fSqKgc w3vxU/zbvbYH2RCarX/9Bum8wWuD2rDCorsN4hpuWp2uLlY+jbExTuPOF2+eGcks9pfnYNz /h/zbCTJohF4gfDls/HfrfXJp3G2dP942f021iCBm0zzwZmKmtFU3L0sKCmQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762807342; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=WwH+zONglJRFCny+yE1jX93yd81IkPxC3DqCmJ3tz00=; b=MMZ9lrQggqndzVL40RTWRMcvrEGFuvTip2pBm0rg2d8ujI/G3dvUnhjHJCGdli4Qjox72 1fF2NlfjByLUlQKD7UGaAsq7SOBCOlpLL6whIm79kw/k8cz3eoO+7UShvfvXDuEH2q5mwOf VkL2ONou61Wxs3SxnBiOMyUs5gy+94ssJmfsimiRazWJgmm114K5EE0CQSrrrvYmOe9L9z3 QqjMqOgsghY9nsrYp3eitSD9mBU+LO3ZlVQ4DJLej/0GT/fghNIOEWBe5SE/9YpRIAPN/xd i49uz/7P2H9q4iufm/UcoF74AMfijBUwQtuKtuNANmJMKt24YXWojE7GRU/A== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 10AF968FA3F for ; Mon, 10 Nov 2025 22:42:22 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Nov 2025 20:42:21 -0000 Message-ID: <176280734222.25.3164558145327278717@2cb04c0e5124> Message-ID-Hash: GQMH3JA4SKJWJMTMFQZ4VHJA7X3Z6DWB X-Message-ID-Hash: GQMH3JA4SKJWJMTMFQZ4VHJA7X3Z6DWB X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/riff: add support for HEAACWAVEFORMAT (PR #20888) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20888 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20888 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20888.patch This is an extension to WAVEFORMATEX used for some AAC streams, defined in the Windows SDK. Fixes issue #20887. >>From 05a6c683e9a3e728bb139f3b2920957c6ff5530c Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 10 Nov 2025 17:37:58 -0300 Subject: [PATCH] avformat/riff: add support for HEAACWAVEFORMAT This is an extension to WAVEFORMATEX used for some AAC streams, defined in the Windows SDK. Fixes issue #20887. Signed-off-by: James Almer --- libavformat/riff.c | 1 + libavformat/riffdec.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/libavformat/riff.c b/libavformat/riff.c index 3c12c4e6c3..fc79d0ac21 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -596,6 +596,7 @@ const AVCodecTag ff_codec_wav_tags[] = { /* ADTS AAC */ { AV_CODEC_ID_AAC, 0x1600 }, { AV_CODEC_ID_AAC_LATM, 0x1602 }, + { AV_CODEC_ID_AAC, 0x1610 }, { AV_CODEC_ID_AC3, 0x2000 }, /* There is no Microsoft Format Tag for E-AC3, the GUID has to be used */ { AV_CODEC_ID_EAC3, 0x2000 }, diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 2b269b1682..685dffc893 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -149,6 +149,22 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, parse_waveformatex(s, pb, par); cbSize -= 22; size -= 22; + } else if (cbSize >= 12 && id == 0x1610) { /* HEAACWAVEFORMAT */ + int wPayloadType = avio_rl16(pb); + if (wPayloadType == 2) + avpriv_request_sample(s, "wPayloadType \"1\" (ADTS)"); + else if (wPayloadType == 3) + par->codec_id = AV_CODEC_ID_AAC_LATM; + avio_skip(pb, 2); // wAudioProfileLevelIndication + int wStructType = avio_rl16(pb); + if (wStructType) { + avpriv_report_missing_feature(s, "HEAACWAVEINFO wStructType \"%d\"", wStructType); + return AVERROR_PATCHWELCOME; + } + avio_skip(pb, 2); // wReserved1 + avio_skip(pb, 4); // dwReserved2 + cbSize -= 12; + size -= 12; } if (cbSize > 0) { ret = ff_get_extradata(s, par, pb, cbSize); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org