[Test] Add unit tests for X-MAP and FRAME-RATE

Author: wolfcon

M3U8KitTests/M3U8KitTests.m

@@ -13,6 +13,9 @@
 @interface M3U8KitTests : XCTestCase
 
 @property (nonatomic) StringExample *example;
+@property (nonatomic) M3U8PlaylistModel *playList;
+
+@property (nonatomic) M3U8PlaylistModel *masterList;
 
 @end
 
@@ -23,6 +26,22 @@ - (void)setUp {
     // Put setup code here. This method is called before the invocation of each test method in the class.
 
     _example = [[StringExample alloc] init];
+    
+    NSURL *baseURL = [NSURL URLWithString:@"https://example.m3u8kit/9764a7a5vodtransgzp1252524126/953e2ef85285890782612785655/drm/"];
+    NSError *error = nil;
+    _playList = [[M3U8PlaylistModel alloc]
+                                   initWithString:_example.m3u8Playlist
+                                   baseURL:baseURL
+                                   error:&error];
+    XCTAssertNil(error);
+    
+    baseURL = [NSURL URLWithString:@"https://hls.ted.com"];
+    NSError *error1 = nil;
+    _masterList = [[M3U8PlaylistModel alloc]
+                                   initWithString:_example.m3u8Master
+                                   baseURL:baseURL
+                                   error:&error1];
+    XCTAssertNil(error1);
 }
 
 - (void)tearDown {
@@ -43,27 +62,13 @@ - (void)testLoadURLAsynchronously {
 }
 
 - (void)testMasterM3U {
-    NSURL *baseURL = [NSURL URLWithString:@"https://hls.ted.com"];
-    NSError *error = nil;
-    M3U8PlaylistModel *playList = [[M3U8PlaylistModel alloc]
-                                   initWithString:_example.m3u8Master
-                                   baseURL:baseURL
-                                   error:&error];
-    NSLog(@"%@", playList);
-    NSArray *codecs = [playList.masterPlaylist.xStreamList xStreamInfAtIndex:0].codecs;
+    NSArray *codecs = [_masterList.masterPlaylist.xStreamList xStreamInfAtIndex:0].codecs;
     XCTAssert([codecs[0] isEqualToString:@"avc1.42c01e"]);
     XCTAssert([codecs[1] isEqualToString:@"mp4a.40.2"]);
-    XCTAssertNil(error);
 }
 
 - (void)testPlaylistM3U {
-    NSURL *baseURL = [NSURL URLWithString:@"https://example.m3u8kit/9764a7a5vodtransgzp1252524126/953e2ef85285890782612785655/drm/"];
-    NSError *error = nil;
-    M3U8PlaylistModel *playList = [[M3U8PlaylistModel alloc]
-                                   initWithString:_example.m3u8Playlist
-                                   baseURL:baseURL
-                                   error:&error];
-    M3U8SegmentInfoList *segments = playList.mainMediaPl.segmentList;
+    M3U8SegmentInfoList *segments = _playList.mainMediaPl.segmentList;
     XCTAssertEqual(segments.count, 23);
 
     M3U8SegmentInfo *segment0 = [segments segmentInfoAtIndex:0];
@@ -73,8 +78,19 @@ - (void)testPlaylistM3U {
     M3U8SegmentInfo *segment1 = [segments segmentInfoAtIndex:1];
     XCTAssertNil(segment1.additionalParameters);
     XCTAssertEqual(segment1.duration, 2.0);
-    
-    XCTAssertNil(error);
+}
+
+- (void)testParseXMap {
+    M3U8ExtXMap *xMap = _playList.mainMediaPl.xMap;
+    XCTAssertEqualObjects(xMap.URI.absoluteString, @"https://example.m3u8kit/xMap/init.mp4");
+    XCTAssertEqual(xMap.byteRange.length, 7355608);
+    XCTAssertEqual(xMap.byteRange.offset, 666);
+}
+
+- (void)testParseFrameRate {
+    M3U8MasterPlaylist *master = _masterList.masterPlaylist;
+    M3U8ExtXStreamInf *info = master.xStreamList.firstStreamInf;
+    XCTAssertEqual(info.frameRate, 7355608.0);
 }
 
 - (void)testPerformanceExample {

M3U8KitTests/StringExample.m

@@ -16,6 +16,7 @@ - (NSString *)m3u8Playlist {
     #EXT-X-VERSION:3\n\
     #EXT-X-TARGETDURATION:11\n\
     #EXT-X-MEDIA-SEQUENCE:0\n\
+    #EXT-X-MAP:URI=\"https://example.m3u8kit/xMap/init.mp4\",BYTERANGE=7355608@666\n\
     #EXT-X-KEY:METHOD=AES-128,URI=\"https://example.m3u8kit/get_video_key.php?edk=CiA61uBk9j6jp9V5Rs1LFLMDZmfgnepZhtsOyA1VJc8%2FwxCO08TAChiaoOvUBCokYjRhNjFiNTgtMmVhNy00OWYxLgwZGMtZTE0NTIyODc5YWIy&fileId=5285890782612785655&keySource=VodBuildInKMS\",IV=0x00000000000000000000000000000000\n\
     #EXTINF:2.000000 logo=\"someURI/target.png\" tvg-id=\"Rotana Cinema\" tvg-country=\"SA\" tvg-language=\"Arabic\" tvg-logo=\"tvgURI/logo.png\",\n\
     #EXT-X-BYTERANGE:3008@940\n\
@@ -94,7 +95,7 @@ - (NSString *)m3u8Master {
     @"#EXTM3U\n\
     #EXT-X-VERSION:4\n\
     #EXT-X-SESSION-KEY:METHOD=SAMPLE-AES,URI=\"skd://AZSkNGRhODQtMjE3My00ZDIdSDFEzN2QtYzE1YTczMTRjZjkw\",KEYFORMAT=\"com.apple.streamingkeydelivery\"\n\
-    #EXT-X-STREAM-INF:AUDIO=\"600k\",BANDWIDTH=915685,PROGRAM-ID=1,CODECS=\"avc1.42c01e,mp4a.40.2\",RESOLUTION=640x360,SUBTITLES=\"subs\"\n\
+    #EXT-X-STREAM-INF:AUDIO=\"600k\",BANDWIDTH=915685,PROGRAM-ID=1,CODECS=\"avc1.42c01e,mp4a.40.2\",RESOLUTION=640x360,SUBTITLES=\"subs\",FRAME-RATE=7355608\n\
     http://hls.ted.com/talks/769/video/600k.m3u8?sponsor=Ripple\n\
     #EXT-X-STREAM-INF:AUDIO=\"600k\",BANDWIDTH=131499,PROGRAM-ID=1,CODECS=\"avc1.42c00c,mp4a.40.2\",RESOLUTION=320x180,SUBTITLES=\"subs\"\n\
     /talks/769/video/64k.m3u8?sponsor=Ripple\n\