diff --git a/CHANGELOG.md b/CHANGELOG.md index 0548f12ec9..f61c0fc9ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,13 @@ tag k0.11.0 - support ass subtitle effects, and adjust position and scale in real time - support display multiple pgs bitmap subtitle at the same moment, and adjust position and scale in real time -- dropped old subtitle renderer (text->image(CoreGraphy)->CVPixelBuffer->Texture) +- dropped old subtitle renderer (text->image(Core Graphics)->CVPixelBuffer->Texture) - subtitle preference move to player from view - dropped iOS OpenGL renderer - support http gzip and deflate use headers - restore ijk dns cache and http event hook +- enable microdvd subtitle decoder +- meta add chapter info tag k0.10.5 -------------------------------- @@ -21,7 +23,7 @@ tag k0.10.4 - support install third pre-compiled libs - external subtitle support GBK、BIG5-2003 character set - fix subtitle display more bigger bug on non-retina screen using metal -- support render P216，YUV422P16，P416，YUV444P16，AYUV64，YUVA444P16 pixel format directly +- support render P216、YUV422P16、P416、YUV444P16、AYUV64、YUVA444P16 pixel format directly - upgrade ffmpeg to 5.1.4，openssl to 1.1.1w，opus to 1.4，dav1d to 1.3.0，bluray to 1.3.4 tag k0.10.3 diff --git a/IJKMediaPlayerKit.podspec b/IJKMediaPlayerKit.podspec index 99ededa61a..1bfefb9071 100644 --- a/IJKMediaPlayerKit.podspec +++ b/IJKMediaPlayerKit.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'IJKMediaPlayerKit' - s.version = '0.10.5' + s.version = '0.11.0' s.summary = 'IJKMediaPlayerKit for ios/macOS.' # This description is used to generate tags and improve search results. diff --git a/README.md b/README.md index 9da5d3f89f..c56c3ebf23 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ sudo dpkg-reconfigure dash ``` git clone https://github.com/debugly/ijkplayer.git ijkplayer cd ijkplayer -git checkout -B latest k0.10.5 +git checkout -B latest k0.11.0 cd shell ./init-any.sh macos @@ -135,7 +135,7 @@ open ../../examples/macos/IJKMediaMacDemo.xcworkspace ``` git clone https://github.com/debugly/ijkplayer.git ijkplayer cd ijkplayer -git checkout -B latest k0.10.5 +git checkout -B latest k0.11.0 cd shell ./init-any.sh ios @@ -150,7 +150,7 @@ open ../../examples/macos/IJKMediaDemo.xcworkspace ``` git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android cd ijkplayer-android -git checkout -B latest k0.10.5 +git checkout -B latest k0.11.0 ./init-android.sh diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index 7904734c84..7d9c141745 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -26,8 +26,8 @@ ext { targetSdkVersion = 25 - versionCode = 1000500 - versionName = "0.10.5" + versionCode = 1100000 + versionName = "0.11.0" } wrapper { diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties index 0e4517cad4..96ca849e51 100644 --- 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.10.5 -VERSION_CODE=1000500 +VERSION_NAME=0.11.0 +VERSION_CODE=1100000 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 index 0542a1a476..b3fea7fca2 100644 --- 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.10.5' - // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.10.5' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.0' + // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.11.0' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.10.5' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.10.5' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.10.5' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.0' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.0' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.0' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.10.5' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.10.5' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.10.5' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.10.5' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.10.5' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.0' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.0' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.11.0' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.0' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.11.0' // armv5Compile project(':player-armv5') // armv7aCompile project(':player-armv7a') diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle index aa2902363c..1570c0f38e 100644 --- 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.10.5' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.0' } gradle.startParameter.taskNames.each { task -> diff --git a/examples/ios/Podfile.lock b/examples/ios/Podfile.lock index 7652aa7e00..a9af1bb57f 100644 --- a/examples/ios/Podfile.lock +++ b/examples/ios/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - IJKMediaPlayerKit (0.10.5) + - IJKMediaPlayerKit (0.11.0) DEPENDENCIES: - IJKMediaPlayerKit (from `../../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - IJKMediaPlayerKit: ad50dbfae317cb65f94dec40a73a8336c5e451f8 + IJKMediaPlayerKit: b70eef8376bfc532e26524ae8c55112e5ae5821a PODFILE CHECKSUM: cd296d63e0523ffeac3abedb895edb14934a2d48 -COCOAPODS: 1.15.0 +COCOAPODS: 1.15.2 diff --git a/examples/macos/Podfile.lock b/examples/macos/Podfile.lock index e928195c12..fa14235198 100644 --- a/examples/macos/Podfile.lock +++ b/examples/macos/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - IJKMediaPlayerKit (0.10.5) + - IJKMediaPlayerKit (0.11.0) DEPENDENCIES: - IJKMediaPlayerKit (from `../../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - IJKMediaPlayerKit: ad50dbfae317cb65f94dec40a73a8336c5e451f8 + IJKMediaPlayerKit: b70eef8376bfc532e26524ae8c55112e5ae5821a PODFILE CHECKSUM: f950a6923955cd8172bbcde59a7c414fe1a4ac71 diff --git a/version.sh b/version.sh index db4c360b11..37b8d46bf4 100755 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ set -e -VERSION_CODE=1000500 -VERSION_NAME=0.10.5 +VERSION_CODE=1100000 +VERSION_NAME=0.11.0 VERSION_TARGET=$1 echo "alter version to $VERSION_NAME"