提交ts合并的代码

umut0314 · Sep 29, 2020 · f03c664 · f03c664
1 parent c3db495
commit f03c664
Show file tree

Hide file tree

Showing 34 changed files with 220 additions and 601 deletions.
diff --git a/downloader/src/.DS_Store b/downloader/src/.DS_Store
diff --git a/downloader/src/main/.DS_Store b/downloader/src/main/.DS_Store
diff --git a/downloader/src/main/cpp/CMakeLists.txt b/downloader/src/main/cpp/CMakeLists.txt
@@ -41,13 +41,13 @@ include_directories(./include)
 # Gradle automatically packages shared libraries with your APK.
 
 add_library( # Sets the name of the library.
-        jeffmpeg
+        jeffmony
 
         # Sets the library as a shared library.
         SHARED
 
         # Provides a relative path to your source file(s).
-        jeffmony_ffmpeg.cpp)
+        jeffmony.cpp)
 
 # Searches for a specified prebuilt library and stores the path as a
 # variable. Because CMake includes system libraries in the search path by
@@ -67,7 +67,7 @@ find_library( # Sets the name of the path variable.
 # build script, prebuilt third-party libraries, or system libraries.
 
 target_link_libraries( # Specifies the target library.
-        jeffmpeg
+        jeffmony
         libavcodec
         libavfilter
         libavformat

diff --git a/downloader/src/main/cpp/include/libavutil/avconfig.h b/downloader/src/main/cpp/include/libavutil/avconfig.h
@@ -2,5 +2,5 @@
 #ifndef AVUTIL_AVCONFIG_H
 #define AVUTIL_AVCONFIG_H
 #define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
+#define AV_HAVE_FAST_UNALIGNED 0
 #endif /* AVUTIL_AVCONFIG_H */
diff --git a/downloader/src/main/cpp/include/libavutil/ffversion.h b/downloader/src/main/cpp/include/libavutil/ffversion.h
@@ -1,5 +1,5 @@
 /* Automatically generated by version.sh, do not manually edit! */
 #ifndef AVUTIL_FFVERSION_H
 #define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "n4.0.3"
+#define FFMPEG_VERSION "8e5ed1d"
 #endif /* AVUTIL_FFVERSION_H */
diff --git a/downloader/src/main/cpp/jeffmony_ffmpeg.cpp → downloader/src/main/cpp/jeffmony.cpp b/downloader/src/main/cpp/jeffmony_ffmpeg.cpp → downloader/src/main/cpp/jeffmony.cpp
@@ -24,8 +24,9 @@ extern "C" {
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_com_jeffmony_downloader_transcode_FFmpegUtils_remux(JNIEnv *env, jclass clazz,
-                                                         jstring input_path, jstring output_path, jint width, jint height) {
+Java_com_jeffmony_downloader_process_FFmpegRemuxUtils_remux(JNIEnv *env, jclass clazz,
+                                                            jstring input_path, jstring output_path,
+                                                            jint width, jint height) {
     if (use_log_report) {
         av_log_set_callback(ffp_log_callback_report);
     } else {
@@ -180,4 +181,9 @@ Java_com_jeffmony_downloader_transcode_FFmpegUtils_remux(JNIEnv *env, jclass cla
     }
 
     return 0;
+}extern "C"
+JNIEXPORT void JNICALL
+Java_com_jeffmony_downloader_process_FFmpegRemuxUtils_printVideoInfo(JNIEnv *env, jclass clazz,
+                                                                     jstring src_path) {
+    // TODO: implement printVideoInfo()
 }
diff --git a/downloader/src/main/java/com/jeffmony/downloader/merge/IM3U8MergeListener.java b/downloader/src/main/java/com/jeffmony/downloader/merge/IM3U8MergeListener.java
diff --git a/downloader/src/main/java/com/jeffmony/downloader/merge/M3U8MergeInfo.java b/downloader/src/main/java/com/jeffmony/downloader/merge/M3U8MergeInfo.java