Revision 2c2a167c

View differences:

libavformat/riff.c
322 322

  
323 323
    if(!enc->codec_tag || enc->codec_tag > 0xffff)
324 324
        return -1;
325
    waveformatextensible = enc->channels > 2 && enc->channel_layout;
325
    waveformatextensible =   (enc->channels > 2 && enc->channel_layout)
326
                          || enc->sample_rate > 48000
327
                          || av_get_bits_per_sample(enc->codec_id) > 16;
326 328

  
327 329
    if (waveformatextensible) {
328 330
        put_le16(pb, 0xfffe);
tests/rotozoom.regression.ref
269 269
1589237 ./tests/data/a-pcm_s24be.mov
270 270
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
271 271
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
272
aaba3cf534ddddf5bcf663bc8c5b5331 *./tests/data/a-pcm_s24le.wav
273
1587644 ./tests/data/a-pcm_s24le.wav
272
a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/a-pcm_s24le.wav
273
1587668 ./tests/data/a-pcm_s24le.wav
274 274
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
275 275
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
276 276
d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/a-pcm_s32be.mov
277 277
2118437 ./tests/data/a-pcm_s32be.mov
278 278
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
279 279
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
280
7661c9b6f221d9f57985a9e4d92c4e63 *./tests/data/a-pcm_s32le.wav
281
2116844 ./tests/data/a-pcm_s32le.wav
280
da6ed80f4f40f0082577dea80827e014 *./tests/data/a-pcm_s32le.wav
281
2116868 ./tests/data/a-pcm_s32le.wav
282 282
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
283 283
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
284 284
118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/a-pcm_f32be.au
285 285
2116824 ./tests/data/a-pcm_f32be.au
286 286
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
287 287
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
288
4104d0804a80fb8d02952ca5103b1012 *./tests/data/a-pcm_f32le.wav
289
2116856 ./tests/data/a-pcm_f32le.wav
288
46f44f86a18984a832206ab9e29a79f2 *./tests/data/a-pcm_f32le.wav
289
2116880 ./tests/data/a-pcm_f32le.wav
290 290
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
291 291
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
292 292
8112296b1ed94f72f20d04b1a54850a7 *./tests/data/a-pcm_f64be.au
293 293
4233624 ./tests/data/a-pcm_f64be.au
294 294
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
295 295
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
296
26598accec99bdbaf76d575045aca7a9 *./tests/data/a-pcm_f64le.wav
297
4233656 ./tests/data/a-pcm_f64le.wav
296
ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/a-pcm_f64le.wav
297
4233680 ./tests/data/a-pcm_f64le.wav
298 298
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
299 299
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
300 300
8c74234928ed425b1171211a89f67ead *./tests/data/a-pcm_zork.wav
......
303 303
stddev:  633.10 PSNR: 40.30 bytes:  1058444/  1058444
304 304
8168a5c1343553ef027541830f2cb879 *./tests/data/a-pcm_s24daud.302
305 305
10368730 ./tests/data/a-pcm_s24daud.302
306
fff1dc03aa2750031203a7d72b832fad *./tests/data/pcm.rotozoom.out.wav
307
stddev: 9416.45 PSNR: 16.85 bytes:  6911840/  1058444
306
f552afadfdfcd6348a07095da6382de5 *./tests/data/pcm.rotozoom.out.wav
307
stddev: 9415.16 PSNR: 16.85 bytes:  6911864/  1058444
tests/vsynth.regression.ref
269 269
1589237 ./tests/data/a-pcm_s24be.mov
270 270
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
271 271
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
272
aaba3cf534ddddf5bcf663bc8c5b5331 *./tests/data/a-pcm_s24le.wav
273
1587644 ./tests/data/a-pcm_s24le.wav
272
a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/a-pcm_s24le.wav
273
1587668 ./tests/data/a-pcm_s24le.wav
274 274
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
275 275
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
276 276
d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/a-pcm_s32be.mov
277 277
2118437 ./tests/data/a-pcm_s32be.mov
278 278
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
279 279
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
280
7661c9b6f221d9f57985a9e4d92c4e63 *./tests/data/a-pcm_s32le.wav
281
2116844 ./tests/data/a-pcm_s32le.wav
280
da6ed80f4f40f0082577dea80827e014 *./tests/data/a-pcm_s32le.wav
281
2116868 ./tests/data/a-pcm_s32le.wav
282 282
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
283 283
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
284 284
118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/a-pcm_f32be.au
285 285
2116824 ./tests/data/a-pcm_f32be.au
286 286
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
287 287
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
288
4104d0804a80fb8d02952ca5103b1012 *./tests/data/a-pcm_f32le.wav
289
2116856 ./tests/data/a-pcm_f32le.wav
288
46f44f86a18984a832206ab9e29a79f2 *./tests/data/a-pcm_f32le.wav
289
2116880 ./tests/data/a-pcm_f32le.wav
290 290
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
291 291
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
292 292
8112296b1ed94f72f20d04b1a54850a7 *./tests/data/a-pcm_f64be.au
293 293
4233624 ./tests/data/a-pcm_f64be.au
294 294
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
295 295
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
296
26598accec99bdbaf76d575045aca7a9 *./tests/data/a-pcm_f64le.wav
297
4233656 ./tests/data/a-pcm_f64le.wav
296
ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/a-pcm_f64le.wav
297
4233680 ./tests/data/a-pcm_f64le.wav
298 298
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
299 299
stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
300 300
8c74234928ed425b1171211a89f67ead *./tests/data/a-pcm_zork.wav
......
303 303
stddev:  633.10 PSNR: 40.30 bytes:  1058444/  1058444
304 304
8168a5c1343553ef027541830f2cb879 *./tests/data/a-pcm_s24daud.302
305 305
10368730 ./tests/data/a-pcm_s24daud.302
306
fff1dc03aa2750031203a7d72b832fad *./tests/data/pcm.vsynth.out.wav
307
stddev: 9416.45 PSNR: 16.85 bytes:  6911840/  1058444
306
f552afadfdfcd6348a07095da6382de5 *./tests/data/pcm.vsynth.out.wav
307
stddev: 9415.16 PSNR: 16.85 bytes:  6911864/  1058444

Also available in: Unified diff