SGPlayer: Headers.

SGPlayer/Classes/Core/SGSession/SGFrameOutput.m

@@ -7,7 +7,6 @@
 //
 
 #import "SGFrameOutput.h"
-#import "SGAsset+Internal.h"
 #import "SGAudioDecoder.h"
 #import "SGVideoDecoder.h"
 #import "SGPacketOutput.h"
@@ -27,7 +26,6 @@ @interface SGFrameOutput () <SGPacketOutputDelegate, SGDecodeLoopDelegate>
 }
 
 @property (nonatomic, strong, readonly) NSLock *lock;
-@property (nonatomic, strong, readonly) id<SGDemuxable> demuxer;
 @property (nonatomic, strong, readonly) SGDecodeLoop *audioDecoder;
 @property (nonatomic, strong, readonly) SGDecodeLoop *videoDecoder;
 @property (nonatomic, strong, readonly) SGPacketOutput *packetOutput;
@@ -49,8 +47,7 @@ - (instancetype)initWithAsset:(SGAsset *)asset
         self->_audioDecoder.delegate = self;
         self->_videoDecoder = [[SGDecodeLoop alloc] initWithDecodableClass:[SGVideoDecoder class]];
         self->_videoDecoder.delegate = self;
-        self->_demuxer = [asset newDemuxable];
-        self->_packetOutput = [[SGPacketOutput alloc] initWithDemuxable:self->_demuxer];
+        self->_packetOutput = [[SGPacketOutput alloc] initWithAsset:asset];
         self->_packetOutput.delegate = self;
         for (int i = 0; i < 8; i++) {
             self->_capacityFlags[i] = NO;
@@ -78,9 +75,9 @@ - (void)dealloc
 SGGet0Map(CMTime, duration, self->_packetOutput)
 SGGet0Map(NSDictionary *, metadata, self->_packetOutput)
 SGGet0Map(NSArray<SGTrack *> *, tracks, self->_packetOutput)
-SGGet00Map(SGDemuxerOptions *, demuxerOptions, options, self->_demuxer)
+SGGet0Map(SGDemuxerOptions *, demuxerOptions, self->_packetOutput)
+SGSet1Map(void, setDemuxerOptions, SGDemuxerOptions *, self->_packetOutput)
 SGGet00Map(SGDecoderOptions *, decoderOptions, options, self->_audioDecoder)
-SGSet11Map(void, setDemuxerOptions, setOptions, SGDemuxerOptions *, self->_demuxer);
 
 #pragma mark - Setter & Getter
 

SGPlayer/Classes/Core/SGSession/SGPacketOutput.h

@@ -7,7 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "SGDemuxable.h"
+#import "SGDemuxerOptions.h"
+#import "SGPacket.h"
+#import "SGAsset.h"
 
 @protocol SGPacketOutputDelegate;
 
@@ -34,7 +36,12 @@ typedef NS_ENUM(NSUInteger, SGPacketOutputState) {
 /**
  *
  */
-- (instancetype)initWithDemuxable:(id<SGDemuxable>)demuxable;
+- (instancetype)initWithAsset:(SGAsset *)asset;
+
+/**
+ *
+ */
+@property (nonatomic, copy) SGDemuxerOptions *demuxerOptions;
 
 /**
  *

SGPlayer/Classes/Core/SGSession/SGPacketOutput.m

@@ -7,6 +7,8 @@
 //
 
 #import "SGPacketOutput.h"
+#import "SGAsset+Internal.h"
+#import "SGDemuxable.h"
 #import "SGError.h"
 #import "SGMacro.h"
 #import "SGLock.h"
@@ -34,10 +36,10 @@ @interface SGPacketOutput () <SGDemuxableDelegate>
 
 @implementation SGPacketOutput
 
-- (instancetype)initWithDemuxable:(id<SGDemuxable>)demuxable
+- (instancetype)initWithAsset:(SGAsset *)asset
 {
     if (self = [super init]) {
-        self->_demuxable = demuxable;
+        self->_demuxable = [asset newDemuxable];
         self->_demuxable.delegate = self;
         self->_lock = [[NSLock alloc] init];
         self->_wakeup = [[NSCondition alloc] init];
@@ -62,6 +64,8 @@ - (void)dealloc
 SGGet0Map(CMTime, duration, self->_demuxable)
 SGGet0Map(NSDictionary *, metadata, self->_demuxable)
 SGGet0Map(NSArray<SGTrack *> *, tracks, self->_demuxable)
+SGGet0Map(SGDemuxerOptions *, options, self->_demuxable)
+SGSet1Map(void, setOptions, SGDemuxerOptions *, self->_demuxable)
 
 #pragma mark - Setter & Getter