From 386b9b5f539520c3f01d1afc95121c5d151211fb Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Wed, 17 May 2006 03:05:34 +0000 Subject: [PATCH] Proper PTS generation for Smacker audio Originally committed as revision 5390 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/smacker.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index be01f5bde6..218ae38a76 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -63,6 +63,7 @@ typedef struct SmackerContext { int stream_id[7]; int curstream; offset_t nextpos; + int64_t aud_pts[7]; } SmackerContext; typedef struct SmackerFrame { @@ -171,7 +172,6 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) if((smk->rates[i] & 0xFFFFFF) && !(smk->rates[i] & SMK_AUD_BINKAUD)){ ast[i] = av_new_stream(s, 0); smk->indexes[i] = ast[i]->index; - av_set_pts_info(ast[i], 33, smk->pts_inc, tbase); ast[i]->codec->codec_type = CODEC_TYPE_AUDIO; ast[i]->codec->codec_id = (smk->rates[i] & SMK_AUD_PACKED) ? CODEC_ID_SMACKAUDIO : CODEC_ID_PCM_U8; ast[i]->codec->codec_tag = MKTAG('S', 'M', 'K', 'A'); @@ -180,6 +180,8 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) ast[i]->codec->bits_per_sample = (smk->rates[i] & SMK_AUD_16BITS) ? 16 : 8; if(ast[i]->codec->bits_per_sample == 16 && ast[i]->codec->codec_id == CODEC_ID_PCM_U8) ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; + av_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate + * ast[i]->codec->channels * ast[i]->codec->bits_per_sample / 8); } } @@ -306,6 +308,8 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) memcpy(pkt->data, smk->bufs[smk->curstream], smk->buf_sizes[smk->curstream]); pkt->size = smk->buf_sizes[smk->curstream]; pkt->stream_index = smk->stream_id[smk->curstream]; + pkt->pts = smk->aud_pts[smk->curstream]; + smk->aud_pts[smk->curstream] += LE_32(pkt->data); smk->curstream--; }