2016-09-15 20:48 GMT+02:00 Michael Niedermayer <mich...@niedermayer.cc>:
> On Thu, Sep 15, 2016 at 03:47:49PM +0200, Carl Eugen Hoyos wrote:
>> 2016-09-15 15:42 GMT+02:00 Michael Niedermayer <mich...@niedermayer.cc>:
>> >> -    { AV_CODEC_ID_ADPCM_SWF,       ('S' << 8) + 'F' },
>> >>      /* HACK/FIXME: Does Vorbis in WAV/AVI have an (in)official ID? */
>> >>      { AV_CODEC_ID_VORBIS,          ('V' << 8) + 'o' },
>> >>      { AV_CODEC_ID_NONE,      0 },
>> >
>> > does this affect adpcm_swf in nut ?
>>
>> Yes, indeed.
>>
>> Is it possible to fix adpcm_swf in wav?
>
> maybe if block_align is set (and is constant)

Attached fixes encoding, decoding still has the issue
that the decoder doesn't like more than one packet.
(Iiuc, it works if I limit the packet size in the wav demuxer.)

Carl Eugen
From 168bc2f828ffd7f85c0db736e6097e4198854c5d Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceho...@ag.or.at>
Date: Sat, 17 Sep 2016 15:01:19 +0200
Subject: [PATCH] lavc/adpcmenc: Set block_align for adpcm_swf.

---
 libavcodec/adpcmenc.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 36974fd..8cf0d67 100644
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@@ -138,6 +138,7 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
             goto error;
         }
         avctx->frame_size = 512 * (avctx->sample_rate / 11025);
+        avctx->block_align = (256 * avctx->channels * avctx->sample_rate / 11025) + 1 + 2 * avctx->channels;
         break;
     default:
         ret = AVERROR(EINVAL);
-- 
1.7.10.4

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to