From 9e12df1b705b7df66f11d26dda6a2c4f63891e6a Mon Sep 17 00:00:00 2001 From: Leo Ma Date: Fri, 25 Nov 2016 15:21:49 +0800 Subject: [PATCH] Add abiFilters property in gradle building Signed-off-by: Leo Ma --- app/build.gradle | 3 +++ library/build.gradle | 4 +++- library/src/main/java/net/ossrs/yasea/SrsEncoder.java | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 501ab6b..af0d188 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,9 @@ android { targetSdkVersion 22 versionCode 1 versionName "1.0" + ndk { + abiFilters "armeabi-v7a", "x86" + } } buildTypes { release { diff --git a/library/build.gradle b/library/build.gradle index 0f891e6..93c71e0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -11,7 +11,9 @@ android { versionName "2.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - + ndk { + abiFilters "armeabi-v7a", "x86" + } } buildTypes { release { diff --git a/library/src/main/java/net/ossrs/yasea/SrsEncoder.java b/library/src/main/java/net/ossrs/yasea/SrsEncoder.java index 6864887..7f34c32 100644 --- a/library/src/main/java/net/ossrs/yasea/SrsEncoder.java +++ b/library/src/main/java/net/ossrs/yasea/SrsEncoder.java @@ -473,11 +473,8 @@ public class SrsEncoder { private native void setEncoderGop(int gop); private native void setEncoderBitrate(int bitrate); private native void setEncoderPreset(String preset); - private native byte[] NV21ToI420(byte[] yuvFrame, int width, int height, boolean flip, int rotate); - private native byte[] NV21ToNV12(byte[] yuvFrame, int width, int height, boolean flip, int rotate); private native byte[] RGBAToI420(byte[] rgbaFrame, int width, int height, boolean flip, int rotate); private native byte[] RGBAToNV12(byte[] rgbaFrame, int width, int height, boolean flip, int rotate); - private native int NV21SoftEncode(byte[] yuvFrame, int width, int height, boolean flip, int rotate, long pts); private native int RGBASoftEncode(byte[] rgbaFrame, int width, int height, boolean flip, int rotate, long pts); private native boolean openSoftEncoder(); private native void closeSoftEncoder();