Skip to content

Commit

Permalink
support 16k page size
Browse files Browse the repository at this point in the history
  • Loading branch information
CarGuo committed Jul 30, 2024
1 parent 2f061c0 commit 866e2fe
Show file tree
Hide file tree
Showing 8 changed files with 576 additions and 2 deletions.
515 changes: 515 additions & 0 deletions 16kpatch/ndk_r22_16k_commit.patch

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions 16kpatch/ndk_r22_ijkyuv.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/Android.mk b/Android.mk
index 3690b179..1d2be682 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,6 +55,7 @@ endif

LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
+LOCAL_LDFLAGS += -Wl,-z,max-page-size=16384

LOCAL_MODULE := libyuv_static
LOCAL_MODULE_TAGS := optional
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43e79a03..5439885c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,3 +128,5 @@ endif()
install(TARGETS ${ly_lib_name} DESTINATION lib)
install(FILES ${ly_header_files} DESTINATION include/libyuv)
install(FILES ${ly_inc_dir}/libyuv.h DESTINATION include/)
+
+target_link_libraries(${ly_lib_name} "-Wl,-z,max-page-size=16384")
\ No newline at end of file
35 changes: 35 additions & 0 deletions 16kpatch/ndk_r22_soundtouch.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/Android.mk b/Android.mk
index d901211..a9a1e53 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,7 @@ LOCAL_SRC_FILES += source/SoundTouch/PeakFinder.cpp
LOCAL_SRC_FILES += source/SoundTouch/SoundTouch.cpp
LOCAL_SRC_FILES += source/SoundTouch/mmx_optimized.cpp
LOCAL_SRC_FILES += ijksoundtouch_wrap.cpp
+LOCAL_LDFLAGS += -Wl,-z,max-page-size=16384

LOCAL_MODULE := ijksoundtouch
include $(BUILD_STATIC_LIBRARY)
diff --git a/source/Android-lib/jni/Android.mk b/source/Android-lib/jni/Android.mk
index f823b3e..83fa7fa 100644
--- a/source/Android-lib/jni/Android.mk
+++ b/source/Android-lib/jni/Android.mk
@@ -48,5 +48,6 @@ LOCAL_CFLAGS += -fvisibility=hidden -I ../../../include -fdata-sections -ffuncti

# Use ARM instruction set instead of Thumb for improved calculation performance in ARM CPUs
LOCAL_ARM_MODE := arm
+LOCAL_LDFLAGS += -Wl,-z,max-page-size=16384

include $(BUILD_SHARED_LIBRARY)
diff --git a/source/Android-lib/jni/Application.mk b/source/Android-lib/jni/Application.mk
index 8ee39db..96e550b 100644
--- a/source/Android-lib/jni/Application.mk
+++ b/source/Android-lib/jni/Application.mk
@@ -5,6 +5,6 @@

APP_ABI := all #armeabi-v7a armeabi
APP_OPTIM := release
-APP_STL := stlport_static
+APP_STL := c++_static
APP_CPPFLAGS := -fexceptions # -D SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
**字幕**|**[media3(exo2)模式下支持自定增加外挂字幕](https://github.com/CarGuo/GSYVideoPlayer/tree/master/app/src/main/java/com/example/gsyvideoplayer/exosubtitle)**
**dash**|**media3(exo2) 模式支持dash**
**stream**|**支持元数据播放**
**适配 16k**|**ex_so 适配 16K Page Size**
**更多**|**暂停前后台切换不黑屏;调整不同清晰度的支持;无缝切换支持;锁定/解锁全屏点击功能;进度条小窗口预览(测试)。**
**自定义**|**可自定义渲染层、自定义管理层、自定义播放层(控制层)、自定义缓存层。**

Expand Down Expand Up @@ -96,7 +97,7 @@ allprojects {
implementation 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v8.6.0-release-jitpack'
```

#### C、支持其他格式协议的(mpeg,rtsp, concat、crypto协议)
#### C、支持其他格式协议的(mpeg,rtsp, concat、crypto协议,支持 16k Page Size

A、B普通版本支持263/264/265等,对于mpeg编码会有声音无画面情况。
C 引入的so支持mpeg编码和其他补充协议,但是so包相对变大。
Expand Down
2 changes: 1 addition & 1 deletion doc/DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ allprojects {
implementation 'com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-x64:v8.6.0-release-jitpack'
```

#### C、支持其他格式协议的(mpeg,rtsp, concat、crypto协议)
#### C、支持其他格式协议的(mpeg,rtsp, concat、crypto协议,支持 16k Page Size

A、B普通版本支持263/264/265等,对于mpeg编码会有声音无画面情况。
C 引入的so支持mpeg编码和其他补充协议,但是so包相对变大。
Expand Down
Binary file modified gsyVideoPlayer-ex_so/src/main/jniLibs/arm64-v8a/libijkffmpeg.so
100644 → 100755
Binary file not shown.
Binary file modified gsyVideoPlayer-ex_so/src/main/jniLibs/arm64-v8a/libijkplayer.so
100644 → 100755
Binary file not shown.
Binary file modified gsyVideoPlayer-ex_so/src/main/jniLibs/arm64-v8a/libijksdl.so
100644 → 100755
Binary file not shown.

0 comments on commit 866e2fe

Please sign in to comment.