FFTPlayer0x32 use double packet queue, double decoder thread

Author: debugly

Example/Common/4.Movie Player/VideoFrameQueue/MRVideoFrameQueueViewController.m

@@ -208,7 +208,6 @@ - (void)parseURL:(NSString *)url
         [self.indicatorView stopAnimation:nil];
         self.audioFrameQueue = [[FFTAudioFrameQueue alloc] init];
         [self setupAudioRender:player.sampleFormat sampleRate:player.sampleRate];
-        [self playAudio];
 
         [self prepareRendererView];
         self.videoFrameQueue = [[FFTVideoFrameQueue alloc] init];
@@ -242,6 +241,7 @@ - (void)parseURL:(NSString *)url
         //audio
         else if (type == 2) {
             [self enQueueAudioFrame:frame];
+            [self playAudio];
         }
     };
     [player prepareToPlay];

Example/iOS/iOSExample.xcodeproj/project.pbxproj

@@ -359,8 +359,8 @@
 		C94AF2172B3040EE006DC380 /* 4.Movie Player */ = {
 			isa = PBXGroup;
 			children = (
-				C94AF2182B3040EE006DC380 /* PacketQueue */,
 				C94AF2352B3040EE006DC380 /* VideoFrameQueue */,
+				C94AF2182B3040EE006DC380 /* PacketQueue */,
 				C94AF2602B305659006DC380 /* VideoEmbed */,
 				DDE075192B31DBB4004B7042 /* AudioEmbed */,
 				C9F3DFD82B33CF4B003602E0 /* PlayProgress */,

Example/iOS/iOSExample/RootViewController/MRTableViewController.m

@@ -118,7 +118,7 @@ - (void)viewDidLoad {
             },
             @{
                 @"title":@"PacketQueue",
-                @"detail":@"增加 AVPacket 缓存队列，创建解码线程",
+                @"detail":@"增加 AVPacket 缓存队列，分别创建解码线程",
                 @"class":@"MRPacketQueueViewController",
             },
             @{

FFmpegTutorial/t32/FFTPlayer0x32.m

@@ -36,7 +36,8 @@ @interface  FFTPlayer0x32 ()<FFTDecoderDelegate>
     //音频重采样
     FFTAudioResample *_audioResample;
 
-    FFTPacketQueue *_packetQueue;
+    FFTPacketQueue *_audioPacketQueue;
+    FFTPacketQueue *_videoPacketQueue;
 
     FFTVideoFrameQueue *_videoFrameQueue;
     //视频尺寸
@@ -49,7 +50,9 @@ @interface  FFTPlayer0x32 ()<FFTDecoderDelegate>
 
 //读包线程
 @property (nonatomic, strong) FFTThread *readThread;
-@property (nonatomic, strong) FFTThread *decoderThread;
+@property (nonatomic, strong) FFTThread *audioDecoderThread;
+@property (nonatomic, strong) FFTThread *videoDecoderThread;
+
 @property (nonatomic, strong) FFTThread *videoThread;
 
 @property (atomic, assign) int abort_request;
@@ -72,7 +75,8 @@ static int decode_interrupt_cb(void *ctx)
 - (void)_stop
 {
     self.abort_request = 1;
-    [_packetQueue cancel];
+    [_audioPacketQueue cancel];
+    [_videoPacketQueue cancel];
     [_videoFrameQueue cancel];
 
     //避免重复stop做无用功
@@ -81,9 +85,14 @@ - (void)_stop
         [self.readThread join];
     }
 
-    if (self.decoderThread) {
-        [self.decoderThread cancel];
-        [self.decoderThread join];
+    if (self.audioDecoderThread) {
+        [self.audioDecoderThread cancel];
+        [self.audioDecoderThread join];
+    }
+    
+    if (self.videoDecoderThread) {
+        [self.videoDecoderThread cancel];
+        [self.videoDecoderThread join];
     }
 
     if (self.videoThread) {
@@ -115,13 +124,17 @@ - (void)prepareToPlay
         NSAssert(NO, @"不允许重复创建");
     }
 
-    _packetQueue = [[FFTPacketQueue alloc] init];
+    _audioPacketQueue = [[FFTPacketQueue alloc] init];
+    _videoPacketQueue = [[FFTPacketQueue alloc] init];
 
     self.readThread = [[FFTThread alloc] initWithTarget:self selector:@selector(readPacketsFunc) object:nil];
     self.readThread.name = @"mr-read";
 
-    self.decoderThread = [[FFTThread alloc] initWithTarget:self selector:@selector(decoderFunc) object:nil];
-    self.decoderThread.name = @"mr-decoder";
+    self.audioDecoderThread = [[FFTThread alloc] initWithTarget:self selector:@selector(audioDecoderFunc) object:nil];
+    self.audioDecoderThread.name = @"audio-decoder";
+    
+    self.videoDecoderThread = [[FFTThread alloc] initWithTarget:self selector:@selector(videoDecoderFunc) object:nil];
+    self.videoDecoderThread.name = @"video-decoder";
 
     self.videoThread = [[FFTThread alloc] initWithTarget:self selector:@selector(videoThreadFunc) object:nil];
     self.videoThread.name = @"mr-v-display";
@@ -154,9 +167,9 @@ - (void)readPacketLoop:(AVFormatContext *)formatCtx
                 pkt->data = NULL;
                 pkt->size = 0;
                 pkt->stream_index = _videoDecoder.streamIdx;
-                [_packetQueue enQueue:pkt];
+                [_videoPacketQueue enQueue:pkt];
                 pkt->stream_index = _audioDecoder.streamIdx;
-                [_packetQueue enQueue:pkt];
+                [_audioPacketQueue enQueue:pkt];
                 break;
             }
 
@@ -175,15 +188,15 @@ - (void)readPacketLoop:(AVFormatContext *)formatCtx
                     if (pkt->data != NULL) {
                         self.videoPktCount++;
                     }
-                    [_packetQueue enQueue:pkt];
+                    [_videoPacketQueue enQueue:pkt];
                 }
                     break;
                 case AVMEDIA_TYPE_AUDIO:
                 {
                     if (pkt->data != NULL) {
                         self.audioPktCount++;
                     }
-                    [_packetQueue enQueue:pkt];
+                    [_audioPacketQueue enQueue:pkt];
                 }
                     break;
                 default:
@@ -343,7 +356,8 @@ - (void)readPacketsFunc
     });
 
     _formatCtx = formatCtx;
-    [self.decoderThread start];
+    [self.audioDecoderThread start];
+    [self.videoDecoderThread start];
     [self.videoThread start];
     //循环读包
     [self readPacketLoop:formatCtx];
@@ -460,11 +474,24 @@ - (void)decodePkt:(AVPacket *)pkt
     }
 }
 
-- (void)decoderFunc
+- (void)audioDecoderFunc
+{
+    while (!self.abort_request) {
+        __weakSelf__
+        [_audioPacketQueue deQueue:^(AVPacket * pkt) {
+            __strongSelf__
+            if (pkt) {
+                [self decodePkt:pkt];
+            }
+        }];
+    }
+}
+
+- (void)videoDecoderFunc
 {
     while (!self.abort_request) {
         __weakSelf__
-        [_packetQueue deQueue:^(AVPacket * pkt) {
+        [_videoPacketQueue deQueue:^(AVPacket * pkt) {
             __strongSelf__
             if (pkt) {
                 [self decodePkt:pkt];