Skip to content

Commit 18cd496

Browse files
debuglydebugly
committed
Remove legacy OpenGL logic and cleanup
1 parent c9976c0 commit 18cd496

42 files changed

Lines changed: 185 additions & 6119 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
tag 1.0.6
22
--------------------------------
33
- dropped support for older OS versions, required minimum of macOS 10.14 and iOS 12
4+
- Remove legacy OpenGL logic and cleanup
45

56
tag 1.0.5
67
--------------------------------

‎FSPlayer.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ targets:
1919
- "ijkplayer/ijkavformat/ijkioandroidio.c"
2020
- "ijkplayer/android/**/*.*"
2121
- "ijksdl/android/**/*.*"
22-
- "ijksdl/ijksdl_egl.*"
23-
- "ijksdl/ijksdl_container.*"
2422
- "ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.[hc]"
2523
- "ijksdl/ios/*.*"
2624
- "wrapper/apple/*.*"
@@ -72,8 +70,6 @@ targets:
7270
- sdk: AudioUnit.framework
7371
- sdk: AudioToolbox.framework
7472
- sdk: Metal.framework
75-
- sdk: OpenGL.framework
76-
- sdk: GLKit.framework
7773
- sdk: CoreFoundation.framework
7874
- sdk: CoreVideo.framework
7975
- sdk: CoreImage.framework
@@ -129,16 +125,8 @@ targets:
129125
- "ijkplayer/ijkavformat/ijkioandroidio.c"
130126
- "ijkplayer/android/**/*.*"
131127
- "ijksdl/android/**/*.*"
132-
- "ijksdl/ijksdl_egl.*"
133-
- "ijksdl/ijksdl_container.*"
134128
- "ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.[hc]"
135129
- "ijksdl/mac/*.*"
136-
- "ijksdl/apple/ijksdl_gpu_opengl_macos.[hm]"
137-
- "ijksdl/apple/ijksdl_gpu_opengl_fbo_macos.[hm]"
138-
- "ijksdl/apple/ijksdl_gpu_opengl_renderer_macos.[hm]"
139-
- "ijksdl/apple/ijksdl_gpu_opengl_shader_compiler.[hm]"
140-
- "ijksdl/gles2/**/*.*"
141-
- "ijksdl/ijksdl_gles2.h"
142130
- "wrapper/apple/*.*"
143131
- "ijkplayer/ff_subtitle_preference.h"
144132
- path: ijkmedia/ijkplayer/ff_subtitle_preference.h
@@ -237,18 +225,11 @@ targets:
237225
- "ijkplayer/ijkversion.h"
238226
- "ijkplayer/ijkavformat/ijkioandroidio.c"
239227
- "ijkplayer/android/**/*.*"
240-
- "ijksdl/ijksdl_gles2.h"
241-
- "ijksdl/ijksdl_egl.*"
242228
- "ijksdl/ijksdl_extra_log.c"
243229
- "ijksdl/ijksdl_container.*"
244230
- "ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.[hc]"
245231
- "ijksdl/android/**/*.*"
246232
- "ijksdl/mac/*.*"
247-
- "ijksdl/apple/ijksdl_gpu_opengl_macos.[hm]"
248-
- "ijksdl/apple/ijksdl_gpu_opengl_fbo_macos.[hm]"
249-
- "ijksdl/apple/ijksdl_gpu_opengl_renderer_macos.[hm]"
250-
- "ijksdl/apple/ijksdl_gpu_opengl_shader_compiler.[hm]"
251-
- "ijksdl/gles2/**/*.*"
252233
- "wrapper/apple/*.*"
253234
- "ijkplayer/ff_subtitle_preference.h"
254235
- path: ijkmedia/ijkplayer/ff_subtitle_preference.h

‎examples/ios/FSPlayerDemo/ViewController/FSMoviePlayerViewController.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ - (void)viewDidLoad
9999
//开启硬解
100100
[options setPlayerOptionIntValue:isVideoToolBox forKey:@"videotoolbox_hwaccel"];
101101

102-
options.metalRenderer = YES;
103102
options.automaticallySetupAudioSession = YES;
104103
options.currentPlaybackTimeNotificationInterval = 0.5;
105104

@@ -189,6 +188,7 @@ - (IBAction)onClickHUD:(UIBarButtonItem *)sender
189188

190189
- (IBAction)onClickOrientation:(UIBarButtonItem *)sender
191190
{
191+
#ifdef __IPHONE_16_0
192192
if (@available(iOS 16.0, *)) {
193193
[self setNeedsUpdateOfSupportedInterfaceOrientations];
194194

@@ -203,6 +203,7 @@ - (IBAction)onClickOrientation:(UIBarButtonItem *)sender
203203

204204
}];
205205
}
206+
#endif
206207
}
207208

208209
- (IBAction)onClickPlay:(id)sender

‎examples/macos/FSPlayerMacDemo.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,10 @@
4747
DD9B13BA22C24017002D1D79 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13B922C24017002D1D79 /* libc++.tbd */; };
4848
DD9B13BC22C2401F002D1D79 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13BB22C2401F002D1D79 /* libbz2.tbd */; };
4949
DD9B13BE22C24026002D1D79 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13BD22C24026002D1D79 /* AVFoundation.framework */; };
50-
DD9B13C022C2402D002D1D79 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13BF22C2402D002D1D79 /* GLKit.framework */; };
5150
DD9B13C222C24037002D1D79 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13C122C24037002D1D79 /* CoreGraphics.framework */; };
5251
DD9B13C422C24040002D1D79 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13C322C24040002D1D79 /* CoreMedia.framework */; };
5352
DD9B13C622C24048002D1D79 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13C522C24048002D1D79 /* CoreVideo.framework */; };
5453
DD9B13C822C24053002D1D79 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13C722C24053002D1D79 /* VideoToolbox.framework */; };
55-
DD9B13CA22C24063002D1D79 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13C922C24063002D1D79 /* OpenGL.framework */; };
5654
DD9B13CC22C2406C002D1D79 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13CB22C2406C002D1D79 /* QuartzCore.framework */; };
5755
DD9B13CE22C24073002D1D79 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13CD22C24073002D1D79 /* AudioToolbox.framework */; };
5856
DD9B13D022C2407B002D1D79 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD9B13CF22C2407B002D1D79 /* AudioUnit.framework */; };
@@ -180,12 +178,10 @@
180178
DD9B13B922C24017002D1D79 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
181179
DD9B13BB22C2401F002D1D79 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
182180
DD9B13BD22C24026002D1D79 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
183-
DD9B13BF22C2402D002D1D79 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
184181
DD9B13C122C24037002D1D79 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
185182
DD9B13C322C24040002D1D79 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
186183
DD9B13C522C24048002D1D79 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
187184
DD9B13C722C24053002D1D79 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
188-
DD9B13C922C24063002D1D79 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
189185
DD9B13CB22C2406C002D1D79 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
190186
DD9B13CD22C24073002D1D79 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
191187
DD9B13CF22C2407B002D1D79 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
@@ -213,12 +209,10 @@
213209
DD9B13D022C2407B002D1D79 /* AudioUnit.framework in Frameworks */,
214210
DD9B13CE22C24073002D1D79 /* AudioToolbox.framework in Frameworks */,
215211
DD9B13CC22C2406C002D1D79 /* QuartzCore.framework in Frameworks */,
216-
DD9B13CA22C24063002D1D79 /* OpenGL.framework in Frameworks */,
217212
DD9B13C822C24053002D1D79 /* VideoToolbox.framework in Frameworks */,
218213
DD9B13C622C24048002D1D79 /* CoreVideo.framework in Frameworks */,
219214
DD9B13C422C24040002D1D79 /* CoreMedia.framework in Frameworks */,
220215
DD9B13C222C24037002D1D79 /* CoreGraphics.framework in Frameworks */,
221-
DD9B13C022C2402D002D1D79 /* GLKit.framework in Frameworks */,
222216
C969F8F22DCAF64100EB31DF /* FSPlayer-macOS.framework in Frameworks */,
223217
DD9B13BE22C24026002D1D79 /* AVFoundation.framework in Frameworks */,
224218
DD9B13BC22C2401F002D1D79 /* libbz2.tbd in Frameworks */,
@@ -383,12 +377,10 @@
383377
DD9B13CF22C2407B002D1D79 /* AudioUnit.framework */,
384378
DD9B13CD22C24073002D1D79 /* AudioToolbox.framework */,
385379
DD9B13CB22C2406C002D1D79 /* QuartzCore.framework */,
386-
DD9B13C922C24063002D1D79 /* OpenGL.framework */,
387380
DD9B13C722C24053002D1D79 /* VideoToolbox.framework */,
388381
DD9B13C522C24048002D1D79 /* CoreVideo.framework */,
389382
DD9B13C322C24040002D1D79 /* CoreMedia.framework */,
390383
DD9B13C122C24037002D1D79 /* CoreGraphics.framework */,
391-
DD9B13BF22C2402D002D1D79 /* GLKit.framework */,
392384
DD9B13BD22C24026002D1D79 /* AVFoundation.framework */,
393385
DD9B13BB22C2401F002D1D79 /* libbz2.tbd */,
394386
DD9B13B922C24017002D1D79 /* libc++.tbd */,

‎examples/macos/FSPlayerMacDemo/ViewController/MRCocoaBindingUserDefault.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ NS_ASSUME_NONNULL_BEGIN
6969

7070
+ (float)audio_delay;
7171
+ (NSString *)overlay_format;
72-
+ (BOOL)use_opengl;
7372
+ (int)snapshot_type;
7473

7574
@end

‎examples/macos/FSPlayerMacDemo/ViewController/MRCocoaBindingUserDefault.m‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,6 @@ + (NSString *)overlay_format
382382
return [self stringForKey:@"overlay_format"];
383383
}
384384

385-
+ (BOOL)use_opengl
386-
{
387-
return [self boolForKey:@"use_opengl"];
388-
}
389-
390385
+ (int)snapshot_type
391386
{
392387
return [self intForKey:@"snapshot_type"];

0 commit comments

Comments
 (0)