mbox series

[FFmpeg-devel,v2,0/6] Fix adpcm_swf support in WAV.

Message ID 20201019224335.11874-1-zane@zanevaniperen.com
Headers show
Series Fix adpcm_swf support in WAV. | expand

Message

Zane van Iperen Oct. 19, 2020, 10:43 p.m. UTC 
adpcm_swf support in WAV is completely broken. block_align isn't set correctly, so
the demuxer gives incorrect packets to the decoder. The encoder doesn't provide a
value for block_align, so it's set to 1.

All of this has no bearing on (de)muxing to FLV.

See https://trac.ffmpeg.org/ticket/5829.

v2: [1]
  - Fix FATE failure
  - Move block_size check into ff_put_wav_header()
  - Allow a custom block size now that [2] is merged.

[1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-October/271262.html
[2]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-October/271001.html

Zane van Iperen (6):
  avformat/riff: prevent muxing adpcm_swf with a variable block size
  avcodec/adpcm_swf: support decoding multiple fixed-sized blocks at
    once
  avcodec/adpcm_swf: set block_align when encoding
  avcodec/adpcm_swf: support custom block size for encoding
  avcodec/adpcmenc: cosmetics
  fate: add test for adpcm_swf in wav

 libavcodec/adpcm.c             | 15 +++++++++++++--
 libavcodec/adpcmenc.c          |  9 ++++-----
 libavformat/riffenc.c          |  6 ++++++
 tests/fate/acodec.mak          |  4 ++++
 tests/ref/acodec/adpcm-swf-wav |  4 ++++
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 tests/ref/acodec/adpcm-swf-wav