diff --git a/.classpath b/.classpath deleted file mode 100755 index 6713151..0000000 --- a/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c6cd180 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild +/app/build diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..b87eb53 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..c0f68ed --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.project b/.project deleted file mode 100755 index d5b03af..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - FFmpegDecoder - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index b080d2d..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..f040966 --- /dev/null +++ b/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.+' +} diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml old mode 100755 new mode 100644 similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/jni/decoder/java/com/phuket/tour/decoder/Mp3Decoder.java b/app/src/main/java/com/phuket/tour/decoder/Mp3Decoder.java old mode 100755 new mode 100644 similarity index 100% rename from jni/decoder/java/com/phuket/tour/decoder/Mp3Decoder.java rename to app/src/main/java/com/phuket/tour/decoder/Mp3Decoder.java diff --git a/src/com/phuket/tour/ffmpeg_decoder/MainActivity.java b/app/src/main/java/com/phuket/tour/ffmpeg_decoder/MainActivity.java old mode 100755 new mode 100644 similarity index 100% rename from src/com/phuket/tour/ffmpeg_decoder/MainActivity.java rename to app/src/main/java/com/phuket/tour/ffmpeg_decoder/MainActivity.java diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/avcodec.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/avcodec.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/avcodec.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/avcodec.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/avfft.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/avfft.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/avfft.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/avfft.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/dxva2.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/dxva2.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/dxva2.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/dxva2.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/vaapi.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/vaapi.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/vaapi.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/vaapi.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/vda.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/vda.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/vda.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/vda.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/vdpau.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/vdpau.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/vdpau.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/vdpau.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/version.h diff --git a/jni/3rdparty/ffmpeg/include/libavcodec/xvmc.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/xvmc.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavcodec/xvmc.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavcodec/xvmc.h diff --git a/jni/3rdparty/ffmpeg/include/libavdevice/avdevice.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavdevice/avdevice.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavdevice/avdevice.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavdevice/avdevice.h diff --git a/jni/3rdparty/ffmpeg/include/libavdevice/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavdevice/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavdevice/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavdevice/version.h diff --git a/jni/3rdparty/ffmpeg/include/libavfilter/asrc_abuffer.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/asrc_abuffer.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavfilter/asrc_abuffer.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/asrc_abuffer.h diff --git a/jni/3rdparty/ffmpeg/include/libavfilter/avcodec.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/avcodec.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavfilter/avcodec.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/avcodec.h diff --git a/jni/3rdparty/ffmpeg/include/libavfilter/avfilter.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/avfilter.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavfilter/avfilter.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/avfilter.h diff --git a/jni/3rdparty/ffmpeg/include/libavfilter/avfiltergraph.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/avfiltergraph.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavfilter/avfiltergraph.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/avfiltergraph.h diff --git a/jni/3rdparty/ffmpeg/include/libavfilter/buffersink.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/buffersink.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavfilter/buffersink.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/buffersink.h diff --git a/jni/3rdparty/ffmpeg/include/libavfilter/buffersrc.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/buffersrc.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavfilter/buffersrc.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/buffersrc.h diff --git a/jni/3rdparty/ffmpeg/include/libavfilter/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavfilter/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavfilter/version.h diff --git a/jni/3rdparty/ffmpeg/include/libavformat/avformat.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavformat/avformat.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavformat/avformat.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavformat/avformat.h diff --git a/jni/3rdparty/ffmpeg/include/libavformat/avio.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavformat/avio.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavformat/avio.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavformat/avio.h diff --git a/jni/3rdparty/ffmpeg/include/libavformat/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavformat/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavformat/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavformat/version.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/adler32.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/adler32.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/adler32.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/adler32.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/aes.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/aes.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/aes.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/aes.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/attributes.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/attributes.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/attributes.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/attributes.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/audio_fifo.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/audio_fifo.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/audio_fifo.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/audio_fifo.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/audioconvert.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/audioconvert.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/audioconvert.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/audioconvert.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/avassert.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avassert.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/avassert.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avassert.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/avconfig.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avconfig.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/avconfig.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avconfig.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/avstring.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avstring.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/avstring.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avstring.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/avutil.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avutil.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/avutil.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/avutil.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/base64.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/base64.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/base64.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/base64.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/blowfish.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/blowfish.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/blowfish.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/blowfish.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/bprint.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/bprint.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/bprint.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/bprint.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/bswap.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/bswap.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/bswap.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/bswap.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/buffer.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/buffer.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/buffer.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/buffer.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/channel_layout.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/channel_layout.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/channel_layout.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/channel_layout.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/common.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/common.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/common.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/common.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/cpu.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/cpu.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/cpu.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/cpu.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/crc.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/crc.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/crc.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/crc.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/dict.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/dict.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/dict.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/dict.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/error.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/error.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/error.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/error.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/eval.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/eval.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/eval.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/eval.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/fifo.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/fifo.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/fifo.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/fifo.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/file.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/file.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/file.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/file.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/frame.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/frame.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/frame.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/frame.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/hmac.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/hmac.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/hmac.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/hmac.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/imgutils.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/imgutils.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/imgutils.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/imgutils.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/intfloat.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/intfloat.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/intfloat.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/intfloat.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/intreadwrite.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/intreadwrite.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/intreadwrite.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/intreadwrite.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/lfg.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/lfg.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/lfg.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/lfg.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/log.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/log.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/log.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/log.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/lzo.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/lzo.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/lzo.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/lzo.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/mathematics.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/mathematics.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/mathematics.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/mathematics.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/md5.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/md5.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/md5.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/md5.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/mem.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/mem.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/mem.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/mem.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/murmur3.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/murmur3.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/murmur3.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/murmur3.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/opt.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/opt.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/opt.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/opt.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/parseutils.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/parseutils.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/parseutils.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/parseutils.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/pixdesc.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/pixdesc.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/pixdesc.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/pixdesc.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/random_seed.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/random_seed.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/random_seed.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/random_seed.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/rational.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/rational.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/rational.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/rational.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/ripemd.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/ripemd.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/ripemd.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/ripemd.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/sha.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/sha.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/sha.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/sha.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/sha512.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/sha512.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/sha512.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/sha512.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/time.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/time.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/time.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/time.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/timecode.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/timecode.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/timecode.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/timecode.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/timestamp.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/timestamp.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/timestamp.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/timestamp.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/version.h diff --git a/jni/3rdparty/ffmpeg/include/libavutil/xtea.h b/app/src/main/jni/3rdparty/ffmpeg/include/libavutil/xtea.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libavutil/xtea.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libavutil/xtea.h diff --git a/jni/3rdparty/ffmpeg/include/libpostproc/postprocess.h b/app/src/main/jni/3rdparty/ffmpeg/include/libpostproc/postprocess.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libpostproc/postprocess.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libpostproc/postprocess.h diff --git a/jni/3rdparty/ffmpeg/include/libpostproc/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libpostproc/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libpostproc/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libpostproc/version.h diff --git a/jni/3rdparty/ffmpeg/include/libswresample/swresample.h b/app/src/main/jni/3rdparty/ffmpeg/include/libswresample/swresample.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libswresample/swresample.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libswresample/swresample.h diff --git a/jni/3rdparty/ffmpeg/include/libswresample/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libswresample/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libswresample/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libswresample/version.h diff --git a/jni/3rdparty/ffmpeg/include/libswscale/swscale.h b/app/src/main/jni/3rdparty/ffmpeg/include/libswscale/swscale.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libswscale/swscale.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libswscale/swscale.h diff --git a/jni/3rdparty/ffmpeg/include/libswscale/version.h b/app/src/main/jni/3rdparty/ffmpeg/include/libswscale/version.h old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/ffmpeg/include/libswscale/version.h rename to app/src/main/jni/3rdparty/ffmpeg/include/libswscale/version.h diff --git a/jni/3rdparty/prebuilt/armv7-a/libavcodec.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libavcodec.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libavcodec.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libavcodec.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libavfilter.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libavfilter.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libavfilter.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libavfilter.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libavformat.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libavformat.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libavformat.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libavformat.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libavutil.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libavutil.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libavutil.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libavutil.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libfdk-aac.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libfdk-aac.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libfdk-aac.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libfdk-aac.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libpostproc.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libpostproc.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libpostproc.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libpostproc.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libswresample.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libswresample.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libswresample.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libswresample.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libswscale.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libswscale.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libswscale.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libswscale.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libvo-aacenc.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libvo-aacenc.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libvo-aacenc.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libvo-aacenc.a diff --git a/jni/3rdparty/prebuilt/armv7-a/libx264.a b/app/src/main/jni/3rdparty/prebuilt/armv7-a/libx264.a old mode 100755 new mode 100644 similarity index 100% rename from jni/3rdparty/prebuilt/armv7-a/libx264.a rename to app/src/main/jni/3rdparty/prebuilt/armv7-a/libx264.a diff --git a/jni/Android.mk b/app/src/main/jni/Android.mk old mode 100755 new mode 100644 similarity index 100% rename from jni/Android.mk rename to app/src/main/jni/Android.mk diff --git a/jni/Application.mk b/app/src/main/jni/Application.mk old mode 100755 new mode 100644 similarity index 67% rename from jni/Application.mk rename to app/src/main/jni/Application.mk index 909b097..a34f946 --- a/jni/Application.mk +++ b/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 \ No newline at end of file +NDK_TOOLCHAIN_VERSION = 4.9 +APP_PLATFORM := android-14 \ No newline at end of file diff --git a/jni/common/CommonTools.h b/app/src/main/jni/common/CommonTools.h old mode 100755 new mode 100644 similarity index 100% rename from jni/common/CommonTools.h rename to app/src/main/jni/common/CommonTools.h diff --git a/jni/decoder/Android.mk b/app/src/main/jni/decoder/Android.mk old mode 100755 new mode 100644 similarity index 100% rename from jni/decoder/Android.mk rename to app/src/main/jni/decoder/Android.mk diff --git a/jni/decoder/jni/Mp3Decoder.cpp b/app/src/main/jni/decoder/jni/Mp3Decoder.cpp old mode 100755 new mode 100644 similarity index 94% rename from jni/decoder/jni/Mp3Decoder.cpp rename to app/src/main/jni/decoder/jni/Mp3Decoder.cpp index daed793..c38ed42 --- a/jni/decoder/jni/Mp3Decoder.cpp +++ b/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 diff --git a/jni/decoder/jni/com_phuket_tour_decoder_Mp3Decoder.h b/app/src/main/jni/decoder/jni/com_phuket_tour_decoder_Mp3Decoder.h old mode 100755 new mode 100644 similarity index 100% rename from jni/decoder/jni/com_phuket_tour_decoder_Mp3Decoder.h rename to app/src/main/jni/decoder/jni/com_phuket_tour_decoder_Mp3Decoder.h diff --git a/jni/decoder/libffmpeg_decoder/accompany_decoder.cpp b/app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder.cpp old mode 100755 new mode 100644 similarity index 98% rename from jni/decoder/libffmpeg_decoder/accompany_decoder.cpp rename to app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder.cpp index f1ae605..b3c19ce --- a/jni/decoder/libffmpeg_decoder/accompany_decoder.cpp +++ b/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) { diff --git a/jni/decoder/libffmpeg_decoder/accompany_decoder.h b/app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder.h old mode 100755 new mode 100644 similarity index 98% rename from jni/decoder/libffmpeg_decoder/accompany_decoder.h rename to app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder.h index 0395728..fe1c104 --- a/jni/decoder/libffmpeg_decoder/accompany_decoder.h +++ b/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(); diff --git a/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.cpp b/app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.cpp old mode 100755 new mode 100644 similarity index 86% rename from jni/decoder/libffmpeg_decoder/accompany_decoder_controller.cpp rename to app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.cpp index bc9eb2c..042fa57 --- a/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.cpp +++ b/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() { diff --git a/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.h b/app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.h old mode 100755 new mode 100644 similarity index 93% rename from jni/decoder/libffmpeg_decoder/accompany_decoder_controller.h rename to app/src/main/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.h index ad76474..e55fee3 --- a/jni/decoder/libffmpeg_decoder/accompany_decoder_controller.h +++ b/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 **/ diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml old mode 100755 new mode 100644 similarity index 100% rename from res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml old mode 100755 new mode 100644 similarity index 100% rename from res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml old mode 100755 new mode 100644 similarity index 100% rename from res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml old mode 100755 new mode 100644 similarity index 100% rename from res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml old mode 100755 new mode 100644 similarity index 100% rename from res/values-w820dp/dimens.xml rename to app/src/main/res/values-w820dp/dimens.xml diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml old mode 100755 new mode 100644 similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml old mode 100755 new mode 100644 similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml old mode 100755 new mode 100644 similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml deleted file mode 100755 index d12fcbe..0000000 --- a/bin/AndroidManifest.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/bin/FFmpegDecoder.apk b/bin/FFmpegDecoder.apk deleted file mode 100755 index a2eb58e..0000000 Binary files a/bin/FFmpegDecoder.apk and /dev/null differ diff --git a/bin/classes.dex b/bin/classes.dex deleted file mode 100755 index 87800c5..0000000 Binary files a/bin/classes.dex and /dev/null differ diff --git a/bin/classes/com/phuket/tour/decoder/Mp3Decoder.class b/bin/classes/com/phuket/tour/decoder/Mp3Decoder.class deleted file mode 100644 index 55fed69..0000000 Binary files a/bin/classes/com/phuket/tour/decoder/Mp3Decoder.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/BuildConfig.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/BuildConfig.class deleted file mode 100644 index 52b473e..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/BuildConfig.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/MainActivity$1.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/MainActivity$1.class deleted file mode 100644 index 4e26d54..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/MainActivity$1.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/MainActivity.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/MainActivity.class deleted file mode 100644 index f26a132..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/MainActivity.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$attr.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$attr.class deleted file mode 100644 index 51ea583..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$attr.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$dimen.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$dimen.class deleted file mode 100644 index eac97d4..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$dimen.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$drawable.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$drawable.class deleted file mode 100644 index 3c4f72e..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$drawable.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$id.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$id.class deleted file mode 100644 index bf32657..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$id.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$layout.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$layout.class deleted file mode 100644 index 61ce4e6..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$layout.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$menu.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$menu.class deleted file mode 100644 index b25ec46..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$menu.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$string.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$string.class deleted file mode 100644 index c936a2e..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$string.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$style.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R$style.class deleted file mode 100644 index cc4b3d3..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R$style.class and /dev/null differ diff --git a/bin/classes/com/phuket/tour/ffmpeg_decoder/R.class b/bin/classes/com/phuket/tour/ffmpeg_decoder/R.class deleted file mode 100644 index b7c2269..0000000 Binary files a/bin/classes/com/phuket/tour/ffmpeg_decoder/R.class and /dev/null differ diff --git a/bin/dexedLibs/android-support-v4-021b5b001cb665dc7eee51bcf834fa38.jar b/bin/dexedLibs/android-support-v4-021b5b001cb665dc7eee51bcf834fa38.jar deleted file mode 100755 index 424ab4b..0000000 Binary files a/bin/dexedLibs/android-support-v4-021b5b001cb665dc7eee51bcf834fa38.jar and /dev/null differ diff --git a/bin/jarlist.cache b/bin/jarlist.cache deleted file mode 100755 index 0565465..0000000 --- a/bin/jarlist.cache +++ /dev/null @@ -1,3 +0,0 @@ -# cache for current jar dependency. DO NOT EDIT. -# format is -# Encoding is UTF-8 diff --git a/bin/res/crunch/drawable-hdpi/ic_launcher.png b/bin/res/crunch/drawable-hdpi/ic_launcher.png deleted file mode 100755 index efa7c5f..0000000 Binary files a/bin/res/crunch/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/bin/res/crunch/drawable-mdpi/ic_launcher.png b/bin/res/crunch/drawable-mdpi/ic_launcher.png deleted file mode 100755 index ec27f2e..0000000 Binary files a/bin/res/crunch/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/bin/res/crunch/drawable-xhdpi/ic_launcher.png deleted file mode 100755 index 92fc57d..0000000 Binary files a/bin/res/crunch/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/bin/res/crunch/drawable-xxhdpi/ic_launcher.png b/bin/res/crunch/drawable-xxhdpi/ic_launcher.png deleted file mode 100755 index b6f8f4e..0000000 Binary files a/bin/res/crunch/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ deleted file mode 100755 index c71e48c..0000000 Binary files a/bin/resources.ap_ and /dev/null differ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..47825b2 --- /dev/null +++ b/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 +} diff --git a/gen/com/phuket/tour/ffmpeg_decoder/BuildConfig.java b/gen/com/phuket/tour/ffmpeg_decoder/BuildConfig.java deleted file mode 100755 index ee360a7..0000000 --- a/gen/com/phuket/tour/ffmpeg_decoder/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package com.phuket.tour.ffmpeg_decoder; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/gen/com/phuket/tour/ffmpeg_decoder/R.java b/gen/com/phuket/tour/ffmpeg_decoder/R.java deleted file mode 100755 index e68a2d2..0000000 --- a/gen/com/phuket/tour/ffmpeg_decoder/R.java +++ /dev/null @@ -1,72 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.phuket.tour.ffmpeg_decoder; - -public final class R { - public static final class attr { - } - public static final class dimen { - /** Default screen margins, per the Android Design guidelines. - - Example customization of dimensions originally defined in res/values/dimens.xml - (such as screen margins) for screens with more than 820dp of available width. This - would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). - - */ - public static final int activity_horizontal_margin=0x7f040000; - public static final int activity_vertical_margin=0x7f040001; - } - public static final class drawable { - public static final int ic_launcher=0x7f020000; - } - public static final class id { - public static final int action_settings=0x7f080002; - public static final int mp3_encoder_btn=0x7f080001; - public static final int title=0x7f080000; - } - public static final class layout { - public static final int activity_main=0x7f030000; - } - public static final class menu { - public static final int main=0x7f070000; - } - public static final class string { - public static final int action_settings=0x7f050003; - public static final int app_name=0x7f050000; - public static final int decoder_test=0x7f050002; - public static final int hello_world=0x7f050001; - } - public static final class style { - /** - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - - - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - - - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - - API 11 theme customizations can go here. - - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - - API 14 theme customizations can go here. - */ - public static final int AppBaseTheme=0x7f060000; - /** Application theme. - All customizations that are NOT specific to a particular API-level can go here. - */ - public static final int AppTheme=0x7f060001; - } -} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..743d692 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d207f0e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat May 26 16:07:14 CST 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/ic_launcher-web.png b/ic_launcher-web.png deleted file mode 100755 index a18cbb4..0000000 Binary files a/ic_launcher-web.png and /dev/null differ diff --git a/import-summary.txt b/import-summary.txt new file mode 100644 index 0000000..e4a5889 --- /dev/null +++ b/import-summary.txt @@ -0,0 +1,67 @@ +ECLIPSE ANDROID PROJECT IMPORT SUMMARY +====================================== + +Ignored Files: +-------------- +The following files were *not* copied into the new Gradle project; you +should evaluate whether these are still needed in your project and if +so manually move them: + +* .DS_Store +* ic_launcher-web.png +* proguard-project.txt +* resource\ +* resource\131.mp3 + +Replaced Jars with Dependencies: +-------------------------------- +The importer recognized the following .jar files as third party +libraries and replaced them with Gradle dependencies instead. This has +the advantage that more explicit version information is known, and the +libraries can be updated automatically. However, it is possible that +the .jar file in your project was of an older version than the +dependency we picked, which could render the project not compileable. +You can disable the jar replacement in the import wizard and try again: + +android-support-v4.jar => com.android.support:support-v4:23.+ + +Moved Files: +------------ +Android Gradle projects use a different directory structure than ADT +Eclipse projects. Here's how the projects were restructured: + +* AndroidManifest.xml => app\src\main\AndroidManifest.xml +* jni\ => app\src\main\jni\ +* jni\decoder\java\ => app\src\main\java\ +* libs\armeabi-v7a\libsongstudio.so => app\src\main\jniLibs\armeabi-v7a\libsongstudio.so +* res\ => app\src\main\res\ +* src\ => app\src\main\java\ + +Missing Android Support Repository: +----------------------------------- +Some useful libraries, such as the Android Support Library, are +installed from a special Maven repository, which should be installed +via the SDK manager. + +It looks like this library is missing from your SDK installation at: +null + +To install it, open the SDK manager, and in the Extras category, +select "Android Support Repository". You may also want to install the +"Google Repository" if you want to use libraries like Google Play +Services. + +Next Steps: +----------- +You can now build the project. The Gradle project needs network +connectivity to download dependencies. + +Bugs: +----- +If for some reason your project does not build, and you determine that +it is due to a bug or limitation of the Eclipse to Gradle importer, +please file a bug at http://b.android.com with category +Component-Tools. + +(This import summary is for your information only, and can be deleted +after import once you are satisfied with the results.) diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar deleted file mode 100755 index aa0b1a5..0000000 Binary files a/libs/android-support-v4.jar and /dev/null differ diff --git a/libs/armeabi-v7a/libsongstudio.so b/libs/armeabi-v7a/libsongstudio.so deleted file mode 100755 index be58808..0000000 Binary files a/libs/armeabi-v7a/libsongstudio.so and /dev/null differ diff --git a/obj/local/armeabi-v7a/libffmpeg_decoder.a b/obj/local/armeabi-v7a/libffmpeg_decoder.a deleted file mode 100755 index bf27da5..0000000 Binary files a/obj/local/armeabi-v7a/libffmpeg_decoder.a and /dev/null differ diff --git a/obj/local/armeabi-v7a/libsongstudio.so b/obj/local/armeabi-v7a/libsongstudio.so deleted file mode 100755 index 3ab70ce..0000000 Binary files a/obj/local/armeabi-v7a/libsongstudio.so and /dev/null differ diff --git a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder.o b/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder.o deleted file mode 100755 index eca8b1c..0000000 Binary files a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder.o and /dev/null differ diff --git a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder.o.d b/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder.o.d deleted file mode 100755 index 1dabf91..0000000 --- a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder.o.d +++ /dev/null @@ -1,314 +0,0 @@ -obj/local/armeabi-v7a/objs/ffmpeg_decoder/./libffmpeg_decoder/accompany_decoder.o: \ - jni/decoder/./libffmpeg_decoder/accompany_decoder.cpp \ - jni/decoder/./libffmpeg_decoder/accompany_decoder.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_wchar_limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - jni/decoder/./libffmpeg_decoder/./../../common/CommonTools.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/page.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/avcodec.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/inttypes.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/version.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/avconfig.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/mem.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/error.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/mathematics.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/cpu.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/channel_layout.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/frame.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavcodec/version.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avformat.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavcodec/avcodec.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avio.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavformat/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/common.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/channel_layout.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/opt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/log.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/imgutils.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixdesc.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/mathematics.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/swscale.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/swresample.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/samplefmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/avutil.h - -jni/decoder/./libffmpeg_decoder/accompany_decoder.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_wchar_limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -jni/decoder/./libffmpeg_decoder/./../../common/CommonTools.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/page.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/avcodec.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/inttypes.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/version.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/avconfig.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/mem.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/error.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/mathematics.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/cpu.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/channel_layout.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/frame.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavcodec/version.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avformat.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavcodec/avcodec.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avio.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavformat/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/common.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/channel_layout.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/opt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/log.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/imgutils.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixdesc.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/mathematics.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/swscale.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/swresample.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/samplefmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/avutil.h: diff --git a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder_controller.o b/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder_controller.o deleted file mode 100755 index d262771..0000000 Binary files a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder_controller.o and /dev/null differ diff --git a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder_controller.o.d b/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder_controller.o.d deleted file mode 100755 index 96078c2..0000000 --- a/obj/local/armeabi-v7a/objs/ffmpeg_decoder/libffmpeg_decoder/accompany_decoder_controller.o.d +++ /dev/null @@ -1,350 +0,0 @@ -obj/local/armeabi-v7a/objs/ffmpeg_decoder/./libffmpeg_decoder/accompany_decoder_controller.o: \ - jni/decoder/./libffmpeg_decoder/accompany_decoder_controller.cpp \ - jni/decoder/./libffmpeg_decoder/accompany_decoder_controller.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_wchar_limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/ucontext.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/user.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/pathconf.h \ - jni/decoder/./libffmpeg_decoder/accompany_decoder.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/time.h \ - jni/decoder/./libffmpeg_decoder/./../../common/CommonTools.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/math.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/avcodec.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/inttypes.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/version.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/avconfig.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/mem.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/error.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/mathematics.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/cpu.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/channel_layout.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/frame.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavcodec/version.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avformat.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavcodec/avcodec.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avio.h \ - jni/decoder/../3rdparty/ffmpeg/include/libavformat/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/common.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/channel_layout.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/opt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/log.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/imgutils.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixdesc.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/mathematics.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/swscale.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/swresample.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/samplefmt.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/version.h \ - jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/avutil.h - -jni/decoder/./libffmpeg_decoder/accompany_decoder_controller.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_wchar_limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/ucontext.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/user.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/pathconf.h: - -jni/decoder/./libffmpeg_decoder/accompany_decoder.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/time.h: - -jni/decoder/./libffmpeg_decoder/./../../common/CommonTools.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/math.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/avcodec.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/inttypes.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/version.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/avconfig.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/mem.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/error.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/mathematics.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/cpu.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/channel_layout.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/frame.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavcodec/version.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/buffer.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/log.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavutil/common.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avformat.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavcodec/avcodec.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avio.h: - -jni/decoder/../3rdparty/ffmpeg/include/libavformat/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/common.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/channel_layout.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/opt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/log.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/imgutils.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixdesc.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/mathematics.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/swscale.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/swresample.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/samplefmt.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/version.h: - -jni/decoder/./libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/avutil.h: diff --git a/obj/local/armeabi-v7a/objs/songstudio/decoder/jni/Mp3Decoder.o b/obj/local/armeabi-v7a/objs/songstudio/decoder/jni/Mp3Decoder.o deleted file mode 100755 index 03fb3be..0000000 Binary files a/obj/local/armeabi-v7a/objs/songstudio/decoder/jni/Mp3Decoder.o and /dev/null differ diff --git a/obj/local/armeabi-v7a/objs/songstudio/decoder/jni/Mp3Decoder.o.d b/obj/local/armeabi-v7a/objs/songstudio/decoder/jni/Mp3Decoder.o.d deleted file mode 100755 index 3714cdb..0000000 --- a/obj/local/armeabi-v7a/objs/songstudio/decoder/jni/Mp3Decoder.o.d +++ /dev/null @@ -1,353 +0,0 @@ -obj/local/armeabi-v7a/objs/songstudio/./decoder/jni/Mp3Decoder.o: \ - jni/./decoder/jni/Mp3Decoder.cpp \ - jni/./decoder/jni/com_phuket_tour_decoder_Mp3Decoder.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - jni/./decoder/jni/../libffmpeg_decoder/accompany_decoder_controller.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_wchar_limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/ucontext.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/user.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/pathconf.h \ - jni/./decoder/jni/../libffmpeg_decoder/accompany_decoder.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/time.h \ - jni/./decoder/jni/../libffmpeg_decoder/./../../common/CommonTools.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/math.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/avcodec.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/3rdparty/ffmpeg/include/libavutil/common.h \ - /Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/inttypes.h \ - jni/3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/3rdparty/ffmpeg/include/libavutil/version.h \ - jni/3rdparty/ffmpeg/include/libavutil/avconfig.h \ - jni/3rdparty/ffmpeg/include/libavutil/mem.h \ - jni/3rdparty/ffmpeg/include/libavutil/error.h \ - jni/3rdparty/ffmpeg/include/libavutil/mathematics.h \ - jni/3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/3rdparty/ffmpeg/include/libavutil/intfloat.h \ - jni/3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h \ - jni/3rdparty/ffmpeg/include/libavutil/log.h \ - jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h \ - jni/3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/3rdparty/ffmpeg/include/libavutil/buffer.h \ - jni/3rdparty/ffmpeg/include/libavutil/cpu.h \ - jni/3rdparty/ffmpeg/include/libavutil/channel_layout.h \ - jni/3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/3rdparty/ffmpeg/include/libavutil/frame.h \ - jni/3rdparty/ffmpeg/include/libavcodec/version.h \ - jni/3rdparty/ffmpeg/include/libavutil/buffer.h \ - jni/3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/3rdparty/ffmpeg/include/libavutil/log.h \ - jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/version.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h \ - jni/3rdparty/ffmpeg/include/libavutil/common.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avformat.h \ - jni/3rdparty/ffmpeg/include/libavcodec/avcodec.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avio.h \ - jni/3rdparty/ffmpeg/include/libavformat/version.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/common.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/channel_layout.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/opt.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/rational.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/dict.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/log.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixfmt.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/imgutils.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixdesc.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/attributes.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/mathematics.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/swscale.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/version.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/swresample.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/samplefmt.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/version.h \ - jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/avutil.h - -jni/./decoder/jni/com_phuket_tour_decoder_Mp3Decoder.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -jni/./decoder/jni/../libffmpeg_decoder/accompany_decoder_controller.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/_wchar_limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/ucontext.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/user.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/pathconf.h: - -jni/./decoder/jni/../libffmpeg_decoder/accompany_decoder.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/time.h: - -jni/./decoder/jni/../libffmpeg_decoder/./../../common/CommonTools.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/math.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/avcodec.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/3rdparty/ffmpeg/include/libavutil/common.h: - -/Users/apple/soft/android/android-ndk-r10d/platforms/android-9/arch-arm/usr/include/inttypes.h: - -jni/3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/3rdparty/ffmpeg/include/libavutil/version.h: - -jni/3rdparty/ffmpeg/include/libavutil/avconfig.h: - -jni/3rdparty/ffmpeg/include/libavutil/mem.h: - -jni/3rdparty/ffmpeg/include/libavutil/error.h: - -jni/3rdparty/ffmpeg/include/libavutil/mathematics.h: - -jni/3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/3rdparty/ffmpeg/include/libavutil/intfloat.h: - -jni/3rdparty/ffmpeg/include/libavutil/intfloat_readwrite.h: - -jni/3rdparty/ffmpeg/include/libavutil/log.h: - -jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/3rdparty/ffmpeg/include/libavutil/old_pix_fmts.h: - -jni/3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/3rdparty/ffmpeg/include/libavutil/buffer.h: - -jni/3rdparty/ffmpeg/include/libavutil/cpu.h: - -jni/3rdparty/ffmpeg/include/libavutil/channel_layout.h: - -jni/3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/3rdparty/ffmpeg/include/libavutil/frame.h: - -jni/3rdparty/ffmpeg/include/libavcodec/version.h: - -jni/3rdparty/ffmpeg/include/libavutil/buffer.h: - -jni/3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/3rdparty/ffmpeg/include/libavutil/log.h: - -jni/3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/version.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavcodec/old_codec_ids.h: - -jni/3rdparty/ffmpeg/include/libavutil/common.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avformat.h: - -jni/3rdparty/ffmpeg/include/libavcodec/avcodec.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavformat/avio.h: - -jni/3rdparty/ffmpeg/include/libavformat/version.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/common.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/channel_layout.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/opt.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/rational.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/avutil.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/dict.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/log.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixfmt.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/samplefmt.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/imgutils.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/pixdesc.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/attributes.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libavutil/mathematics.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/swscale.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswscale/version.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/swresample.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/samplefmt.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/version.h: - -jni/./decoder/jni/../libffmpeg_decoder/../../3rdparty/ffmpeg/include/libswresample/../libavutil/avutil.h: diff --git a/proguard-project.txt b/proguard-project.txt deleted file mode 100755 index f2fe155..0000000 --- a/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/project.properties b/project.properties deleted file mode 100755 index 916037e..0000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-23 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..184e9c0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +include ':app'