RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aud: fix time stamp calculation for ADPCM IMA WS 

also allows for removing some unused context fields
This commit is contained in:
Justin Ruggles 2012-01-24 11:43:54 -05:00
parent 10fef6bd6b
commit be14a37066
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/westwood_aud.c
View File

@ -42,10 +42,7 @@
#define AUD_CHUNK_SIGNATURE 0x0000DEAF #define AUD_CHUNK_SIGNATURE 0x0000DEAF
typedef struct WsAudDemuxContext { typedef struct WsAudDemuxContext {
int audio_channels;
int audio_samplerate;
int audio_stream_index; int audio_stream_index;
int64_t audio_frame_counter;
} WsAudDemuxContext; } WsAudDemuxContext;
static int wsaud_probe(AVProbeData *p) static int wsaud_probe(AVProbeData *p)
@ -131,10 +128,7 @@ static int wsaud_read_header(AVFormatContext *s,
st->codec->channels = channels; st->codec->channels = channels;
st->codec->sample_rate = sample_rate; st->codec->sample_rate = sample_rate;
wsaud->audio_channels = channels;
wsaud->audio_samplerate = sample_rate;
wsaud->audio_stream_index = st->index; wsaud->audio_stream_index = st->index;
wsaud->audio_frame_counter = 0;
return 0; return 0;
} }
@ -177,11 +171,9 @@ static int wsaud_read_packet(AVFormatContext *s,
ret = av_get_packet(pb, pkt, chunk_size); ret = av_get_packet(pb, pkt, chunk_size);
if (ret != chunk_size) if (ret != chunk_size)
return AVERROR(EIO); return AVERROR(EIO);
pkt->pts = wsaud->audio_frame_counter;
pkt->pts /= wsaud->audio_samplerate;
/* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */
wsaud->audio_frame_counter += (chunk_size * 2) / wsaud->audio_channels; pkt->duration = (chunk_size * 2) / st->codec->channels;
} }
pkt->stream_index = st->index; pkt->stream_index = st->index;