fix issue #17 : audio pts is wrong cause sample video playing slowly

Author: debugly

FFmpegTutorial/Classes/0x33/FFTPlayer0x33.m

@@ -352,6 +352,7 @@ - (void)readPacketsFunc
     _videoFrameQueue.averageDuration = (_videoDecoder.frameRate.num && _videoDecoder.frameRate.den ? av_q2d(_videoDecoder.frameRate) : 0);
 
     _audioFrameQueue = [[FFTAudioFrameQueue alloc] init];
+    _audioFrameQueue.streamTimeBase = av_q2d(_audioDecoder.stream->time_base);
 
     mr_sync_main_queue(^{
         //audio queue 不能跨线程，不可以在子线程创建，主线程play。audio unit 可以

FFmpegTutorial/Classes/0x34/FFTPlayer0x34.m

@@ -357,6 +357,8 @@ - (void)readPacketsFunc
     _videoFrameQueue.averageDuration = (_videoDecoder.frameRate.num && _videoDecoder.frameRate.den ? av_q2d(_videoDecoder.frameRate) : 0);
 
     _audioFrameQueue = [[FFTAudioFrameQueue alloc] init];
+    _audioFrameQueue.streamTimeBase = av_q2d(_audioDecoder.stream->time_base);
+    
     _duration = 1.0 * formatCtx->duration / AV_TIME_BASE;
     [dumpDic setObject:@(_duration) forKey:kFFTPlayer0x34Duration];
 

FFmpegTutorial/Classes/0x35/FFTPlayer0x35.m

@@ -365,6 +365,8 @@ - (void)readPacketsFunc
     _videoFrameQueue.averageDuration = (_videoDecoder.frameRate.num && _videoDecoder.frameRate.den ? av_q2d(_videoDecoder.frameRate) : 0);
 
     _audioFrameQueue = [[FFTAudioFrameQueue alloc] init];
+    _audioFrameQueue.streamTimeBase = av_q2d(_audioDecoder.stream->time_base);
+    
     _videoClk = [[FFTSyncClock alloc] init];
     _audioClk = [[FFTSyncClock alloc] init];
 

FFmpegTutorial/Classes/0x36/FFTPlayer0x36.m

@@ -350,6 +350,8 @@ - (void)readPacketsFunc
     _videoFrameQueue.averageDuration = (_videoDecoder.frameRate.num && _videoDecoder.frameRate.den ? av_q2d(_videoDecoder.frameRate) : 0);
 
     _audioFrameQueue = [[FFTAudioFrameQueue alloc] init];
+    _audioFrameQueue.streamTimeBase = av_q2d(_audioDecoder.stream->time_base);
+    
     _videoClk = [[FFTSyncClock alloc] init];
     _videoClk.name = @"video";
     _audioClk = [[FFTSyncClock alloc] init];

FFmpegTutorial/Classes/common/FFTAudioFrameQueue.m

@@ -23,8 +23,7 @@ - (void)enQueue:(AVFrame *)frame
     FFFrameItem *item = [[FFFrameItem alloc] initWithAVFrame:frame];
 
     if (frame->pts != AV_NOPTS_VALUE) {
-        AVRational tb = (AVRational){1, frame->sample_rate};
-        item.pts = frame->pts * av_q2d(tb);
+        item.pts = frame->pts * self.streamTimeBase;
     }
 
     item.duration = av_q2d((AVRational){frame->nb_samples, frame->sample_rate});

FFmpegTutorial/Classes/common/FFTFrameQueue.h

@@ -24,6 +24,7 @@ typedef struct AVFrame AVFrame;
 @interface FFTFrameQueue : NSObject
 
 @property (nonatomic, assign) BOOL eof;
+@property (nonatomic, assign) double streamTimeBase;
 
 - (void)push:(FFFrameItem *)frame;
 - (void)pop;

FFmpegTutorial/Classes/common/FFTPlayerHeader.m

@@ -205,8 +205,7 @@ enum AVPixelFormat MRPixelFormat2AV (MRPixelFormat mrpf){
 int audio_buffer_size(AVFrame *frame)
 {
     const int fmt = frame->format;
-    int chanels = av_sample_fmt_is_planar(fmt) ? 1 : 2;
-    //self.frame->linesize[i] 比 data_size 要大，所以有杂音
-    int data_size = av_samples_get_buffer_size(frame->linesize, chanels, frame->nb_samples, fmt, 1);
+    int chanels = frame->ch_layout.nb_channels;
+    int data_size = av_samples_get_buffer_size(NULL, chanels, frame->nb_samples, fmt, 1);
     return data_size;
 }

FFmpegTutorial/Classes/common/FFTVideoFrameQueue.h

@@ -11,7 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FFTVideoFrameQueue : FFTFrameQueue
 
-@property (nonatomic, assign) double streamTimeBase;
 //根据 fps 计算得出
 @property (nonatomic, assign) double averageDuration;