wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add block_align to sox input.

Browse source 
Patch by Phil Rutschman: name.surname modsystems com

Originally committed as revision 19371 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Phil Rutschman 2009-07-08 08:52:56 +00:00 • committed by Benoit Fouet
parent 56c6cf287b
commit 5a1e202b87
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libavformat/soxdec.c
View file

@ -112,23 +112,26 @@ static int sox_read_header(AVFormatContext *s,
st->codec->bit_rate = st->codec->sample_rate * st->codec->bit_rate = st->codec->sample_rate *
st->codec->bits_per_coded_sample * st->codec->bits_per_coded_sample *
st->codec->channels; 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); av_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0; return 0;
} }
#define MAX_SIZE 4096 #define SOX_SAMPLES 1024
static int sox_read_packet(AVFormatContext *s, static int sox_read_packet(AVFormatContext *s,
AVPacket *pkt) AVPacket *pkt)
{ {
int ret; int ret, size;
if (url_feof(s->pb)) if (url_feof(s->pb))
return AVERROR_EOF; 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) if (ret < 0)
return AVERROR(EIO); return AVERROR(EIO);
pkt->stream_index = 0; pkt->stream_index = 0;