Skip to content

Commit

Permalink
update ndk r10e support 16k page size
Browse files Browse the repository at this point in the history
  • Loading branch information
CarGuo committed Aug 1, 2024
1 parent 8ef59d3 commit 3e001b2
Show file tree
Hide file tree
Showing 10 changed files with 473 additions and 2 deletions.
6 changes: 6 additions & 0 deletions 16kpatch/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 使用

使用 ndk 22 ,可以编译适配 16K page size 的 git diff patch

- 如果需要成品,可见: [arm64-v8a](../gsyVideoPlayer-ex_so/src/main/jniLibs/arm64-v8a)
- 如果需要 ndkr10e,可见: [ndkr10e](./old)
5 changes: 5 additions & 0 deletions 16kpatch/old/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# 说明

这部分不想升级 ndk ,使用 ndk 10e 既可以编译适配 16K page size 的 git diff patch

- 如果需要成品,可见: [arm64-v8a](../../gsyVideoPlayer-armv64/src/main/jniLibs/arm64-v8a)
419 changes: 419 additions & 0 deletions 16kpatch/old/ndk10e_diff_patch.patch

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions 16kpatch/old/ndk10e_diff_patch_sounchtouch.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/Android.mk b/Android.mk
index d901211..37a75c8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,8 @@ 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=65536
+LOCAL_LDFLAGS += -Wl,-z,common-page-size=65536

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..07e44aa 100644
--- a/source/Android-lib/jni/Android.mk
+++ b/source/Android-lib/jni/Android.mk
@@ -45,6 +45,9 @@ LOCAL_CFLAGS += -fvisibility=hidden -I ../../../include -fdata-sections -ffuncti
#LOCAL_CFLAGS += -fopenmp
#LOCAL_LDFLAGS += -fopenmp

+LOCAL_LDFLAGS += -Wl,-z,max-page-size=65536
+LOCAL_LDFLAGS += -Wl,-z,common-page-size=65536
+

# Use ARM instruction set instead of Thumb for improved calculation performance in ARM CPUs
LOCAL_ARM_MODE := arm
13 changes: 13 additions & 0 deletions 16kpatch/old/ndk10e_diff_patch_yuv.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/Android.mk b/Android.mk
index 3690b179..b5a2d1bc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,6 +55,8 @@ endif

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

LOCAL_MODULE := libyuv_static
LOCAL_MODULE_TAGS := optional
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
@RuntimePermissions
public class DetailControlActivity extends GSYBaseActivityDetail<StandardGSYVideoPlayer> {

private final String url = "https://res.exexm.com/cw_145225549855002";
//private final String url = "https://res.exexm.com/cw_145225549855002";
private final String url = "https://media.w3.org/2010/05/sintel/trailer.mp4";
//private String url = "http://livecdn1.news.cn/Live_MajorEvent01Phone/manifest.m3u8";
//private String url = "https://ruigongkao.oss-cn-shenzhen.aliyuncs.com/transcode/video/source/video/8908d124aa839d0d3fa9593855ef5957.m3u8";
//private String url2 = "http://ruigongkao.oss-cn-shenzhen.aliyuncs.com/transcode/video/source/video/3aca1a0db8db9418dcbc765848c8903e.m3u8";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ private String getUrl() {
//String url = "https://res.exexm.com/cw_145225549855002";
//String url = "http://storage.gzstv.net/uploads/media/huangmeiyan/jr05-09.mp4";//mepg
//String url = "https://zh-files.oss-cn-qingdao.aliyuncs.com/20170808223928mJ1P3n57.mp4";//90度
String url = "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear3/prog_index.m3u8";//90度
String url = "https://media.w3.org/2010/05/sintel/trailer.mp4";//90度
//String url = " String source1 = "http://9890.vod.myqcloud.com/9890_4e292f9a3dd011e6b4078980237cc3d3.f20.mp4";
//String url = "http://video.cdn.aizys.com/zzx3.9g.mkv";//long
//String url = "rtsp://admin:[email protected]:554/h264/ch01/main/av_stream";//long
Expand Down
Binary file modified gsyVideoPlayer-armv64/src/main/jniLibs/arm64-v8a/libijkffmpeg.so
100644 → 100755
Binary file not shown.
Binary file modified gsyVideoPlayer-armv64/src/main/jniLibs/arm64-v8a/libijkplayer.so
100644 → 100755
Binary file not shown.
Binary file modified gsyVideoPlayer-armv64/src/main/jniLibs/arm64-v8a/libijksdl.so
100644 → 100755
Binary file not shown.

0 comments on commit 3e001b2

Please sign in to comment.