转AS结构，FIX jni init方法没有返回值

.gitignore

@@ -0,0 +1,11 @@
+*.iml
+.gradle
+/local.properties
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+/app/build

app/build.gradle

@@ -0,0 +1,32 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "26.0.1"
+
+    defaultConfig {
+        applicationId "com.phuket.tour.ffmpeg_decoder"
+        minSdkVersion 14
+        targetSdkVersion 19
+
+        ndk {
+            moduleName "libsongstudio"
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+    externalNativeBuild{
+        ndkBuild{
+            path file("src/main/jni/Android.mk")
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:support-v4:23.+'
+}

jni/Application.mk → app/src/main/jni/Application.mk

@@ -1,5 +1,5 @@
 APP_ABI := armeabi-v7a
 APP_STL := gnustl_static
 APP_CPPFLAGS := -std=gnu++11 -fexceptions -D__STDC_LIMIT_MACROS
-NDK_TOOLCHAIN_VERSION = 4.8
-APP_PLATFORM := android-9
+NDK_TOOLCHAIN_VERSION = 4.9
+APP_PLATFORM := android-14

jni/decoder/jni/Mp3Decoder.cpp → app/src/main/jni/decoder/jni/Mp3Decoder.cpp

@@ -10,9 +10,10 @@ JNIEXPORT jint JNICALL Java_com_phuket_tour_decoder_Mp3Decoder_init
 	const char* pcmPath = env->GetStringUTFChars(pcmPathParam, NULL);
 	const char* mp3Path = env->GetStringUTFChars(mp3PathParam, NULL);
 	decoderController = new AccompanyDecoderController();
-	decoderController->Init(mp3Path, pcmPath);
+     int ret= decoderController->Init(mp3Path, pcmPath);
 	env->ReleaseStringUTFChars(mp3PathParam, mp3Path);
 	env->ReleaseStringUTFChars(pcmPathParam, pcmPath);
+    return ret;
 }
 
 JNIEXPORT void JNICALL Java_com_phuket_tour_decoder_Mp3Decoder_decode

jni/decoder/libffmpeg_decoder/accompany_decoder.cpp → app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder.cpp

@@ -28,9 +28,10 @@ int AccompanyDecoder::getMusicMeta(const char* fileString, int * metaData) {
 	return 0;
 }
 
-void AccompanyDecoder::init(const char* fileString, int packetBufferSizeParam){
-	init(fileString);
+int AccompanyDecoder::init(const char* fileString, int packetBufferSizeParam){
+	 int ret= init(fileString);
 	packetBufferSize = packetBufferSizeParam;
+    return ret;
 }
 
 int AccompanyDecoder::init(const char* audioFile) {

jni/decoder/libffmpeg_decoder/accompany_decoder.h → app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder.h

@@ -114,7 +114,7 @@ class AccompanyDecoder {
 	//获取采样率以及比特率
 	virtual int getMusicMeta(const char* fileString, int * metaData);
 	//初始化这个decoder，即打开指定的mp3文件
-	virtual void init(const char* fileString, int packetBufferSizeParam);
+	virtual int init(const char* fileString, int packetBufferSizeParam);
 	virtual AudioPacket* decodePacket();
 	//销毁这个decoder
 	virtual void destroy();

jni/decoder/libffmpeg_decoder/accompany_decoder_controller.cpp → app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.cpp

@@ -10,7 +10,7 @@ AccompanyDecoderController::AccompanyDecoderController() {
 AccompanyDecoderController::~AccompanyDecoderController() {
 }
 
-void AccompanyDecoderController::Init(const char* accompanyPath, const char* pcmFilePath) {
+int AccompanyDecoderController::Init(const char* accompanyPath, const char* pcmFilePath) {
 	//初始化两个decoder
 	AccompanyDecoder* tempDecoder = new AccompanyDecoder();
 	int accompanyMetaData[2];
@@ -21,8 +21,9 @@ void AccompanyDecoderController::Init(const char* accompanyPath, const char* pcm
 	int accompanyByteCountPerSec = accompanySampleRate * CHANNEL_PER_FRAME * BITS_PER_CHANNEL / BITS_PER_BYTE;
 	accompanyPacketBufferSize = (int) ((accompanyByteCountPerSec / 2) * 0.2);
 	accompanyDecoder = new AccompanyDecoder();
-	accompanyDecoder->init(accompanyPath, accompanyPacketBufferSize);
+	int ret= accompanyDecoder->init(accompanyPath, accompanyPacketBufferSize);
 	pcmFile = fopen(pcmFilePath, "wb+");
+	return pcmFile!=NULL&&ret==1?1:-1;
 }
 
 void AccompanyDecoderController::Decode() {

jni/decoder/libffmpeg_decoder/accompany_decoder_controller.h → app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.h

@@ -25,7 +25,7 @@ class AccompanyDecoderController {
 	~AccompanyDecoderController();
 
 	/** 初始两个decoder,并且根据上一步算出的采样率，计算出伴奏和原唱的bufferSize **/
-	void Init(const char* accompanyPath, const char* pcmFilePath);
+	int Init(const char* accompanyPath, const char* pcmFilePath);
 	/** 解码操作 **/
 	void Decode();
 	/** 销毁这个controller **/

build.gradle

@@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.1.0'
+
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}