[FFmpeg-devel] [PATCH] ff_put_wav_header: add flag to force WAVEFORMATEX

[Daniel Verkamp]

On Tue, Apr 29, 2014 at 11:28 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Mon, Apr 28, 2014 at 08:18:41PM -0700, Daniel Verkamp wrote:
>> Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e:
>>
>>     riff: always generate a proper WAVEFORMATEX structure in
>>     ff_put_wav_header
>>
>> A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
>> use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.
>>
>> This flag is used in the Matroska muxer (the cause of the original
>> change) and in the ASF muxer, because the specifications for
>> these formats indicate explicitly that WAVEFORMATEX should be used.
>>
>> Muxers for other formats will return to the original behavior of writing
>> PCMWAVEFORMAT when writing a header for raw PCM.
>>
>> In particular, this causes raw PCM in WAV to generate the canonical
>> 44-byte header expected by some tools.
>
> this still breaks one test
>
> make fate-filter-channelmap-one-str
> TEST    filter-channelmap-one-str
> --- -   2014-04-29 20:26:58.481206735 +0200
> +++ tests/data/fate/filter-channelmap-one-str   2014-04-29 20:26:58.476424967 +0200
> @@ -1 +1 @@
> -9fe9bc452282dfd94fd80e9491607a0c
> +49ed4aaec717f1b28137c9e1f01f343b
> Test filter-channelmap-one-str failed. Look at tests/data/fate/filter-channelmap-one-str.err for details.
> make: *** [fate-filter-channelmap-one-str] Error 1

Hmm, make fate GEN=1 missed that one (since it is within the Makefile)
and also did not fail; I have updated it now.

Thanks,
-- Daniel