Skip to content

Commit a2b2b36

Browse files
minggominggo
authored
use AVPlayerController instead (#20085)
1 parent 96eb639 commit a2b2b36

File tree

6 files changed

+163
-164
lines changed

6 files changed

+163
-164
lines changed

‎build/cocos2d_tests.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 12 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 */; };
@@ -688,7 +685,6 @@
688685
3E9E75D0199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; };
689686
3E9E75D1199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; };
690687
3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
691-
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
692688
3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */; };
693689
400308D820060F12000DFE6D /* strings in Resources */ = {isa = PBXBuildFile; fileRef = 400308D720060F12000DFE6D /* strings */; };
694690
406023E5208DDFF5008F1C02 /* strings in Resources */ = {isa = PBXBuildFile; fileRef = 400308D720060F12000DFE6D /* strings */; };
@@ -698,6 +694,14 @@
698694
463D7E7D1D227C6A00EA6BD1 /* Bug-14327.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463D7E781D227C3800EA6BD1 /* Bug-14327.cpp */; };
699695
463D7E7E1D227CA400EA6BD1 /* Bug-15776.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463D7E7A1D227C3800EA6BD1 /* Bug-15776.cpp */; };
700696
463D7E7F1D227CAB00EA6BD1 /* Bug-15776.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463D7E7A1D227C3800EA6BD1 /* Bug-15776.cpp */; };
697+
467AF5A4231E004C00770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
698+
467AF5A6231E079F00770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
699+
467AF5A9231E4B2500770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
700+
467AF5AA231E4BA600770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
701+
467AF5AB231E4BE500770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
702+
467AF5AC231E4BED00770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
703+
467AF5AD231E4C4300770112 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A3231E004C00770112 /* AVKit.framework */; };
704+
467AF5AE231E4C4900770112 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 467AF5A5231E079F00770112 /* CoreMedia.framework */; };
701705
4B5C5BA81CA1147300D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; };
702706
4B5C5BA91CA1147F00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; };
703707
4B5C5BAB1CA1149900D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
@@ -706,7 +710,6 @@
706710
4B5C5BAE1CA114B500D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
707711
4B5C5BAF1CA114BB00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
708712
4B5C5BB01CA114C100D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
709-
4B5C5BB11CA114C700D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
710713
4B5C5BB21CA114CC00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
711714
4B5C5BB31CA114D400D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BAA1CA1149900D55A14 /* Security.framework */; };
712715
4B5C5BB51CA114DB00D55A14 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B5C5BB41CA114DB00D55A14 /* Security.framework */; };
@@ -1120,7 +1123,6 @@
11201123
527B1F3C19EFACBB000A1F82 /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F3A19EFACBB000A1F82 /* Default-667h@2x.png */; };
11211124
527B1F3D19EFACBB000A1F82 /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F3B19EFACBB000A1F82 /* Default-736h@3x.png */; };
11221125
52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
1123-
52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B47A331A534B2B004E4C60 /* Security.framework */; };
11241126
53367D561DC22891005862DE /* WindowTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53367D541DC22891005862DE /* WindowTest.cpp */; };
11251127
53E6A008218FA06E002BE515 /* InputTest in Resources */ = {isa = PBXBuildFile; fileRef = 53E6A007218FA06D002BE515 /* InputTest */; };
11261128
53E6A009218FA06E002BE515 /* InputTest in Resources */ = {isa = PBXBuildFile; fileRef = 53E6A007218FA06D002BE515 /* InputTest */; };
@@ -2228,6 +2230,9 @@
22282230
463D7E791D227C3800EA6BD1 /* Bug-14327.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-14327.h"; sourceTree = "<group>"; };
22292231
463D7E7A1D227C3800EA6BD1 /* Bug-15776.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-15776.cpp"; sourceTree = "<group>"; };
22302232
463D7E7B1D227C3800EA6BD1 /* Bug-15776.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-15776.h"; sourceTree = "<group>"; };
2233+
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; };
2234+
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; };
2235+
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; };
22312236
46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
22322237
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; };
22332238
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; };
@@ -2478,14 +2483,14 @@
24782483
isa = PBXFrameworksBuildPhase;
24792484
buildActionMask = 2147483647;
24802485
files = (
2486+
467AF5AE231E4C4900770112 /* CoreMedia.framework in Frameworks */,
2487+
467AF5AD231E4C4300770112 /* AVKit.framework in Frameworks */,
24812488
C8DE9E491F0EAECD00B48C6B /* GameController.framework in Frameworks */,
24822489
294D7D8F1D0E50B2002CE7B7 /* CoreText.framework in Frameworks */,
2483-
4B5C5BB11CA114C700D55A14 /* Security.framework in Frameworks */,
24842490
18FC4D5F1B4257CD00B76F95 /* libsqlite3.dylib in Frameworks */,
24852491
185663F01B41569E009EF2AE /* libjscocos2d iOS.a in Frameworks */,
24862492
185663A51B4155DD009EF2AE /* Security.framework in Frameworks */,
24872493
185663A71B4155DD009EF2AE /* libcocos2d iOS.a in Frameworks */,
2488-
185663A81B4155DD009EF2AE /* MediaPlayer.framework in Frameworks */,
24892494
185663A91B4155DD009EF2AE /* libz.dylib in Frameworks */,
24902495
ED545A791B68A1B900C3958E /* libiconv.dylib in Frameworks */,
24912496
185663AA1B4155DD009EF2AE /* CoreMotion.framework in Frameworks */,
@@ -2564,12 +2569,13 @@
25642569
isa = PBXFrameworksBuildPhase;
25652570
buildActionMask = 2147483647;
25662571
files = (
2572+
467AF5AC231E4BED00770112 /* CoreMedia.framework in Frameworks */,
2573+
467AF5AB231E4BE500770112 /* AVKit.framework in Frameworks */,
25672574
294D7D8C1D0E50A0002CE7B7 /* CoreText.framework in Frameworks */,
25682575
4B5C5BAE1CA114B500D55A14 /* Security.framework in Frameworks */,
25692576
ED545A761B68A1B600C3958E /* libiconv.dylib in Frameworks */,
25702577
15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */,
25712578
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */,
2572-
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */,
25732579
1A0EE42C18CDF799004CD58F /* libz.dylib in Frameworks */,
25742580
1A0EE42D18CDF799004CD58F /* CoreMotion.framework in Frameworks */,
25752581
1A0EE42E18CDF799004CD58F /* AudioToolbox.framework in Frameworks */,
@@ -2607,12 +2613,12 @@
26072613
isa = PBXFrameworksBuildPhase;
26082614
buildActionMask = 2147483647;
26092615
files = (
2616+
467AF5AA231E4BA600770112 /* AVKit.framework in Frameworks */,
2617+
467AF5A9231E4B2500770112 /* CoreMedia.framework in Frameworks */,
26102618
294D7D8B1D0E509A002CE7B7 /* CoreText.framework in Frameworks */,
26112619
4B5C5BAD1CA114AC00D55A14 /* Security.framework in Frameworks */,
2612-
52B47A351A53A43A004E4C60 /* Security.framework in Frameworks */,
26132620
15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */,
26142621
15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */,
2615-
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */,
26162622
1ABCA3B018CDA06D0087CE3A /* libz.dylib in Frameworks */,
26172623
1ABCA3AA18CD9F1A0087CE3A /* CoreMotion.framework in Frameworks */,
26182624
1ABCA3A918CD9F130087CE3A /* AudioToolbox.framework in Frameworks */,
@@ -2830,11 +2836,12 @@
28302836
isa = PBXFrameworksBuildPhase;
28312837
buildActionMask = 2147483647;
28322838
files = (
2839+
467AF5A6231E079F00770112 /* CoreMedia.framework in Frameworks */,
2840+
467AF5A4231E004C00770112 /* AVKit.framework in Frameworks */,
28332841
29DC5A201CFFE6E100CF2930 /* CoreText.framework in Frameworks */,
28342842
4B5C5BAB1CA1149900D55A14 /* Security.framework in Frameworks */,
28352843
ED545A731B68A1AC00C3958E /* libiconv.dylib in Frameworks */,
28362844
52B47A341A534B2B004E4C60 /* Security.framework in Frameworks */,
2837-
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */,
28382845
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */,
28392846
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */,
28402847
A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */,
@@ -4344,6 +4351,9 @@
43444351
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
43454352
isa = PBXGroup;
43464353
children = (
4354+
467AF5A7231E4AA500770112 /* UIKit.framework */,
4355+
467AF5A5231E079F00770112 /* CoreMedia.framework */,
4356+
467AF5A3231E004C00770112 /* AVKit.framework */,
43474357
C8DE9E481F0EAECD00B48C6B /* GameController.framework */,
43484358
50FC3FA01D74C15B001C936A /* GameController.framework */,
43494359
29DC5A1E1CFFE5E700CF2930 /* CoreText.framework */,
@@ -7583,6 +7593,7 @@
75837593
buildSettings = {
75847594
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-lua-tests";
75857595
CODE_SIGN_IDENTITY = "iPhone Developer";
7596+
DEVELOPMENT_TEAM = "";
75867597
ENABLE_BITCODE = NO;
75877598
GCC_PREPROCESSOR_DEFINITIONS = (
75887599
"$(inherited)",
@@ -7613,6 +7624,7 @@
76137624
buildSettings = {
76147625
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-lua-tests";
76157626
CODE_SIGN_IDENTITY = "iPhone Developer";
7627+
DEVELOPMENT_TEAM = "";
76167628
ENABLE_BITCODE = NO;
76177629
GCC_PREPROCESSOR_DEFINITIONS = (
76187630
"$(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)
@@ -75,7 +76,8 @@ macro(cocos2dx_depend)
7576
${UIKIT_LIBRARY}
7677
${OPENGLES_LIBRARY}
7778
${CORE_MOTION_LIBRARY}
78-
${MEDIA_PLAYER_LIBRARY}
79+
${AVKIT_LIBRARY}
80+
${CORE_MEDIA_LIBRARY}
7981
${CORE_TEXT_LIBRARY}
8082
${SECURITY_LIBRARY}
8183
${CORE_GRAPHICS_LIBRARY}

0 commit comments

Comments
 (0)