修改cpp部分文件路径

app/CMakeLists.txt

@@ -17,11 +17,12 @@ add_library( # Sets the name of the library.
              SHARED
 
              # Provides a relative path to your source file(s).
+
+             src/main/cpp/ffmpeg/cmdutils.c
+             src/main/cpp/ffmpeg/ffmpeg.c
+             src/main/cpp/ffmpeg/ffmpeg_filter.c
+             src/main/cpp/ffmpeg/ffmpeg_opt.c
              src/main/cpp/ffmpeg_cmd.c
-             src/main/cpp/cmdutils.c
-             src/main/cpp/ffmpeg.c
-             src/main/cpp/ffmpeg_filter.c
-             src/main/cpp/ffmpeg_opt.c
              src/main/cpp/audio_player.c
              src/main/cpp/openSL_audio_player.c
              src/main/cpp/video_player.c

app/src/main/cpp/ffmpeg/ffmpeg_filter.c

@@ -20,7 +20,7 @@
 
 #include <stdint.h>
 
-#include "ffmpeg.h"
+#include "ffmpeg/ffmpeg.h"
 
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersink.h"

app/src/main/cpp/ffmpeg/ffmpeg_opt.c

@@ -20,8 +20,8 @@
 
 #include <stdint.h>
 
-#include "ffmpeg.h"
+#include "ffmpeg/ffmpeg.h"
-#include "cmdutils.h"
+#include "ffmpeg/cmdutils.h"
 
 #include "libavformat/avformat.h"
 
@@ -3106,7 +3106,7 @@ static int opt_progress(void *optctx, const char *opt, const char *arg)
 #define OFFSET(x) offsetof(OptionsContext, x)
 const OptionDef options[] = {
     /* main options */
-#include "cmdutils_common_opts.h"
+#include "ffmpeg/cmdutils_common_opts.h"
     { "f",              HAS_ARG | OPT_STRING | OPT_OFFSET |
                         OPT_INPUT | OPT_OUTPUT,                      { .off       = OFFSET(format) },
         "force format", "fmt" },

app/src/main/cpp/ffmpeg_cmd.c

@@ -1,5 +1,5 @@
 #include <jni.h>
-#include "ffmpeg.h"
+#include "ffmpeg/ffmpeg.h"
 
 JNIEXPORT jint JNICALL Java_com_frank_ffmpeg_FFmpegCmd_handle
 (JNIEnv *env, jclass obj, jobjectArray commands){

app/src/main/cpp/include/libavcodec/arm/mathops.h

@@ -23,7 +23,7 @@
 #define AVCODEC_ARM_MATHOPS_H
 
 #include <stdint.h>
-#include "config.h"
+#include "ffmpeg/config.h"
 #include "libavutil/common.h"
 
 #if HAVE_INLINE_ASM

app/src/main/cpp/include/libavcodec/mathops.h

@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "libavutil/common.h"
-#include "config.h"
+#include "ffmpeg/config.h"
 
 #define MAX_NEG_CROP 1024
 

app/src/main/cpp/include/libavformat/network.h

@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include "config.h"
+#include "ffmpeg/config.h"
 #include "libavutil/error.h"
 #include "os_support.h"
 #include "avio.h"

app/src/main/cpp/include/libavformat/os_support.h

@@ -27,7 +27,7 @@
  * miscellaneous OS support macros and functions.
  */
 
-#include "config.h"
+#include "ffmpeg/config.h"
 
 #include <sys/stat.h>
 

app/src/main/cpp/include/libavutil/arm/timer.h

@@ -22,7 +22,7 @@
 #define AVUTIL_ARM_TIMER_H
 
 #include <stdint.h>
-#include "config.h"
+#include "ffmpeg/config.h"
 
 #if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
 

app/src/main/cpp/include/libavutil/internal.h

@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <assert.h>
-#include "config.h"
+#include "ffmpeg/config.h"
 #include "attributes.h"
 #include "timer.h"
 #include "cpu.h"

app/src/main/cpp/include/libavutil/libm.h

@@ -26,7 +26,7 @@
 #define AVUTIL_LIBM_H
 
 #include <math.h>
-#include "config.h"
+#include "ffmpeg/config.h"
 #include "attributes.h"
 #include "intfloat.h"
 #include "mathematics.h"

app/src/main/cpp/include/libavutil/time_internal.h

@@ -20,7 +20,7 @@
 #define AVUTIL_TIME_INTERNAL_H
 
 #include <time.h>
-#include "config.h"
+#include "ffmpeg/config.h"
 
 #if !HAVE_GMTIME_R && !defined(gmtime_r)
 static inline struct tm *gmtime_r(const time_t* clock, struct tm *result)

app/src/main/cpp/include/libavutil/timer.h

@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include "config.h"
+#include "ffmpeg/config.h"
 
 #if HAVE_MACH_MACH_TIME_H
 #include <mach/mach_time.h>

app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java

@@ -78,6 +78,7 @@ public class VideoHandleActivity extends AppCompatActivity implements View.OnCli
         findViewById(R.id.btn_generate_gif).setVisibility(View.VISIBLE);
         findViewById(R.id.btn_screen_record).setVisibility(View.GONE);
         findViewById(R.id.btn_combine_video).setVisibility(View.VISIBLE);
+        findViewById(R.id.btn_play_video).setVisibility(View.VISIBLE);
     }
 
     private void setGone() {
@@ -89,6 +90,7 @@ public class VideoHandleActivity extends AppCompatActivity implements View.OnCli
         findViewById(R.id.btn_generate_gif).setVisibility(View.GONE);
         findViewById(R.id.btn_screen_record).setVisibility(View.GONE);
         findViewById(R.id.btn_combine_video).setVisibility(View.GONE);
+        findViewById(R.id.btn_play_video).setVisibility(View.GONE);
     }
 
     @Override

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">AudioHandle</string>
+    <string name="app_name">FFmpegAndroid</string>
     <string name="audio_transform">音频转码</string>
     <string name="audio_cut">音频剪切</string>
     <string name="audio_concat">音频合并</string>