Add block_align to sox input.
authorPhil Rutschman <phil.rutschman@modsystems.com>
Wed, 8 Jul 2009 08:52:56 +0000 (08:52 +0000)
committerBenoit Fouet <benoit.fouet@free.fr>
Wed, 8 Jul 2009 08:52:56 +0000 (08:52 +0000)
Patch by Phil Rutschman: name.surname modsystems com

Originally committed as revision 19371 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/soxdec.c

index 0a30b9cb48a03b6d7f95b12c91c8ff3a002eac45..f6389caec91cf311d64a7de412e064655e8f776c 100644 (file)
@@ -112,23 +112,26 @@ static int sox_read_header(AVFormatContext *s,
     st->codec->bit_rate              = st->codec->sample_rate *
                                        st->codec->bits_per_coded_sample *
                                        st->codec->channels;
+    st->codec->block_align           = st->codec->bits_per_coded_sample *
+                                       st->codec->channels / 8;
 
     av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
     return 0;
 }
 
-#define MAX_SIZE 4096
+#define SOX_SAMPLES 1024
 
 static int sox_read_packet(AVFormatContext *s,
                            AVPacket *pkt)
 {
-    int ret;
+    int ret, size;
 
     if (url_feof(s->pb))
         return AVERROR_EOF;
 
-    ret = av_get_packet(s->pb, pkt, MAX_SIZE);
+    size = SOX_SAMPLES*s->streams[0]->codec->block_align;
+    ret = av_get_packet(s->pb, pkt, size);
     if (ret < 0)
         return AVERROR(EIO);
     pkt->stream_index = 0;