From df5646b598309d7562d8681bda850ff416322c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 4 Jun 2014 20:49:51 +0200 Subject: [PATCH 1/4] Update Travis CI URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e29c20e1..8868c59fa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## About -[![build status](https://travis-ci.org/0xced/XCDYouTubeVideoPlayerViewController.svg)](https://travis-ci.org/0xced/XCDYouTubeVideoPlayerViewController) +[![build status](https://travis-ci.org/0xced/XCDYouTubeKit.svg)](https://travis-ci.org/0xced/XCDYouTubeKit) **XCDYouTubeKit** is a YouTube video player for iOS and OS X. From 01ebd88cddf594be13f4e95022224c75b554048e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 4 Jun 2014 20:50:09 +0200 Subject: [PATCH 2/4] Make unit tests compile with Xcode 6 --- XCDYouTubeKit.xcodeproj/project.pbxproj | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/XCDYouTubeKit.xcodeproj/project.pbxproj b/XCDYouTubeKit.xcodeproj/project.pbxproj index 01093c16b..1aa28bfd5 100644 --- a/XCDYouTubeKit.xcodeproj/project.pbxproj +++ b/XCDYouTubeKit.xcodeproj/project.pbxproj @@ -566,6 +566,10 @@ "$(BUILT_PRODUCTS_DIR)/include", ); PRODUCT_NAME = "$(TARGET_NAME)"; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-documentation-unknown-command", + ); WRAPPER_EXTENSION = xctest; }; name = Debug; @@ -583,6 +587,10 @@ "$(BUILT_PRODUCTS_DIR)/include", ); PRODUCT_NAME = "$(TARGET_NAME)"; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-documentation-unknown-command", + ); WRAPPER_EXTENSION = xctest; }; name = Release; @@ -819,6 +827,10 @@ "$(BUILT_PRODUCTS_DIR)/include", ); PRODUCT_NAME = "$(TARGET_NAME)"; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-documentation-unknown-command", + ); WRAPPER_EXTENSION = xctest; }; name = "Code Coverage"; @@ -837,6 +849,10 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-documentation-unknown-command", + ); WRAPPER_EXTENSION = xctest; }; name = Debug; @@ -855,6 +871,10 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-documentation-unknown-command", + ); WRAPPER_EXTENSION = xctest; }; name = "Code Coverage"; @@ -873,6 +893,10 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-documentation-unknown-command", + ); WRAPPER_EXTENSION = xctest; }; name = Release; From 478f080f2592332d419c5b4223fa182c527b7ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 4 Jun 2014 20:56:58 +0200 Subject: [PATCH 3/4] Add asynchronous video unit test --- .../testAsynchronousVideoNotification.json | 20 +++++++++++++++++++ ...YouTubeVideoPlayerViewControllerTestCase.m | 14 +++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 XCDYouTubeKit Tests/Cassettes/testAsynchronousVideoNotification.json diff --git a/XCDYouTubeKit Tests/Cassettes/testAsynchronousVideoNotification.json b/XCDYouTubeKit Tests/Cassettes/testAsynchronousVideoNotification.json new file mode 100644 index 000000000..2ff1da490 --- /dev/null +++ b/XCDYouTubeKit Tests/Cassettes/testAsynchronousVideoNotification.json @@ -0,0 +1,20 @@ +[ + { + "body" : "allow_ratings=1&keywords=&storyboard_spec=https%3A%2F%2Fi1.ytimg.com%2Fsb%2FEdeVaT-zZt4%2Fstoryboard3_L%24L%2F%24N.jpg%7C48%2327%23100%2310%2310%230%23default%23-_aqpzr2ja2WCKt_ZSJ7PP_6wvw%7C80%2345%23110%2310%2310%231000%23M%24M%236I1WRrYSeUYKXqUVoS56xyT8oOU%7C160%2390%23110%235%235%231000%23M%24M%23MQH6SIQb0pZozJNhXHQhb0fq0f8&avg_rating=4.84689430401&focEnabled=1&fmt_list=22%2F1280x720%2F9%2F0%2F115%2C43%2F640x360%2F99%2F0%2F0%2C18%2F640x360%2F9%2F0%2F115%2C5%2F320x240%2F7%2F0%2F0%2C36%2F320x240%2F99%2F1%2F0%2C17%2F176x144%2F99%2F1%2F0&vid=EdeVaT-zZt4&iurlsd=https%3A%2F%2Fi1.ytimg.com%2Fvi%2FEdeVaT-zZt4%2Fsddefault.jpg&tmi=1&no_get_video_log=1&has_cc=True&vq=auto&fexp=913434%2C914048%2C923341%2C930008%2C945013&ttsurl=https%3A%2F%2Fwww.youtube.com%2Fapi%2Ftimedtext%3Fexpire%3D1401921289%26signature%3D892C9AEACE7615D8C60567501C3351A1247965C6.255B49D16DFBE373DC91D2A4A22EC995BDDB3B13%26hl%3Den_US%26caps%3Dasr%26sparams%3Dasr_langs%252Ccaps%252Cv%252Cexpire%26v%3DEdeVaT-zZt4%26key%3Dyttt1%26asr_langs%3Den%252Cde%252Cja%252Cko%252Cfr%252Cru%252Cpt%252Cnl%252Ces%252Cit&allow_embed=1&plid=AAT7BF5yEVA54xaK&advideo=1&baseUrl=https%3A%2F%2Fgoogleads.g.doubleclick.net%2Fpagead%2Fviewthroughconversion%2F962985656%2F&cc_asr=1×tamp=1401896089&muted=0&cc3_module=1&csi_page_type=embed&eventid=mTyPU7TCL9Tt8QPT0oCgBg&sw=1.0&title=Better&aid=P-i5zuzIUkE&atc=a%3D3%26b%3DTEDU2XBYZUEYIzGePSRA7Y7vLiw%26c%3D1401896089%26d%3D1%26e%3DEdeVaT-zZt4%26c3a%3D12%26hh%3DG1prbC-QGPWguCdpJZHTW7tIkYM&c=WEB&video_id=EdeVaT-zZt4&dash=1&cc_font=Arial+Unicode+MS%2C+arial%2C+verdana%2C+_sans&token=vjVQa1PpcFMaWLIXQq1BEfXIPo-j3EsHIrx2hZBi7MQ%3D&ytfocEnabled=1&ldpj=-33&loudness=-24.8090000153&rmktPingThreshold=0&enablecsi=1&account_playback_token=QUFFLUhqbXNudEU1NFJjbHBqTkFSOVNGNTF4LWdLYjRoZ3xBQ3Jtc0trRUZmYmxBRUV6dWhoN08wb2c2WHZCVUszWU5VUEYyaWEwMk1meDZ2Q3JPdkFMdVk2bHhmcllfTEpXNlNyNzIxUEJFamttaDA3b20wMk1rVWpFcmd0NldJRzlXVk45NFh6N3BiS3J4TzBwX1ZFSlFObw%3D%3D&adaptive_fmts=type%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.640028%2522%26index%3D711-1006%26size%3D1920x1080%26bitrate%3D4165866%26init%3D0-710%26itag%3D137%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D41E041553BE0ABFE14BEC6F9F9F0C0110ECBE0AB.6969FF3328F84CBA644C07A3CDB2A31760BC4A2F%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D43224356%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1400268567848754%2526ms%253Dau%2526itag%253D137%2526source%253Dyoutube%2526dur%253D108.985%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fwebm%253B%2Bcodecs%253D%2522vp9%2522%26index%3D235-606%26size%3D1920x1080%26bitrate%3D4818757%26init%3D0-234%26itag%3D248%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D3D444F08303935CDAFBC2250CFFC813E104C6FC7.D4297E82AF4487DB353BA9105AC957E4C0F27992%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D27643910%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1398162556989387%2526ms%253Dau%2526itag%253D248%2526source%253Dyoutube%2526dur%253D108.984%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.4d401f%2522%26index%3D709-1004%26size%3D1280x720%26bitrate%3D2260798%26init%3D0-708%26itag%3D136%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D3B62657AABF88F4D67CBD6A86FCD58B479001A5F.D022ECEF21349A9B703233D86A4AA95C3C83DBD3%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D21968268%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1400268511015852%2526ms%253Dau%2526itag%253D136%2526source%253Dyoutube%2526dur%253D108.985%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fwebm%253B%2Bcodecs%253D%2522vp9%2522%26index%3D235-598%26size%3D1280x720%26bitrate%3D1936840%26init%3D0-234%26itag%3D247%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D33E2DA85D1D92E88CB87A1B4B065B6D1EA06EBF2.6C46005B2D2E08D7BE376BD09D49F5FBC131DA95%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D14678081%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1398162524148726%2526ms%253Dau%2526itag%253D247%2526source%253Dyoutube%2526dur%253D108.984%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.4d401e%2522%26index%3D709-1004%26size%3D854x480%26bitrate%3D1128730%26init%3D0-708%26itag%3D135%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253DBFC830D8512473CF4FEB85C91AC7C6C13098644C.355EFDC80ED1C4DE3FF547BA6FF0D2A53E166469%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D11388051%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1400268470120812%2526ms%253Dau%2526itag%253D135%2526source%253Dyoutube%2526dur%253D108.985%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fwebm%253B%2Bcodecs%253D%2522vp9%2522%26index%3D235-598%26size%3D854x480%26bitrate%3D793723%26init%3D0-234%26itag%3D244%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253DD7EC369A218BDD0A898E00C9101DAEEFEC5037D3.1D9D435063AC22059627AAD729F1E8E994E68598%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D7212629%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1398162540058884%2526ms%253Dau%2526itag%253D244%2526source%253Dyoutube%2526dur%253D108.984%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.4d401e%2522%26index%3D709-1004%26size%3D640x360%26bitrate%3D626720%26init%3D0-708%26itag%3D134%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253DBA1974A2D9934A08435A0D41AE0E742D07271FC8.CFAE12AD05C91AFC573FDA445C83C2D8A4C7F077%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D5919157%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1400268467820658%2526ms%253Dau%2526itag%253D134%2526source%253Dyoutube%2526dur%253D108.985%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fwebm%253B%2Bcodecs%253D%2522vp9%2522%26index%3D235-598%26size%3D640x360%26bitrate%3D450813%26init%3D0-234%26itag%3D243%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D8F659F17B369B6E689A3D8764D0E544B50E229BE.43FE3A74F8DA5EEAC747AA6B6E8C9CDC6355D0B1%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D3842372%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1398162468804739%2526ms%253Dau%2526itag%253D243%2526source%253Dyoutube%2526dur%253D108.984%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.4d4015%2522%26index%3D673-968%26size%3D426x240%26bitrate%3D262729%26init%3D0-672%26itag%3D133%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D2C8113EFC02FAA1859628032A12BA93A219B8149.A525B2E02C6309F9DC0757331F36EBC7A42D8871%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D3281716%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1400268453506629%2526ms%253Dau%2526itag%253D133%2526source%253Dyoutube%2526dur%253D108.985%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fwebm%253B%2Bcodecs%253D%2522vp9%2522%26index%3D234-597%26size%3D426x240%26bitrate%3D208372%26init%3D0-233%26itag%3D242%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D49DFA2D0F1091AB851833D25CF366681E73A8BB9.55CBBEBB581940EC03719877F0A66931FAFD1965%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D2017856%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1398162453991137%2526ms%253Dau%2526itag%253D242%2526source%253Dyoutube%2526dur%253D108.984%2526ip%253D213.173.175.4%2Ctype%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.4d400c%2522%26index%3D671-966%26size%3D256x144%26bitrate%3D111197%26init%3D0-670%26itag%3D160%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253DC3C0E47A6CD9A1EA08098AB901ED7DA4B8291C36.0DF0F3F323D5C6ED6F3BA5B0CED79D62C42A7A19%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D1443254%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1400268456713828%2526ms%253Dau%2526itag%253D160%2526source%253Dyoutube%2526dur%253D108.985%2526ip%253D213.173.175.4%2Ctype%3Daudio%252Fmp4%253B%2Bcodecs%253D%2522mp4a.40.2%2522%26index%3D592-755%26bitrate%3D129243%26init%3D0-591%26itag%3D140%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253DAC2DB0031F986D4B9F1C6733682CCC63DFC3F146.5F9DFEFED0C873747B2EA6AD0BF1B12B8EF1C89A%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D1751907%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1400268455514962%2526ms%253Dau%2526itag%253D140%2526source%253Dyoutube%2526dur%253D109.086%2526ip%253D213.173.175.4%2Ctype%3Daudio%252Fwebm%253B%2Bcodecs%253D%2522vorbis%2522%26index%3D4452-4635%26bitrate%3D122529%26init%3D0-4451%26itag%3D171%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fgir%253Dyes%2526signature%253D9F58EBB6A43D68314AF30D369265256BEDDF44D3.762346C40B06A809CA3D68117B715965C865DC4B%2526mws%253Dyes%2526ipbits%253D0%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526clen%253D1545559%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLJmhEHBp5Eg%2526sparams%253Dclen%25252Cdur%25252Cgir%25252Cid%25252Cip%25252Cipbits%25252Citag%25252Clmt%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526lmt%253D1398162428406353%2526ms%253Dau%2526itag%253D171%2526source%253Dyoutube%2526dur%253D109.022%2526ip%253D213.173.175.4&view_count=992018&thumbnail_url=https%3A%2F%2Fi1.ytimg.com%2Fvi%2FEdeVaT-zZt4%2Fdefault.jpg&ptk=Apple%252Bvid&track_embed=1&ptchn=E_M8A5yxnLfW0KghEeajjw&use_cipher_signature=False&watermark=%2Chttps%3A%2F%2Fs.ytimg.com%2Fyts%2Fimg%2Fwatermark%2Fyoutube_watermark-vflHX6b6E.png%2Chttps%3A%2F%2Fs.ytimg.com%2Fyts%2Fimg%2Fwatermark%2Fyoutube_hd_watermark-vflAzLcD6.png&dashmpd=http%3A%2F%2Fmanifest.googlevideo.com%2Fapi%2Fmanifest%2Fdash%2Fsignature%2FD1585546B1A674FF26993C3C55FC8149E7700559.3B4F7C8854695531EA7BE70341E84C045EC7E024%2Fmws%2Fyes%2Fip%2F213.173.175.4%2Fmt%2F1401896000%2Fmv%2Fm%2Ffexp%2F913434%252C914048%252C923341%252C930008%252C945013%2Fsver%2F3%2Fas%2Ffmp4_audio_clear%252Cwebm_audio_clear%252Cfmp4_sd_hd_clear%252Cwebm_sd_hd_clear%2Fplayback_host%2Fr1---sn-2apm-f5fee.googlevideo.com%2Fid%2Fo-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2Fkey%2Fyt5%2Fupn%2FmO3HTwBNImE%2Fsparams%2Fas%252Cid%252Cip%252Cipbits%252Citag%252Cplayback_host%252Csource%252Cexpire%2Fexpire%2F1401920121%2Fms%2Fau%2Fitag%2F0%2Fsource%2Fyoutube%2Fipbits%2F0&oid=ffsQQyXI443h2PgMzMjp-g&length_seconds=110&author=Apple&iurl=https%3A%2F%2Fi1.ytimg.com%2Fvi%2FEdeVaT-zZt4%2Fhqdefault.jpg&idpj=0&video_verticals=%5B3%2C+358%2C+1049%2C+5%5D&ftoken=QUFFLUhqbW8xWFhlTGU5X2FTUVZOT3BfaC1wWVB2MjVTQXxBQ3Jtc0ttejRsRXo2QXZSQlVwc09FRmVRa3J1YnlHdGpYMUdsOGp6aDMydmx3emhoWUJseE43T3VNYVZneFpUWXJaWENKdmFJX0I3S3ZwZTZFUTRBX05haDRoYmFFVmVZYXE2TGN3Z0JGclFXZmlDR2J3TjFBMA%3D%3D&cc_module=https%3A%2F%2Fs.ytimg.com%2Fyts%2Fswfbin%2Fplayer-vfla4WkPh%2Fsubtitle_module.swf&uid=E_M8A5yxnLfW0KghEeajjw&url_encoded_fmt_stream_map=type%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.64001F%252C%2Bmp4a.40.2%2522%26quality%3Dhd720%26itag%3D22%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fsignature%253D7AC9D1F4471634B813DC9E99DC9E447E7183931A.ABDF7AED4B0DA87FF63E89A6DFEF36ECC7FA9906%2526mws%253Dyes%2526ip%253D213.173.175.4%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLxQXz5epmK0%2526sparams%253Did%25252Cip%25252Cipbits%25252Citag%25252Cratebypass%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526ms%253Dau%2526itag%253D22%2526ratebypass%253Dyes%2526source%253Dyoutube%2526ipbits%253D0%26fallback_host%3Dtc.v10.cache5.googlevideo.com%2Ctype%3Dvideo%252Fwebm%253B%2Bcodecs%253D%2522vp8.0%252C%2Bvorbis%2522%26quality%3Dmedium%26itag%3D43%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fsignature%253D56E345FF5154F435486723E337F3FC3E5147EE86.5F74E5518292A34E94400DF1DE33611BAD96275F%2526mws%253Dyes%2526ip%253D213.173.175.4%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLxQXz5epmK0%2526sparams%253Did%25252Cip%25252Cipbits%25252Citag%25252Cratebypass%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526ms%253Dau%2526itag%253D43%2526ratebypass%253Dyes%2526source%253Dyoutube%2526ipbits%253D0%26fallback_host%3Dtc.v14.cache7.googlevideo.com%2Ctype%3Dvideo%252Fmp4%253B%2Bcodecs%253D%2522avc1.42001E%252C%2Bmp4a.40.2%2522%26quality%3Dmedium%26itag%3D18%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fsignature%253D8E61FE2B7D42F278FD002F27082F47041799A696.CF5B89D67D6E111177860E34787F2627E3483A1B%2526mws%253Dyes%2526ip%253D213.173.175.4%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLxQXz5epmK0%2526sparams%253Did%25252Cip%25252Cipbits%25252Citag%25252Cratebypass%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526ms%253Dau%2526itag%253D18%2526ratebypass%253Dyes%2526source%253Dyoutube%2526ipbits%253D0%26fallback_host%3Dtc.v6.cache6.googlevideo.com%2Ctype%3Dvideo%252Fx-flv%26quality%3Dsmall%26itag%3D5%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fsignature%253D76FF709A1759E58BD7D64758B10CE2D00D90D8D4.B6C45C75E9C5684BDC5D8CE7F0EB53DFC1F17C27%2526mws%253Dyes%2526ip%253D213.173.175.4%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLxQXz5epmK0%2526sparams%253Did%25252Cip%25252Cipbits%25252Citag%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526ms%253Dau%2526itag%253D5%2526source%253Dyoutube%2526ipbits%253D0%26fallback_host%3Dtc.v21.cache2.googlevideo.com%2Ctype%3Dvideo%252F3gpp%253B%2Bcodecs%253D%2522mp4v.20.3%252C%2Bmp4a.40.2%2522%26quality%3Dsmall%26itag%3D36%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fsignature%253D245AC22E850FD13978E752283E770636CF81A627.8934B0F7FB48A3882333A77F6F57F1D9E5EAD58C%2526mws%253Dyes%2526ip%253D213.173.175.4%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLxQXz5epmK0%2526sparams%253Did%25252Cip%25252Cipbits%25252Citag%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526ms%253Dau%2526itag%253D36%2526source%253Dyoutube%2526ipbits%253D0%26fallback_host%3Dtc.v20.cache2.googlevideo.com%2Ctype%3Dvideo%252F3gpp%253B%2Bcodecs%253D%2522mp4v.20.3%252C%2Bmp4a.40.2%2522%26quality%3Dsmall%26itag%3D17%26url%3Dhttp%253A%252F%252Fr1---sn-2apm-f5fee.googlevideo.com%252Fvideoplayback%253Fsignature%253D24F2081927A21095273A7273EFE759569D91999F.F9D85B8DC6E5A3C445FF360A4CC0BB74836E79D2%2526mws%253Dyes%2526ip%253D213.173.175.4%2526mv%253Dm%2526fexp%253D913434%25252C914048%25252C923341%25252C930008%25252C945013%2526sver%253D3%2526mt%253D1401896000%2526id%253Do-AIIj2ftNu_blBXWHNVYLujju6Tp6MqJ-kJywM9sOtJ55%2526key%253Dyt5%2526upn%253DLxQXz5epmK0%2526sparams%253Did%25252Cip%25252Cipbits%25252Citag%25252Csource%25252Cupn%25252Cexpire%2526expire%253D1401920121%2526ms%253Dau%2526itag%253D17%2526source%253Dyoutube%2526ipbits%253D0%26fallback_host%3Dtc.v6.cache7.googlevideo.com&status=ok&pltype=content", + "headers" : { + "X-Content-Type-Options" : "nosniff", + "Content-Type" : "application\/x-www-form-urlencoded", + "Server" : "gwiseguy\/2.0", + "Transfer-Encoding" : "Identity", + "Date" : "Wed, 04 Jun 2014 15:34:49 GMT", + "X-Frame-Options" : "SAMEORIGIN", + "X-XSS-Protection" : "1; mode=block; report=https:\/\/www.google.com\/appserve\/security-bugs\/log\/youtube", + "Alternate-Protocol" : "443:quic", + "Expires" : "Tue, 27 Apr 1971 19:44:06 EST", + "Cache-Control" : "no-store" + }, + "method" : "GET", + "status" : 200, + "uri" : "https:\/\/www.youtube.com\/get_video_info?el=embedded&hl=en&ps=default&video_id=EdeVaT-zZt4" + } +] \ No newline at end of file diff --git a/XCDYouTubeKit Tests/XCDYouTubeVideoPlayerViewControllerTestCase.m b/XCDYouTubeKit Tests/XCDYouTubeVideoPlayerViewControllerTestCase.m index 4643b163b..ccd7c230c 100644 --- a/XCDYouTubeKit Tests/XCDYouTubeVideoPlayerViewControllerTestCase.m +++ b/XCDYouTubeKit Tests/XCDYouTubeVideoPlayerViewControllerTestCase.m @@ -28,6 +28,20 @@ - (void) testVideoNotification XCTAssertTrue([monitor waitWithTimeout:10]); } +- (void) testAsynchronousVideoNotification +{ + TRVSMonitor *monitor = [TRVSMonitor monitor]; + XCDYouTubeVideoPlayerViewController *videoPlayerViewController = [XCDYouTubeVideoPlayerViewController new]; + [[NSOperationQueue mainQueue] addOperationWithBlock:^{ + videoPlayerViewController.videoIdentifier = @"EdeVaT-zZt4"; + }]; + [[NSNotificationCenter defaultCenter] addObserverForName:XCDYouTubeVideoPlayerViewControllerDidReceiveVideoNotification object:videoPlayerViewController queue:nil usingBlock:^(NSNotification *notification) { + XCTAssertNotNil(notification.userInfo[XCDYouTubeVideoUserInfoKey]); + [monitor signal]; + }]; + XCTAssertTrue([monitor waitWithTimeout:10]); +} + - (void) testNoStreamAvailableErrorNotification { TRVSMonitor *monitor = [TRVSMonitor monitor]; From 889b01423cbf90beeecdeef17ca76f10615829b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81dric=20Luthi?= Date: Wed, 4 Jun 2014 23:14:37 +0200 Subject: [PATCH 4/4] Handle all ways of initializing XCDYouTubeVideoPlayerViewController --- .../XCDYouTubeVideoPlayerViewController.m | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m index 0a62f1cac..c20b91e04 100644 --- a/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m +++ b/XCDYouTubeKit/XCDYouTubeVideoPlayerViewController.m @@ -26,9 +26,27 @@ @interface XCDYouTubeVideoPlayerViewController () @implementation XCDYouTubeVideoPlayerViewController +/* + * MPMoviePlayerViewController on iOS 7 and earlier + * - (id) init + * `-- [super init] + * + * - (id) initWithContentURL:(NSURL *)contentURL + * |-- [self init] + * `-- [self.moviePlayer setContentURL:contentURL] + * + * MPMoviePlayerViewController on iOS 8 and later + * - (id) init + * `-- [self initWithContentURL:nil] + * + * - (id) initWithContentURL:(NSURL *)contentURL + * |-- [super init] + * `-- [self.moviePlayer setContentURL:contentURL] + */ + - (instancetype) init { - return [self initWithVideoIdentifier:nil]; + return [[[UIDevice currentDevice] systemVersion] integerValue] >= 8 ? [self initWithVideoIdentifier:nil] : [super init]; } - (instancetype) initWithContentURL:(NSURL *)contentURL