Skip to content

Commit 85ec4f6

Browse files
minggoMike Chen
minggo
authored and
Mike Chen
committed
use AVPlayerController instead (cocos2d#20085)
1 parent 41a766b commit 85ec4f6

File tree

6 files changed

+163
-196
lines changed

6 files changed

+163
-196
lines changed

‎build/cocos2d_tests.xcodeproj/project.pbxproj

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@
6767
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
6868
157B08EC1A90864100B7BEA4 /* Particle3D in Resources */ = {isa = PBXBuildFile; fileRef = B63993301A49359F00B07923 /* Particle3D */; };
6969
157B08ED1A90865600B7BEA4 /* Particle3D in Resources */ = {isa = PBXBuildFile; fileRef = B63993301A49359F00B07923 /* Particle3D */; };
70-
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
7170
15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
72-
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
7371
15B0870D195AD52000D6F62B /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
7472
15B13E5219F0FD4D008A1ADC /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = 15B3709219EE5D1000ABE682 /* Manifests */; };
7573
15B3709319EE5D1000ABE682 /* Manifests in Resources */ = {isa = PBXBuildFile; fileRef = 15B3709219EE5D1000ABE682 /* Manifests */; };
@@ -134,7 +132,6 @@
134132
185663621B4155D3009EF2AE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; };
135133
185663A51B4155DD009EF2AE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
136134
185663A71B4155DD009EF2AE /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
137-
185663A81B4155DD009EF2AE /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
138135
185663A91B4155DD009EF2AE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3AF18CDA06D0087CE3A /* libz.dylib */; };
139136
185663AA1B4155DD009EF2AE /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
140137
185663AB1B4155DD009EF2AE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A818CD9F130087CE3A /* AudioToolbox.framework */; };
@@ -693,7 +690,6 @@
693690
3E9E75D0199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; };
694691
3E9E75D1199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; };
695692
3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
696-
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
697693
3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */; };
698694
400308D820060F12000DFE6D /* strings in Resources */ = {isa = PBXBuildFile; fileRef = 400308D720060F12000DFE6D /* strings */; };
699695
406023E5208DDFF5008F1C02 /* strings in Resources */ = {isa = PBXBuildFile; fileRef = 400308D720060F12000DFE6D /* strings */; };
@@ -703,13 +699,14 @@
703699
463D7E7D1D227C6A00EA6BD1 /* Bug-14327.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463D7E781D227C3800EA6BD1 /* Bug-14327.cpp */; };
704700
463D7E7E1D227CA400EA6BD1 /* Bug-15776.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463D7E7A1D227C3800EA6BD1 /* Bug-15776.cpp */; };
705701
463D7E7F1D227CAB00EA6BD1 /* Bug-15776.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463D7E7A1D227C3800EA6BD1 /* Bug-15776.cpp */; };
706-
467AF5DF231FA82500770112 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5DE231FA82500770112 /* WebKit.framework */; };
707-
467AF5E0231FA84F00770112 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5DE231FA82500770112 /* WebKit.framework */; };
708-
467AF5E1231FA85D00770112 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5DE231FA82500770112 /* WebKit.framework */; };
709-
467AF5E2231FA87100770112 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5DE231FA82500770112 /* WebKit.framework */; };
710-
467AF5E3231FA88100770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
711-
467AF5E4231FA88700770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
712-
467AF5E5231FA88D00770112 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5DE231FA82500770112 /* WebKit.framework */; };
702+
467AF5A4231E004C00770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
703+
467AF5A6231E079F00770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
704+
467AF5A9231E4B2500770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
705+
467AF5AA231E4BA600770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
706+
467AF5AB231E4BE500770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
707+
467AF5AC231E4BED00770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
708+
467AF5AD231E4C4300770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
709+
467AF5AE231E4C4900770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
713710
4B5C5BA81CA1147300D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; };
714711
4B5C5BA91CA1147F00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; };
715712
4B5C5BAB1CA1149900D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
@@ -718,7 +715,6 @@
718715
4B5C5BAE1CA114B500D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
719716
4B5C5BAF1CA114BB00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
720717
4B5C5BB01CA114C100D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
721-
4B5C5BB11CA114C700D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
722718
4B5C5BB21CA114CC00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
723719
4B5C5BB31CA114D400D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
724720
4B5C5BB51CA114DB00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BB41CA114DB00D55A14 /* Security.framework */; };
@@ -1134,7 +1130,6 @@
11341130
527B1F3C19EFACBB000A1F82 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F3A19EFACBB000A1F82 /* [email protected] */; };
11351131
527B1F3D19EFACBB000A1F82 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F3B19EFACBB000A1F82 /* [email protected] */; };
11361132
52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
1137-
52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
11381133
53367D561DC22891005862DE /* WindowTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53367D541DC22891005862DE /* WindowTest.cpp */; };
11391134
53E6A008218FA06E002BE515 /* InputTest in Resources */ = {isa = PBXBuildFile; fileRef = 53E6A007218FA06D002BE515 /* InputTest */; };
11401135
53E6A009218FA06E002BE515 /* InputTest in Resources */ = {isa = PBXBuildFile; fileRef = 53E6A007218FA06D002BE515 /* InputTest */; };
@@ -2247,7 +2242,9 @@
22472242
463D7E791D227C3800EA6BD1 /* Bug-14327.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-14327.h"; sourceTree = "<group>"; };
22482243
463D7E7A1D227C3800EA6BD1 /* Bug-15776.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-15776.cpp"; sourceTree = "<group>"; };
22492244
463D7E7B1D227C3800EA6BD1 /* Bug-15776.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-15776.h"; sourceTree = "<group>"; };
2250-
467AF5DE231FA82500770112 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; };
2245+
467AF5A3231E004C00770112 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/AVKit.framework; sourceTree = DEVELOPER_DIR; };
2246+
467AF5A5231E079F00770112 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/CoreMedia.framework; sourceTree = DEVELOPER_DIR; };
2247+
467AF5A7231E4AA500770112 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
22512248
46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
22522249
4B5C5BAA1CA1149900D55A14 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
22532250
4B5C5BB41CA114DB00D55A14 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
@@ -2500,15 +2497,14 @@
25002497
isa = PBXFrameworksBuildPhase;
25012498
buildActionMask = 2147483647;
25022499
files = (
2503-
467AF5E2231FA87100770112 /* WebKit.framework in Frameworks */,
2500+
467AF5AE231E4C4900770112 /* CoreMedia.framework in Frameworks */,
2501+
467AF5AD231E4C4300770112 /* AVKit.framework in Frameworks */,
25042502
C8DE9E491F0EAECD00B48C6B /* GameController.framework in Frameworks */,
25052503
294D7D8F1D0E50B2002CE7B7 /* CoreText.framework in Frameworks */,
2506-
4B5C5BB11CA114C700D55A14 /* Security.framework in Frameworks */,
25072504
18FC4D5F1B4257CD00B76F95 /* libsqlite3.dylib in Frameworks */,
25082505
185663F01B41569E009EF2AE /* libjscocos2d iOS.a in Frameworks */,
25092506
185663A51B4155DD009EF2AE /* Security.framework in Frameworks */,
25102507
185663A71B4155DD009EF2AE /* libcocos2d iOS.a in Frameworks */,
2511-
185663A81B4155DD009EF2AE /* MediaPlayer.framework in Frameworks */,
25122508
185663A91B4155DD009EF2AE /* libz.dylib in Frameworks */,
25132509
ED545A791B68A1B900C3958E /* libiconv.dylib in Frameworks */,
25142510
185663AA1B4155DD009EF2AE /* CoreMotion.framework in Frameworks */,
@@ -2590,13 +2586,13 @@
25902586
isa = PBXFrameworksBuildPhase;
25912587
buildActionMask = 2147483647;
25922588
files = (
2593-
467AF5E1231FA85D00770112 /* WebKit.framework in Frameworks */,
2589+
467AF5AC231E4BED00770112 /* CoreMedia.framework in Frameworks */,
2590+
467AF5AB231E4BE500770112 /* AVKit.framework in Frameworks */,
25942591
294D7D8C1D0E50A0002CE7B7 /* CoreText.framework in Frameworks */,
25952592
4B5C5BAE1CA114B500D55A14 /* Security.framework in Frameworks */,
25962593
ED545A761B68A1B600C3958E /* libiconv.dylib in Frameworks */,
25972594
15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */,
25982595
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */,
2599-
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */,
26002596
1A0EE42C18CDF799004CD58F /* libz.dylib in Frameworks */,
26012597
1A0EE42D18CDF799004CD58F /* CoreMotion.framework in Frameworks */,
26022598
1A0EE42E18CDF799004CD58F /* AudioToolbox.framework in Frameworks */,
@@ -2634,13 +2630,12 @@
26342630
isa = PBXFrameworksBuildPhase;
26352631
buildActionMask = 2147483647;
26362632
files = (
2637-
467AF5E0231FA84F00770112 /* WebKit.framework in Frameworks */,
2633+
467AF5AA231E4BA600770112 /* AVKit.framework in Frameworks */,
2634+
467AF5A9231E4B2500770112 /* CoreMedia.framework in Frameworks */,
26382635
294D7D8B1D0E509A002CE7B7 /* CoreText.framework in Frameworks */,
26392636
4B5C5BAD1CA114AC00D55A14 /* Security.framework in Frameworks */,
2640-
52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */,
26412637
15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */,
26422638
15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */,
2643-
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */,
26442639
1ABCA3B018CDA06D0087CE3A /* libz.dylib in Frameworks */,
26452640
1ABCA3AA18CD9F1A0087CE3A /* CoreMotion.framework in Frameworks */,
26462641
1ABCA3A918CD9F130087CE3A /* AudioToolbox.framework in Frameworks */,
@@ -2858,12 +2853,12 @@
28582853
isa = PBXFrameworksBuildPhase;
28592854
buildActionMask = 2147483647;
28602855
files = (
2861-
467AF5DF231FA82500770112 /* WebKit.framework in Frameworks */,
2856+
467AF5A6231E079F00770112 /* CoreMedia.framework in Frameworks */,
2857+
467AF5A4231E004C00770112 /* AVKit.framework in Frameworks */,
28622858
29DC5A201CFFE6E100CF2930 /* CoreText.framework in Frameworks */,
28632859
4B5C5BAB1CA1149900D55A14 /* Security.framework in Frameworks */,
28642860
ED545A731B68A1AC00C3958E /* libiconv.dylib in Frameworks */,
28652861
52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */,
2866-
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */,
28672862
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */,
28682863
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */,
28692864
A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */,
@@ -4378,7 +4373,9 @@
43784373
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
43794374
isa = PBXGroup;
43804375
children = (
4381-
467AF5DE231FA82500770112 /* WebKit.framework */,
4376+
467AF5A7231E4AA500770112 /* UIKit.framework */,
4377+
467AF5A5231E079F00770112 /* CoreMedia.framework */,
4378+
467AF5A3231E004C00770112 /* AVKit.framework */,
43824379
C8DE9E481F0EAECD00B48C6B /* GameController.framework */,
43834380
50FC3FA01D74C15B001C936A /* GameController.framework */,
43844381
29DC5A1E1CFFE5E700CF2930 /* CoreText.framework */,
@@ -7683,6 +7680,7 @@
76837680
buildSettings = {
76847681
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-lua-tests";
76857682
CODE_SIGN_IDENTITY = "iPhone Developer";
7683+
DEVELOPMENT_TEAM = "";
76867684
ENABLE_BITCODE = NO;
76877685
GCC_PREPROCESSOR_DEFINITIONS = (
76887686
"$(inherited)",
@@ -7713,6 +7711,7 @@
77137711
buildSettings = {
77147712
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-lua-tests";
77157713
CODE_SIGN_IDENTITY = "iPhone Developer";
7714+
DEVELOPMENT_TEAM = "";
77167715
ENABLE_BITCODE = NO;
77177716
GCC_PREPROCESSOR_DEFINITIONS = (
77187717
"$(inherited)",

‎cmake/Modules/CocosConfigDepend.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ macro(cocos2dx_depend)
6565
find_library(UIKIT_LIBRARY UIKit)
6666
find_library(OPENGLES_LIBRARY OpenGLES)
6767
find_library(CORE_MOTION_LIBRARY CoreMotion)
68-
find_library(MEDIA_PLAYER_LIBRARY MediaPlayer)
68+
find_library(AVKIT_LIBRARY AVKit)
69+
find_library(CORE_MEDIA_LIBRARY CoreMedia)
6970
find_library(CORE_TEXT_LIBRARY CoreText)
7071
find_library(SECURITY_LIBRARY Security)
7172
find_library(CORE_GRAPHICS_LIBRARY CoreGraphics)
@@ -76,7 +77,8 @@ macro(cocos2dx_depend)
7677
${UIKIT_LIBRARY}
7778
${OPENGLES_LIBRARY}
7879
${CORE_MOTION_LIBRARY}
79-
${MEDIA_PLAYER_LIBRARY}
80+
${AVKIT_LIBRARY}
81+
${CORE_MEDIA_LIBRARY}
8082
${CORE_TEXT_LIBRARY}
8183
${SECURITY_LIBRARY}
8284
${CORE_GRAPHICS_LIBRARY}

0 commit comments

Comments
 (0)