standard naming specification

Jay-Goo · Apr 19, 2018 · f93ed7c · f93ed7c
1 parent c7ab189
commit f93ed7c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/library/src/jniLibs/arm64-v8a/liblame-mp3-utils.so b/library/src/jniLibs/arm64-v8a/liblame-mp3-utils.so
diff --git a/library/src/jniLibs/armeabi-v7a/liblame-mp3-utils.so b/library/src/jniLibs/armeabi-v7a/liblame-mp3-utils.so
diff --git a/library/src/jniLibs/mips/liblame-mp3-utils.so b/library/src/jniLibs/mips/liblame-mp3-utils.so
diff --git a/library/src/jniLibs/mips64/liblame-mp3-utils.so b/library/src/jniLibs/mips64/liblame-mp3-utils.so
diff --git a/library/src/jniLibs/x86/liblame-mp3-utils.so b/library/src/jniLibs/x86/liblame-mp3-utils.so
diff --git a/library/src/jniLibs/x86_64/liblame-mp3-utils.so b/library/src/jniLibs/x86_64/liblame-mp3-utils.so
diff --git a/library/src/main/cpp/lame-mp3-utils.cpp b/library/src/main/cpp/lame-mp3-utils.cpp
@@ -1,7 +1,5 @@
 #include"stdio.h"
 #include"jni.h"
-#include"malloc.h"
-#include"string.h"
 #include"lamemp3/lame.h"
 #include"android/log.h"
 #define LOG_TAG "lameUtils"
@@ -47,9 +45,9 @@ Java_jaygoo_library_converter_Mp3Converter_init(JNIEnv *env, jclass type, jint i
 
 extern "C" JNIEXPORT
 void JNICALL Java_jaygoo_library_converter_Mp3Converter_convertMp3
-		(JNIEnv * env, jobject obj, jstring jInput, jstring jMp3) {
-    const char* cInput = env->GetStringUTFChars(jInput, 0);
-    const char* cMp3 = env->GetStringUTFChars(jMp3, 0);
+		(JNIEnv * env, jobject obj, jstring jInputPath, jstring jMp3Path) {
+    const char* cInput = env->GetStringUTFChars(jInputPath, 0);
+    const char* cMp3 = env->GetStringUTFChars(jMp3Path, 0);
     //open input file and output file
     FILE* fInput = fopen(cInput,"rb");
     FILE* fMp3 = fopen(cMp3,"wb");
@@ -66,7 +64,7 @@ void JNICALL Java_jaygoo_library_converter_Mp3Converter_convertMp3
 
     //convert to mp3
     do{
-        read = static_cast<int>(fread(inputBuffer, sizeof(short int) * 2, 8192, fInput));
+        read = static_cast<int>(fread(inputBuffer, sizeof(short int) * 2, BUFFER_SIZE, fInput));
         total +=  read * sizeof(short int)*2;
         nowConvertBytes = total;
         if(read != 0){
@@ -84,8 +82,8 @@ void JNICALL Java_jaygoo_library_converter_Mp3Converter_convertMp3
     resetLame();
     fclose(fInput);
     fclose(fMp3);
-    env->ReleaseStringUTFChars(jInput, cInput);
-    env->ReleaseStringUTFChars(jMp3, cMp3);
+    env->ReleaseStringUTFChars(jInputPath, cInput);
+    env->ReleaseStringUTFChars(jMp3Path, cMp3);
     nowConvertBytes = -1;
 }
 

diff --git a/library/src/main/java/jaygoo/library/converter/Mp3Converter.java b/library/src/main/java/jaygoo/library/converter/Mp3Converter.java
@@ -40,12 +40,12 @@ public native static void init(int inSampleRate, int channel, int mode,
     /**
      * file convert to mp3
      * it may cost a lot of time and better put it in a thread
-     * @param input
+     * @param inputPath
      *          file path to be converted
-     * @param mp3
+     * @param mp3Path
      *          mp3 output file path
      */
-    public native  static void convertMp3(String input, String mp3);
+    public native  static void convertMp3(String inputPath, String mp3Path);
 
 
     /**