Skip to content

Commit a51e1a7

Browse files
author
xulinkai
committed
fix some issues
1 parent 022a154 commit a51e1a7

33 files changed

Lines changed: 824 additions & 793 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# AndroidTranscoder
22
An example app of video transcoding based on FFmpeg
33

4-
![](https://github.com/bobcatkay/AndroidTranscoder/blob/master/device-2019-03-28-153252.png)
4+
![](https://github.com/bobcatkay/AndroidTranscoder/blob/master/device-2019-10-31-191928.jpg)

‎app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ dependencies {
6060
testImplementation 'junit:junit:4.12'
6161
androidTestImplementation 'com.android.support.test:runner:1.0.2'
6262
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
63+
implementation 'com.google.code.gson:gson:2.8.6'
6364
}

‎app/release/output.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

‎app/src/main/cpp/CMakeLists.txt‎

Lines changed: 4 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,15 @@
11
cmake_minimum_required(VERSION 3.4.1)
22

33
#add libavcodec
4-
add_library(libavcodec
4+
add_library(libffmpeg
55
SHARED
66
IMPORTED
77
)
88

99
SET_TARGET_PROPERTIES(
10-
libavcodec
10+
libffmpeg
1111
PROPERTIES IMPORTED_LOCATION
12-
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libavcodec.so
13-
)
14-
15-
#add libavfilter
16-
add_library(libavfilter
17-
SHARED
18-
IMPORTED
19-
)
20-
21-
SET_TARGET_PROPERTIES(
22-
libavfilter
23-
PROPERTIES IMPORTED_LOCATION
24-
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libavfilter.so
25-
)
26-
27-
28-
#add libavformat
29-
add_library(libavformat
30-
SHARED
31-
IMPORTED
32-
)
33-
34-
SET_TARGET_PROPERTIES(
35-
libavformat
36-
PROPERTIES IMPORTED_LOCATION
37-
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libavformat.so
38-
)
39-
40-
41-
#add libavutil
42-
add_library(libavutil
43-
SHARED
44-
IMPORTED
45-
)
46-
47-
SET_TARGET_PROPERTIES(
48-
libavutil
49-
PROPERTIES IMPORTED_LOCATION
50-
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libavutil.so
51-
)
52-
53-
54-
#add libpostproc
55-
add_library(libpostproc
56-
SHARED
57-
IMPORTED
58-
)
59-
60-
SET_TARGET_PROPERTIES(
61-
libpostproc
62-
PROPERTIES IMPORTED_LOCATION
63-
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libpostproc.so
64-
)
65-
66-
#add libswresample
67-
add_library(libswresample
68-
SHARED
69-
IMPORTED
70-
)
71-
72-
SET_TARGET_PROPERTIES(
73-
libswresample
74-
PROPERTIES IMPORTED_LOCATION
75-
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libswresample.so
76-
)
77-
78-
#add libswscale
79-
add_library(libswscale
80-
SHARED
81-
IMPORTED
82-
)
83-
84-
SET_TARGET_PROPERTIES(
85-
libswscale
86-
PROPERTIES IMPORTED_LOCATION
87-
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libswscale.so
12+
${PROJECT_SOURCE_DIR}/ffmpeg/prebuilt/${ANDROID_ABI}/libffmpeg.so
8813
)
8914

9015
include_directories(ffmpeg/)
@@ -103,11 +28,5 @@ find_library( # Sets the name of the path variable.
10328
target_link_libraries( # Specifies the target library.
10429
ffmpeg-cmd
10530

106-
libavcodec
107-
libswscale
108-
libswresample
109-
libpostproc
110-
libavutil
111-
libavformat
112-
libavfilter
31+
libffmpeg
11332
${log-lib})

0 commit comments

Comments
 (0)