[Ffmpeg-cvslog] CVS: ffmpeg/libavformat smacker.c,1.3,1.4

[Konstantin Shishkov CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv10243/libavformat

Modified Files:
	smacker.c 
Log Message:
Proper PTS generation for Smacker audio


Index: smacker.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/smacker.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smacker.c	17 May 2006 03:03:53 -0000	1.3
+++ smacker.c	17 May 2006 03:05:34 -0000	1.4
@@ -63,6 +63,7 @@
     int stream_id[7];
     int curstream;
     offset_t nextpos;
+    int64_t aud_pts[7];
 } SmackerContext;
 
 typedef struct SmackerFrame {
@@ -171,7 +172,6 @@
         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 @@
             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 @@
         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--;
     }