#42,fix real iOS device does not display picture and keeps showing a …

…pink color
debugly · Aug 19, 2024 · 6501969 · 6501969
1 parent 409f9ae
commit 6501969
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+tag k0.11.6
+--------------------------------
+
+- fix real iOS device does not display picture and keeps showing a pink color,#42
+
 tag k0.11.5
 --------------------------------
 

diff --git a/IJKMediaPlayerKit.podspec b/IJKMediaPlayerKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'IJKMediaPlayerKit'
-  s.version          = '0.11.5'
+  s.version          = '0.11.6'
   s.summary          = 'IJKMediaPlayerKit for ios/macOS/tvOS.'
 
 # This description is used to generate tags and improve search results.

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ ijk media player based on [ffplay](http://ffmpeg.org)
 install use cocoapod:
 
 ```
-pod "IJKMediaPlayerKit", :podspec => 'https://github.com/debugly/ijkplayer/releases/download/k0.11.5/IJKMediaPlayerKit.spec.json'
+pod "IJKMediaPlayerKit", :podspec => 'https://github.com/debugly/ijkplayer/releases/download/k0.11.6/IJKMediaPlayerKit.spec.json'
 ```
 
 ## Development
@@ -66,7 +66,7 @@ how to run examples:
 ```
 git clone https://github.com/debugly/ijkplayer.git ijkplayer
 cd ijkplayer
-git checkout -B latest k0.11.5
+git checkout -B latest k0.11.6
 git submodule update --init
 
 ./FFToolChain/main.sh install -p macos -l 'ass ffmpeg'
@@ -78,11 +78,11 @@ pod install --project-directory=./examples/ios
 pod install --project-directory=./examples/tvos
 
 # run iOS demo
-open ./examples/macos/IJKMediaDemo.xcworkspace
+open ./examples/ios/IJKMediaDemo.xcworkspace
 # run macOS demo
 open ./examples/macos/IJKMediaMacDemo.xcworkspace
 # run tvOS demo
-open ./examples/macos/IJKMediaTVDemo.xcworkspace
+open ./examples/tvos/IJKMediaTVDemo.xcworkspace
 ```
 
 if you want build your IJKMediaPlayerKit.framework, you need enter examples/{plat} folder, then exec `./build-framework.sh`

diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle
@@ -26,8 +26,8 @@ ext {
 
     targetSdkVersion = 25
 
-    versionCode = 1100500
-    versionName = "0.11.5"
+    versionCode = 1100600
+    versionName = "0.11.6"
 }
 
 wrapper {

diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=0.11.5
-VERSION_CODE=1100500
+VERSION_NAME=0.11.6
+VERSION_CODE=1100600
 GROUP=tv.danmaku.ijk.media
 
 # http://central.sonatype.org/pages/requirements.html

diff --git a/android/ijkplayer/ijkplayer-example/build.gradle b/android/ijkplayer/ijkplayer-example/build.gradle
@@ -54,18 +54,18 @@ dependencies {
     all64Compile project(':ijkplayer-x86')
     all64Compile project(':ijkplayer-x86_64')
 
-    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.5'
-    // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.11.5'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.6'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.11.6'
 
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.5'
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.5'
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.5'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.6'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.6'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.6'
 
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.5'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.5'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.11.5'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.5'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.11.5'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.6'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.6'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.11.6'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.6'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.11.6'
 
     // armv5Compile project(':player-armv5')
     // armv7aCompile project(':player-armv7a')

diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     compile 'com.google.android.exoplayer:exoplayer:r1.5.11'
 
     compile project(':ijkplayer-java')
-    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.5'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.6'
 }
 
 gradle.startParameter.taskNames.each { task ->

diff --git a/examples/ios/Podfile.lock b/examples/ios/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - IJKMediaPlayerKit (0.11.5)
+  - IJKMediaPlayerKit (0.11.6)
 
 DEPENDENCIES:
   - IJKMediaPlayerKit (from `../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  IJKMediaPlayerKit: 72e9a8874564300d5f576a1889c7c750e1948f62
+  IJKMediaPlayerKit: 1b9d8c06af1e5251d4fe68094415b311b0733cac
 
 PODFILE CHECKSUM: cd296d63e0523ffeac3abedb895edb14934a2d48
 

diff --git a/examples/macos/Podfile.lock b/examples/macos/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - IJKMediaPlayerKit (0.11.5)
+  - IJKMediaPlayerKit (0.11.6)
 
 DEPENDENCIES:
   - IJKMediaPlayerKit (from `../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  IJKMediaPlayerKit: 72e9a8874564300d5f576a1889c7c750e1948f62
+  IJKMediaPlayerKit: 1b9d8c06af1e5251d4fe68094415b311b0733cac
 
 PODFILE CHECKSUM: f950a6923955cd8172bbcde59a7c414fe1a4ac71
 

diff --git a/examples/tvos/Podfile.lock b/examples/tvos/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - IJKMediaPlayerKit (0.11.5)
+  - IJKMediaPlayerKit (0.11.6)
 
 DEPENDENCIES:
   - IJKMediaPlayerKit (from `../../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  IJKMediaPlayerKit: 72e9a8874564300d5f576a1889c7c750e1948f62
+  IJKMediaPlayerKit: 1b9d8c06af1e5251d4fe68094415b311b0733cac
 
 PODFILE CHECKSUM: 61b62f37b598e87b9117082bdf528ef9f99adafb
 

diff --git a/ijkmedia/ijksdl/metal/IJKMetalView.m b/ijkmedia/ijksdl/metal/IJKMetalView.m
@@ -37,6 +37,7 @@ @interface IJKMetalView ()
 @property (atomic, strong) IJKOverlayAttach *currentAttach;
 @property (assign) int hdrAnimationFrameCount;
 @property (atomic, strong) NSLock *pilelineLock;
+@property (assign) BOOL needCleanBackgroundColor;
 
 @end
 
@@ -91,7 +92,7 @@ - (BOOL)prepareMetal
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidEndLiveResize:) name:NSWindowDidEndLiveResizeNotification object:nil];
 #endif
     //set default bg color.
-    [self setBackgroundColor:1.0 g:1.0 b:1.0];
+    [self setBackgroundColor:0 g:0 b:0];
     return YES;
 }
 
@@ -298,6 +299,26 @@ - (void)drawRect:(NSRect)dirtyRect
 {
     IJKOverlayAttach * attach = self.currentAttach;
     if (attach.videoTextures.count == 0) {
+        if (self.needCleanBackgroundColor) {
+            id<CAMetalDrawable> drawable = self.currentDrawable;
+            if (drawable) {
+                id<MTLTexture> texture = drawable.texture;
+
+                MTLRenderPassDescriptor *passDescriptor = [MTLRenderPassDescriptor renderPassDescriptor];
+                passDescriptor.colorAttachments[0].texture = texture;
+                passDescriptor.colorAttachments[0].loadAction = MTLLoadActionClear;
+                passDescriptor.colorAttachments[0].storeAction = MTLStoreActionStore;
+                passDescriptor.colorAttachments[0].clearColor = self.clearColor;
+
+                id<MTLCommandBuffer> commandBuffer = [self.commandQueue commandBuffer];
+                id <MTLRenderCommandEncoder> commandEncoder = [commandBuffer renderCommandEncoderWithDescriptor:passDescriptor];
+
+                [commandEncoder endEncoding];
+                [commandBuffer presentDrawable:drawable];
+                [commandBuffer commit];
+                self.needCleanBackgroundColor = NO;
+            }
+        }
         return;
     }
 
@@ -652,24 +673,8 @@ - (void)setDarPreference:(IJKSDLDARPreference)darPreference
 - (void)setBackgroundColor:(uint8_t)r g:(uint8_t)g b:(uint8_t)b
 {
     self.clearColor = (MTLClearColor){r/255.0, g/255.0, b/255.0, 1.0f};
-
-    id<CAMetalDrawable> drawable = self.currentDrawable;
-    if (drawable) {
-        id<MTLTexture> texture = drawable.texture;
-
-        MTLRenderPassDescriptor *passDescriptor = [MTLRenderPassDescriptor renderPassDescriptor];
-        passDescriptor.colorAttachments[0].texture = texture;
-        passDescriptor.colorAttachments[0].loadAction = MTLLoadActionClear;
-        passDescriptor.colorAttachments[0].storeAction = MTLStoreActionStore;
-        passDescriptor.colorAttachments[0].clearColor = self.clearColor;
-
-        id<MTLCommandBuffer> commandBuffer = [self.commandQueue commandBuffer];
-        id <MTLRenderCommandEncoder> commandEncoder = [commandBuffer renderCommandEncoderWithDescriptor:passDescriptor];
-
-        [commandEncoder endEncoding];
-        [commandBuffer presentDrawable:drawable];
-        [commandBuffer commit];
-    }
+    self.needCleanBackgroundColor = YES;
+    [self setNeedsRefreshCurrentPic];
 }
 
 - (id)context

diff --git a/version.sh b/version.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION_CODE=1100500
-VERSION_NAME=0.11.5
+VERSION_CODE=1100600
+VERSION_NAME=0.11.6
 VERSION_TARGET=$1
 
 echo "alter version to $VERSION_NAME"