Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Taner Sener
|
c293dd421b | ||
|
Taner Sener
|
d46a5e1e66 | ||
|
Taner Sener
|
a32f0067d4 | ||
|
Taner Sener
|
aead62b215 | ||
|
Taner Sener
|
b20376a785 | ||
|
Taner Sener
|
e0b4aacf92 | ||
|
Taner Sener
|
c461ea76d3 | ||
|
Taner Sener
|
ff1b1c4935 | ||
|
Taner Sener
|
28e52ed774 | ||
|
Taner Sener
|
b68ffc3053 |
@@ -1,33 +0,0 @@
|
||||
---
|
||||
name: Issue Template
|
||||
about: Create an issue to help us improve
|
||||
|
||||
---
|
||||
|
||||
**Description**
|
||||
Description of what the issue is about.
|
||||
|
||||
**Expected behavior**
|
||||
What you expected to happen.
|
||||
|
||||
**Current behavior**
|
||||
What happened.
|
||||
|
||||
**Screenshots**
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
**Logs**
|
||||
Post logs here or paste them to [Ghostbin](https://ghostbin.com) and insert the link here.
|
||||
|
||||
**Environment**
|
||||
- Platform: [e.g. Android/IOS]
|
||||
- Architecture: [arm-v7a, arm-v7a-neon, arm64-v8a, x86, x86_64, armv7, armv7s, arm64, i386, x86_64]
|
||||
- Version (if applicable) [e.g. v1.2]
|
||||
- Source branch (if applicable) [e.g. master, dev-v2.x]
|
||||
- Xcode version (if applicable) [e.g. 7.3.1, 9.0.1]
|
||||
- Cocoapods version (if applicable) [e.g. 1.2.1]
|
||||
- Android Studio version (if applicable) [e.g. 3.1]
|
||||
- Android NDK version (if applicable) [e.g. 16b, 17c]
|
||||
|
||||
**Other**
|
||||
Add any other context about the problem here.
|
||||
@@ -1,39 +1,34 @@
|
||||
# MobileFFmpeg [](https://gitter.im/mobile-ffmpeg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)   
|
||||
# MobileFFmpeg [](https://gitter.im/mobile-ffmpeg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)   
|
||||
|
||||
FFmpeg for Android and IOS
|
||||
|
||||
<img src="https://github.com/tanersener/mobile-ffmpeg/blob/dev-v3.x/docs/assets/mobile-ffmpeg-logo-v7.png" width="320">
|
||||
<img src="https://github.com/tanersener/mobile-ffmpeg/blob/dev-v2.x/docs/assets/mobile-ffmpeg-logo-v4.png" width="240">
|
||||
|
||||
### 1. Features
|
||||
- Use binaries available at `Github`/`JCenter`/`CocoaPods` or build your own version with external libraries you need
|
||||
- Supports
|
||||
- Both Android and IOS
|
||||
- FFmpeg `v3.4.x`, `v4.0.x` and `v4.1` releases
|
||||
- 27 external libraries
|
||||
- FFmpeg `v3.4.x` and `v4.0.x` releases
|
||||
- 24 external libraries
|
||||
|
||||
`chromaprint`, `fontconfig`, `freetype`, `fribidi`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libtheora`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `opencore-amr`, `opus`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `twolame`, `wavpack`
|
||||
`chromaprint`, `fontconfig`, `freetype`, `fribidi`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libtheora`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `opencore-amr`, `opus`, `shine`, `snappy`, `soxr`, `speex`, `wavpack`
|
||||
|
||||
- 4 external libraries with GPL license
|
||||
|
||||
`vid.stab`, `x264`, `x265`, `xvidcore`
|
||||
|
||||
- Exposes both FFmpeg library and MobileFFmpeg wrapper library capabilities
|
||||
- Exposes FFmpeg capabilities both from FFmpeg libraries and through MobileFFmpeg wrapper library
|
||||
- Creates shared libraries (.so for Android, .dylib for IOS)
|
||||
- Includes cross-compile instructions for 43 open-source libraries
|
||||
- Includes cross-compile instructions for 38 open-source libraries
|
||||
|
||||
`chromaprint`, `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `leptonica`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libsndfile`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `opus`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `tiff`, `twolame`, `vid.stab`, `wavpack`, `x264`, `x265`, `xvidcore`
|
||||
`chromaprint`, `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `opus`, `shine`, `snappy`, `soxr`, `speex`, `tiff`, `vid.stab`, `wavpack`, `x264`, `x265`, `xvidcore`
|
||||
|
||||
- Licensed under LGPL 3.0, can be customized to support GPL v3.0
|
||||
|
||||
#### 1.1 Android
|
||||
- Builds `arm-v7a`, `arm-v7a-neon`, `arm64-v8a`, `x86` and `x86_64` architectures
|
||||
- Supports `zlib` and `MediaCodec` system libraries
|
||||
- Supports `arm-v7a`, `arm-v7a-neon`, `arm64-v8a`, `x86` and `x86_64` architectures
|
||||
- Creates Android archive with .aar extension
|
||||
|
||||
#### 1.2 IOS
|
||||
- Builds `armv7`, `armv7s`, `arm64`, `i386` and `x86_64` architectures
|
||||
- Supports `bzip2`, `zlib` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox`, `AVFoundation` system frameworks
|
||||
- Camera and microphone access
|
||||
- Supports `armv7`, `armv7s`, `arm64`, `i386` and `x86_64` architectures
|
||||
- `ARC` enabled library
|
||||
- Built with `-fembed-bitcode` flag
|
||||
- Creates IOS shared/dynamic universal (fat) library
|
||||
@@ -42,62 +37,25 @@ FFmpeg for Android and IOS
|
||||
- Supports Xcode 7.3.1 or later
|
||||
|
||||
### 2. Using
|
||||
Binaries are available at [Github](https://github.com/tanersener/mobile-ffmpeg/releases), [JCenter](https://bintray.com/bintray/jcenter) and [CocoaPods](https://cocoapods.org).
|
||||
Prebuilt libraries are available at [Github](https://github.com/tanersener/mobile-ffmpeg/releases), [JCenter](https://bintray.com/bintray/jcenter) and [CocoaPods](https://cocoapods.org). Refer to [Using IOS Universal Binaries](https://github.com/tanersener/mobile-ffmpeg/wiki/Using-IOS-Universal-Binaries) guide to import IOS universal binaries released at [Github](https://github.com/tanersener/mobile-ffmpeg/releases).
|
||||
|
||||
Refer to [Using IOS Universal Binaries](https://github.com/tanersener/mobile-ffmpeg/wiki/Using-IOS-Universal-Binaries) guide to import IOS universal binaries released at [Github](https://github.com/tanersener/mobile-ffmpeg/releases).
|
||||
There are eight different prebuilt packages. Below you can see which external libraries are enabled in each of them.
|
||||
|
||||
There are eight different binary packages. Below you can see which system libraries and external libraries are enabled in each of them.
|
||||
| min | min-gpl | https | https-gpl | audio | video | full | full-gpl |
|
||||
| :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: |
|
||||
| - | vid.stab<sup>3</sup> <br/> x264<sup>1</sup> <br/> x265<sup>3</sup> <br/> xvidcore<sup>1</sup> | gnutls | gnutls <br/> vid.stab<sup>3</sup> <br/> x264<sup>1</sup> <br/> x265<sup>3</sup> <br/> xvidcore<sup>1</sup> | chromaprint<sup>3</sup> <br/> lame <br/> libilbc<sup>1</sup> <br/> libvorbis <br/> opencore-amr <br/> opus<sup>1</sup> <br/> shine <br/> soxr<sup>2</sup> <br/> speex <br/> wavpack | fontconfig <br/> freetype <br/> fribidi <br/> kvazaar <br/> libaom<sup>2</sup> <br/> libass <br/> libiconv <br/> libtheora <br/> libvpx <br/> snappy<sup>1</sup> | chromaprint<sup>3</sup> <br/> fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libaom<sup>2</sup> <br/> libass <br/> libiconv <br/> libilbc<sup>1</sup> <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus<sup>1</sup> <br/> shine <br/> snappy<sup>1</sup> <br/> soxr<sup>2</sup> <br/> speex <br/> wavpack | chromaprint<sup>3</sup> <br/> fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libaom<sup>2</sup> <br/> libass <br/> libiconv <br/> libilbc<sup>1</sup> <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus<sup>1</sup> <br/> shine <br/> snappy<sup>1</sup> <br/> soxr<sup>2</sup> <br/> speex <br/> vid.stab<sup>3</sup> <br/> wavpack <br/> x264<sup>1</sup> <br/> x265<sup>3</sup> <br/> xvidcore<sup>1</sup> |
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th align="center"></th>
|
||||
<th align="center">min</th>
|
||||
<th align="center">min-gpl</th>
|
||||
<th align="center">https</th>
|
||||
<th align="center">https-gpl</th>
|
||||
<th align="center">audio</th>
|
||||
<th align="center">video</th>
|
||||
<th align="center">full</th>
|
||||
<th align="center">full-gpl</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td align="center"><sup>external libraries</sup></td>
|
||||
<td align="center">-</td>
|
||||
<td align="center"><sup>vid.stab</sup><br><sup>x264</sup><br><sup>x265</sup><br><sup>xvidcore</sup></td>
|
||||
<td align="center"><sup>gmp</sup><br><sup>gnutls</sup></td>
|
||||
<td align="center"><sup>gmp</sup><br><sup>gnutls</sup><br><sup>vid.stab</sup><br><sup>x264</sup><br><sup>x265</sup><br><sup>xvidcore</sup></td>
|
||||
<td align="center"><sup>chromaprint</sup><br><sup>lame</sup><br><sup>libilbc</sup><br><sup>libvorbis</sup><br><sup>opencore-amr</sup><br><sup>opus</sup><br><sup>shine</sup><br><sup>soxr</sup><br><sup>speex</sup><br><sup>twolame</sup><br><sup>wavpack</sup></td>
|
||||
<td align="center"><sup>fontconfig</sup><br><sup>freetype</sup><br><sup>fribidi</sup><br><sup>kvazaar</sup><br><sup>libaom</sup><br><sup>libass</sup><br><sup>libiconv</sup><br><sup>libtheora</sup><br><sup>libvpx</sup><br><sup>libwebp</sup><br><sup>snappy</sup></td>
|
||||
<td align="center"><sup>chromaprint</sup><br><sup>fontconfig</sup><br><sup>freetype</sup><br><sup>fribidi</sup><br><sup>gmp</sup><br><sup>gnutls</sup><br><sup>kvazaar</sup><br><sup>lame</sup><br><sup>libaom</sup><br><sup>libass</sup><br><sup>libiconv</sup><br><sup>libilbc</sup><br><sup>libtheora</sup><br><sup>libvorbis</sup><br><sup>libvpx</sup><br><sup>libwebp</sup><br><sup>libxml2</sup><br><sup>opencore-amr</sup><br><sup>opus</sup><br><sup>sdl</sup><br><sup>shine</sup><br><sup>snappy</sup><br><sup>soxr</sup><br><sup>speex</sup><br><sup>tesseract</sup><br><sup>twolame</sup><br><sup>wavpack</sup></td>
|
||||
<td align="center"><sup>chromaprint</sup><br><sup>fontconfig</sup><br><sup>freetype</sup><br><sup>fribidi</sup><br><sup>gmp</sup><br><sup>gnutls</sup><br><sup>kvazaar</sup><br><sup>lame</sup><br><sup>libaom</sup><br><sup>libass</sup><br><sup>libiconv</sup><br><sup>libilbc</sup><br><sup>libtheora</sup><br><sup>libvorbis</sup><br><sup>libvpx</sup><br><sup>libwebp</sup><br><sup>libxml2</sup><br><sup>opencore-amr</sup><br><sup>opus</sup><br><sup>sdl</sup><br><sup>shine</sup><br><sup>snappy</sup><br><sup>soxr</sup><br><sup>speex</sup><br><sup>tesseract</sup><br><sup>twolame</sup><br><sup>vid.stab</sup><br><sup>wavpack</sup><br><sup>x264</sup><br><sup>x265</sup><br><sup>xvidcore</sup></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><sup>android system libraries</sup></td>
|
||||
<td align="center" colspan=8><sup>zlib</sup><br><sup>MediaCodec</sup></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><sup>ios system libraries</sup></td>
|
||||
<td align="center" colspan=8><sup>zlib</sup><br><sup>AudioToolbox</sup><br><sup>AVFoundation</sup><br><sup>CoreImage</sup><br><sup>VideoToolbox</sup><br><sup>bzip2</sup></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<sup>1</sup> - Supported since `v1.1`
|
||||
|
||||
- `libilbc`, `opus`, `snappy`, `x264` and `xvidcore` are supported since `v1.1`
|
||||
<sup>2</sup> - Supported since `v2.0`
|
||||
|
||||
- `libaom` and `soxr` are supported since `v2.0`
|
||||
|
||||
- `chromaprint`, `vid.stab` and `x265` are supported since `v2.1`
|
||||
|
||||
- `sdl`, `tesseract`, `twolame` external libraries; `zlib`, `MediaCodec` Android system libraries; `bzip2`, `zlib` IOS system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox`, `AVFoundation` IOS system frameworks are supported since `v3.0`
|
||||
<sup>3</sup> - Supported since `v2.1`
|
||||
|
||||
#### 2.1 Android
|
||||
1. Add MobileFFmpeg dependency from `jcenter()`
|
||||
```
|
||||
dependencies {`
|
||||
implementation 'com.arthenica:mobile-ffmpeg-full:3.1'
|
||||
implementation 'com.arthenica:mobile-ffmpeg-full:2.2'
|
||||
}
|
||||
```
|
||||
|
||||
@@ -105,39 +63,23 @@ There are eight different binary packages. Below you can see which system librar
|
||||
```
|
||||
import com.arthenica.mobileffmpeg.FFmpeg;
|
||||
|
||||
FFmpeg.execute("-i file1.mp4 -c:v mpeg4 file2.mp4");
|
||||
```
|
||||
int rc = FFmpeg.execute("-i file1.mp4 -c:v mpeg4 file2.mp4");
|
||||
|
||||
3. Check execution output.
|
||||
```
|
||||
int rc = FFmpeg.getLastReturnCode();
|
||||
String output = FFmpeg.getLastCommandOutput();
|
||||
|
||||
if (rc == RETURN_CODE_SUCCESS) {
|
||||
Log.i(Config.TAG, "Command execution completed successfully.");
|
||||
} else if (rc == RETURN_CODE_CANCEL) {
|
||||
Log.i(Config.TAG, "Command execution cancelled by user.");
|
||||
} else {
|
||||
Log.i(Config.TAG, String.format("Command execution failed with rc=%d and output=%s.", rc, output));
|
||||
Log.i(Config.TAG, String.format("Command execution failed with rc=%d.", rc));
|
||||
}
|
||||
```
|
||||
|
||||
4. Stop an ongoing operation.
|
||||
3. Stop an ongoing operation.
|
||||
```
|
||||
FFmpeg.cancel();
|
||||
```
|
||||
|
||||
5. Get media information for a file.
|
||||
```
|
||||
MediaInformation info = FFmpeg.getMediaInformation('<file path or uri>');
|
||||
```
|
||||
|
||||
6. List enabled external libraries.
|
||||
```
|
||||
List<String> externalLibraries = Config.getExternalLibraries();
|
||||
```
|
||||
|
||||
7. Enable log callback.
|
||||
4. Enable log callback.
|
||||
```
|
||||
Config.enableLogCallback(new LogCallback() {
|
||||
public void apply(LogMessage message) {
|
||||
@@ -146,7 +88,7 @@ There are eight different binary packages. Below you can see which system librar
|
||||
});
|
||||
```
|
||||
|
||||
8. Enable statistics callback.
|
||||
5. Enable statistics callback.
|
||||
```
|
||||
Config.enableStatisticsCallback(new StatisticsCallback() {
|
||||
public void apply(Statistics newStatistics) {
|
||||
@@ -155,12 +97,12 @@ There are eight different binary packages. Below you can see which system librar
|
||||
});
|
||||
```
|
||||
|
||||
9. Set log level.
|
||||
6. Set log level.
|
||||
```
|
||||
Config.setLogLevel(Level.AV_LOG_FATAL);
|
||||
```
|
||||
|
||||
10. Register custom fonts directory.
|
||||
7. Register custom fonts directory.
|
||||
```
|
||||
Config.setFontDirectory(this, "<folder with fonts>", Collections.EMPTY_MAP);
|
||||
```
|
||||
@@ -168,52 +110,30 @@ There are eight different binary packages. Below you can see which system librar
|
||||
#### 2.2 IOS
|
||||
1. Add MobileFFmpeg pod to your `Podfile`
|
||||
```
|
||||
pod 'mobile-ffmpeg-full', '~> 3.1'
|
||||
pod 'mobile-ffmpeg-full', '~> 2.2'
|
||||
```
|
||||
|
||||
2. Execute commands.
|
||||
2. Create and execute commands.
|
||||
```
|
||||
#import <mobileffmpeg/MobileFFmpeg.h>
|
||||
|
||||
[MobileFFmpeg execute: @"-i file1.mp4 -c:v mpeg4 file2.mp4"];
|
||||
```
|
||||
|
||||
3. Check execution output.
|
||||
```
|
||||
int rc = [MobileFFmpeg getLastReturnCode];
|
||||
NSString *output = [MobileFFmpeg getLastCommandOutput];
|
||||
int rc = [MobileFFmpeg execute: @"-i file1.mp4 -c:v mpeg4 file2.mp4"];
|
||||
|
||||
if (rc == RETURN_CODE_SUCCESS) {
|
||||
NSLog(@"Command execution completed successfully.\n");
|
||||
} else if (rc == RETURN_CODE_CANCEL) {
|
||||
NSLog(@"Command execution cancelled by user.\n");
|
||||
} else {
|
||||
NSLog(@"Command execution failed with rc=%d and output=%@.\n", rc, output);
|
||||
NSLog(@"Command execution failed with rc=%d.\n", rc);
|
||||
}
|
||||
```
|
||||
|
||||
4. Stop an ongoing operation.
|
||||
3. Stop an ongoing operation.
|
||||
```
|
||||
[MobileFFmpeg cancel];
|
||||
```
|
||||
|
||||
5. Get media information for a file.
|
||||
```
|
||||
MediaInformation *mediaInformation = [MobileFFmpeg getMediaInformation:@"<file path or uri>"];
|
||||
```
|
||||
|
||||
6. Record video and audio using IOS camera
|
||||
|
||||
```
|
||||
[MobileFFmpeg execute: @"-f avfoundation -r 30 -video_size 1280x720 -pixel_format bgr0 -i 0:0 -vcodec h264_videotoolbox -vsync 2 -f h264 -t 00:00:05 %@", recordFilePath];
|
||||
```
|
||||
|
||||
7. List enabled external libraries.
|
||||
```
|
||||
NASArray *externalLibraries = [MobileFFmpegConfig getExternalLibraries];
|
||||
```
|
||||
|
||||
8. Enable log callback.
|
||||
4. Enable log callback.
|
||||
```
|
||||
- (void)logCallback: (int)level :(NSString*)message {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
@@ -224,7 +144,7 @@ There are eight different binary packages. Below you can see which system librar
|
||||
[MobileFFmpegConfig setLogDelegate:self];
|
||||
```
|
||||
|
||||
9. Enable statistics callback.
|
||||
5. Enable statistics callback.
|
||||
```
|
||||
- (void)statisticsCallback:(Statistics *)newStatistics {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
@@ -235,12 +155,12 @@ There are eight different binary packages. Below you can see which system librar
|
||||
[MobileFFmpegConfig setStatisticsDelegate:self];
|
||||
```
|
||||
|
||||
10. Set log level.
|
||||
6. Set log level.
|
||||
```
|
||||
[MobileFFmpegConfig setLogLevel:AV_LOG_FATAL];
|
||||
```
|
||||
|
||||
11. Register custom fonts directory.
|
||||
7. Register custom fonts directory.
|
||||
```
|
||||
[MobileFFmpegConfig setFontDirectory:@"<folder with fonts>" with:nil];
|
||||
```
|
||||
@@ -259,14 +179,12 @@ execution, video encoding, accessing https, encoding audio, burning subtitles an
|
||||
|
||||
- `MobileFFmpeg v2.x` is the current stable, includes `FFmpeg v4.0.3`
|
||||
|
||||
- `MobileFFmpeg v3.x` is the next stable, includes `FFmpeg v4.1-10`
|
||||
|
||||
### 4. Building
|
||||
#### 4.1 Prerequisites
|
||||
1. Use your package manager (apt, yum, dnf, brew, etc.) to install the following packages.
|
||||
|
||||
```
|
||||
autoconf automake libtool pkg-config curl cmake gcc gperf texinfo yasm nasm bison autogen patch
|
||||
autoconf automake libtool pkg-config curl cmake gcc gperf texinfo yasm nasm bison
|
||||
```
|
||||
Some of these packages are not mandatory for the default build.
|
||||
Please visit [Android Prerequisites](https://github.com/tanersener/mobile-ffmpeg/wiki/Android-Prerequisites) and
|
||||
@@ -274,10 +192,11 @@ Please visit [Android Prerequisites](https://github.com/tanersener/mobile-ffmpeg
|
||||
|
||||
2. Android builds require these additional packages.
|
||||
- **Android SDK 5.0 Lollipop (API Level 21)** or later
|
||||
- **Android NDK r17c** or later with LLDB and CMake
|
||||
- **Android NDK r16b** or later with LLDB and CMake
|
||||
- **gradle 4.4** or later
|
||||
|
||||
3. IOS builds need these extra packages and tools.
|
||||
- **IOS SDK 8.0.x** or later
|
||||
- **IOS SDK 7.0.x** or later
|
||||
- **Xcode 7.3.1** or later
|
||||
- **Command Line Tools**
|
||||
|
||||
@@ -341,3 +260,4 @@ If you have any recommendations or ideas to improve it, please feel free to subm
|
||||
- [FFmpeg Wiki](https://trac.ffmpeg.org/wiki/WikiStart)
|
||||
- [FFmpeg License and Legal Considerations](https://ffmpeg.org/legal.html)
|
||||
- [FFmpeg External Library Licenses](https://www.ffmpeg.org/doxygen/4.0/md_LICENSE.html)
|
||||
|
||||
|
||||
+27
-64
@@ -36,27 +36,22 @@ LIBRARY_SNAPPY=24
|
||||
LIBRARY_SOXR=25
|
||||
LIBRARY_LIBAOM=26
|
||||
LIBRARY_CHROMAPRINT=27
|
||||
LIBRARY_TWOLAME=28
|
||||
LIBRARY_SDL=29
|
||||
LIBRARY_TESSERACT=30
|
||||
LIBRARY_GIFLIB=31
|
||||
LIBRARY_JPEG=32
|
||||
LIBRARY_LIBOGG=33
|
||||
LIBRARY_LIBPNG=34
|
||||
LIBRARY_LIBUUID=35
|
||||
LIBRARY_NETTLE=36
|
||||
LIBRARY_TIFF=37
|
||||
LIBRARY_EXPAT=38
|
||||
LIBRARY_SNDFILE=39
|
||||
LIBRARY_LEPTONICA=40
|
||||
LIBRARY_ZLIB=41
|
||||
LIBRARY_MEDIA_CODEC=42
|
||||
LIBRARY_GIFLIB=28
|
||||
LIBRARY_JPEG=29
|
||||
LIBRARY_LIBOGG=30
|
||||
LIBRARY_LIBPNG=31
|
||||
LIBRARY_LIBUUID=32
|
||||
LIBRARY_NETTLE=33
|
||||
LIBRARY_TIFF=34
|
||||
LIBRARY_EXPAT=35
|
||||
LIBRARY_ZLIB=36
|
||||
LIBRARY_MEDIA_CODEC=37
|
||||
|
||||
# ENABLE ARCH
|
||||
ENABLED_ARCHITECTURES=(1 1 1 1 1)
|
||||
|
||||
# ENABLE LIBRARIES
|
||||
ENABLED_LIBRARIES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
|
||||
ENABLED_LIBRARIES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
|
||||
|
||||
export BASEDIR=$(pwd)
|
||||
|
||||
@@ -87,8 +82,7 @@ When compilation ends an Android Archive (AAR) file is created with enabled plat
|
||||
|
||||
echo -e " -h, --help\t\t\tdisplay this help and exit"
|
||||
echo -e " -V, --version\t\t\tdisplay version information and exit"
|
||||
echo -e " -d, --debug\t\t\tbuild with debug information"
|
||||
echo -e " -S, --speed\t\t\toptimize for speed instead of size\n"
|
||||
echo -e " -d, --debug\t\t\tbuild with debug information\n"
|
||||
|
||||
echo -e "Licensing options:"
|
||||
|
||||
@@ -105,8 +99,8 @@ When compilation ends an Android Archive (AAR) file is created with enabled plat
|
||||
echo -e "Libraries:"
|
||||
|
||||
echo -e " --full\t\t\tenables all external libraries"
|
||||
echo -e " --enable-android-media-codec\tbuild with built-in Android MediaCodec support[no]"
|
||||
echo -e " --enable-android-zlib\t\tbuild with built-in zlib support[no]"
|
||||
echo -e " --enable-android-media-codec\tbuild with built-in Android MediaCodec [no]"
|
||||
echo -e " --enable-android-zlib\t\tbuild with built-in zlib [no]"
|
||||
echo -e " --enable-chromaprint\t\tbuild with chromaprint [no]"
|
||||
echo -e " --enable-fontconfig\t\tbuild with fontconfig [no]"
|
||||
echo -e " --enable-freetype\t\tbuild with freetype [no]"
|
||||
@@ -126,13 +120,10 @@ When compilation ends an Android Archive (AAR) file is created with enabled plat
|
||||
echo -e " --enable-libxml2\t\tbuild with libxml2 [no]"
|
||||
echo -e " --enable-opencore-amr\t\tbuild with opencore-amr [no]"
|
||||
echo -e " --enable-opus\t\t\tbuild with opus [no]"
|
||||
echo -e " --enable-sdl\t\t\tbuild with sdl [no]"
|
||||
echo -e " --enable-shine\t\tbuild with shine [no]"
|
||||
echo -e " --enable-snappy\t\tbuild with snappy [no]"
|
||||
echo -e " --enable-soxr\t\t\tbuild with soxr [no]"
|
||||
echo -e " --enable-speex\t\tbuild with speex [no]"
|
||||
echo -e " --enable-tesseract\t\tbuild with tesseract [no]"
|
||||
echo -e " --enable-twolame\t\tbuild with twolame [no]"
|
||||
echo -e " --enable-wavpack\t\tbuild with wavpack [no]\n"
|
||||
|
||||
echo -e "GPL libraries:"
|
||||
@@ -171,10 +162,6 @@ enable_debug() {
|
||||
export MOBILE_FFMPEG_DEBUG="-d"
|
||||
}
|
||||
|
||||
optimize_for_speed() {
|
||||
export MOBILE_FFMPEG_OPTIMIZED_FOR_SPEED="1"
|
||||
}
|
||||
|
||||
reconf_library() {
|
||||
RECONF_VARIABLE=$(echo "RECONF_$1" | sed "s/\-/\_/g")
|
||||
|
||||
@@ -288,9 +275,6 @@ set_library() {
|
||||
opus)
|
||||
ENABLED_LIBRARIES[LIBRARY_OPUS]=$2
|
||||
;;
|
||||
sdl)
|
||||
ENABLED_LIBRARIES[LIBRARY_SDL]=$2
|
||||
;;
|
||||
shine)
|
||||
ENABLED_LIBRARIES[LIBRARY_SHINE]=$2
|
||||
;;
|
||||
@@ -304,20 +288,6 @@ set_library() {
|
||||
speex)
|
||||
ENABLED_LIBRARIES[LIBRARY_SPEEX]=$2
|
||||
;;
|
||||
tesseract)
|
||||
ENABLED_LIBRARIES[LIBRARY_TESSERACT]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_LEPTONICA]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_LIBWEBP]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_GIFLIB]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_ZLIB]=$2
|
||||
set_library "tiff" $2
|
||||
set_library "libpng" $2
|
||||
;;
|
||||
twolame)
|
||||
ENABLED_LIBRARIES[LIBRARY_TWOLAME]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_SNDFILE]=$2
|
||||
;;
|
||||
wavpack)
|
||||
ENABLED_LIBRARIES[LIBRARY_WAVPACK]=$2
|
||||
;;
|
||||
@@ -330,16 +300,16 @@ set_library() {
|
||||
xvidcore)
|
||||
ENABLED_LIBRARIES[LIBRARY_XVIDCORE]=$2
|
||||
;;
|
||||
expat | giflib | jpeg | leptonica | libogg | libpng | libsndfile | libuuid)
|
||||
# THESE LIBRARIES ARE NOT ENABLED DIRECTLY
|
||||
tiff)
|
||||
ENABLED_LIBRARIES[LIBRARY_TIFF]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
|
||||
;;
|
||||
nettle)
|
||||
ENABLED_LIBRARIES[LIBRARY_NETTLE]=$2
|
||||
set_library "gmp" $2
|
||||
;;
|
||||
tiff)
|
||||
ENABLED_LIBRARIES[LIBRARY_TIFF]=$2
|
||||
ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
|
||||
giflib | jpeg | libogg | libpng | libuuid | expat)
|
||||
# THESE LIBRARIES ARE NOT ENABLED DIRECTLY
|
||||
;;
|
||||
*)
|
||||
print_unknown_library $1
|
||||
@@ -417,7 +387,7 @@ print_enabled_libraries() {
|
||||
let enabled=0;
|
||||
|
||||
# FIRST BUILT-IN LIBRARIES
|
||||
for library in {41..42}
|
||||
for library in {36..37}
|
||||
do
|
||||
if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then
|
||||
if [[ ${enabled} -ge 1 ]]; then
|
||||
@@ -429,7 +399,7 @@ print_enabled_libraries() {
|
||||
done
|
||||
|
||||
# THEN EXTERNAL LIBRARIES
|
||||
for library in {0..30}
|
||||
for library in {0..27}
|
||||
do
|
||||
if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then
|
||||
if [[ ${enabled} -ge 1 ]]; then
|
||||
@@ -469,10 +439,6 @@ EOF
|
||||
|
||||
GPL_ENABLED="no"
|
||||
|
||||
DETECTED_NDK_VERSION=$(grep -Eo Revision.* ${ANDROID_NDK_ROOT}/source.properties | sed 's/Revision//g;s/=//g;s/ //g')
|
||||
|
||||
echo -e "\nINFO: Using Android NDK v${DETECTED_NDK_VERSION} provided at ${ANDROID_NDK_ROOT}\n" 1>>${BASEDIR}/build.log 2>&1
|
||||
|
||||
while [ ! $# -eq 0 ]
|
||||
do
|
||||
|
||||
@@ -493,9 +459,6 @@ do
|
||||
-d | --debug)
|
||||
enable_debug
|
||||
;;
|
||||
-S | --speed)
|
||||
optimize_for_speed
|
||||
;;
|
||||
--reconf-*)
|
||||
CONF_LIBRARY=`echo $1 | sed -e 's/^--[A-Za-z]*-//g'`
|
||||
|
||||
@@ -507,7 +470,7 @@ do
|
||||
rebuild_library ${BUILD_LIBRARY}
|
||||
;;
|
||||
--full)
|
||||
for library in {0..42}
|
||||
for library in {0..37}
|
||||
do
|
||||
if [[ $library -ne 18 ]] && [[ $library -ne 19 ]] && [[ $library -ne 20 ]] && [[ $library -ne 21 ]]; then
|
||||
enable_library $(get_library_name $library)
|
||||
@@ -590,17 +553,17 @@ do
|
||||
mkdir -p ${BASEDIR}/prebuilt/android-cpp-shared/${TOOLCHAIN_ARCH}
|
||||
|
||||
if [[ $run_arch -eq 0 ]] || [[ $run_arch -eq 1 ]]; then
|
||||
cp ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/$(get_target_host)/lib/armv7-a/libc++_shared.so ${BASEDIR}/prebuilt/android-cpp-shared/${TOOLCHAIN_ARCH} 1>>${BASEDIR}/build.log 2>&1
|
||||
cp ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/$(get_target_host)/lib/armv7-a/libc++_shared.so ${BASEDIR}/prebuilt/android-cpp-shared/${TOOLCHAIN_ARCH} 1>>${BASEDIR}/build.log 2>&1
|
||||
elif [[ $run_arch -eq 4 ]]; then
|
||||
cp ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/$(get_target_host)/lib64/libc++_shared.so ${BASEDIR}/prebuilt/android-cpp-shared/${TOOLCHAIN_ARCH} 1>>${BASEDIR}/build.log 2>&1
|
||||
cp ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/$(get_target_host)/lib64/libc++_shared.so ${BASEDIR}/prebuilt/android-cpp-shared/${TOOLCHAIN_ARCH} 1>>${BASEDIR}/build.log 2>&1
|
||||
else
|
||||
cp ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/$(get_target_host)/lib/libc++_shared.so ${BASEDIR}/prebuilt/android-cpp-shared/${TOOLCHAIN_ARCH} 1>>${BASEDIR}/build.log 2>&1
|
||||
cp ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/$(get_target_host)/lib/libc++_shared.so ${BASEDIR}/prebuilt/android-cpp-shared/${TOOLCHAIN_ARCH} 1>>${BASEDIR}/build.log 2>&1
|
||||
fi
|
||||
|
||||
. ${BASEDIR}/build/main-android.sh "${ENABLED_LIBRARIES[@]}" || exit 1
|
||||
|
||||
# CLEAR FLAGS
|
||||
for library in {1..43}
|
||||
for library in {1..38}
|
||||
do
|
||||
library_name=$(get_library_name $((library - 1)))
|
||||
unset $(echo "OK_${library_name}" | sed "s/\-/\_/g")
|
||||
@@ -655,7 +618,7 @@ if [[ ! -z ${ANDROID_ARCHITECTURES} ]]; then
|
||||
|
||||
echo -e -n "\n\nCreating Android archive under prebuilt/android-aar: "
|
||||
|
||||
./gradlew clean build 1>>${BASEDIR}/build.log 2>&1
|
||||
gradle clean build 1>>${BASEDIR}/build.log 2>&1
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo -e "failed\n"
|
||||
|
||||
@@ -38,7 +38,7 @@ PROJECT_NAME = "MobileFFmpeg Android API"
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = 3.1
|
||||
PROJECT_NUMBER = 2.2
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer a
|
||||
|
||||
@@ -2,16 +2,14 @@ apply plugin: 'com.android.library'
|
||||
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 27
|
||||
versionCode 210310
|
||||
versionName "3.1"
|
||||
versionCode 22
|
||||
versionName "2.2"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
project.archivesBaseName = "mobile-ffmpeg"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
@@ -25,10 +23,6 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
testOptions {
|
||||
unitTests.returnDefaultValues = true
|
||||
}
|
||||
|
||||
libraryVariants.all { variant ->
|
||||
variant.outputs.all { output ->
|
||||
if (outputFile != null && outputFileName.endsWith('.aar')) {
|
||||
|
||||
@@ -8,7 +8,7 @@ buildscript {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.2.1'
|
||||
classpath 'com.android.tools.build:gradle:3.1.4'
|
||||
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
|
||||
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
|
||||
}
|
||||
|
||||
@@ -1026,7 +1026,7 @@ static int init_report(const char *env)
|
||||
av_free(key);
|
||||
}
|
||||
|
||||
av_bprint_init(&filename, 0, AV_BPRINT_SIZE_AUTOMATIC);
|
||||
av_bprint_init(&filename, 0, 1);
|
||||
expand_filename_template(&filename,
|
||||
av_x_if_null(filename_template, "%p-%t.log"), tm);
|
||||
av_free(filename_template);
|
||||
@@ -1420,16 +1420,6 @@ static void print_codec(const AVCodec *c)
|
||||
AV_CODEC_CAP_SLICE_THREADS |
|
||||
AV_CODEC_CAP_AUTO_THREADS))
|
||||
printf("threads ");
|
||||
if (c->capabilities & AV_CODEC_CAP_AVOID_PROBING)
|
||||
printf("avoidprobe ");
|
||||
if (c->capabilities & AV_CODEC_CAP_INTRA_ONLY)
|
||||
printf("intraonly ");
|
||||
if (c->capabilities & AV_CODEC_CAP_LOSSLESS)
|
||||
printf("lossless ");
|
||||
if (c->capabilities & AV_CODEC_CAP_HARDWARE)
|
||||
printf("hardware ");
|
||||
if (c->capabilities & AV_CODEC_CAP_HYBRID)
|
||||
printf("hybrid ");
|
||||
if (!c->capabilities)
|
||||
printf("none");
|
||||
printf("\n");
|
||||
@@ -1450,17 +1440,6 @@ static void print_codec(const AVCodec *c)
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
if (avcodec_get_hw_config(c, 0)) {
|
||||
printf(" Supported hardware devices: ");
|
||||
for (int i = 0;; i++) {
|
||||
const AVCodecHWConfig *config = avcodec_get_hw_config(c, i);
|
||||
if (!config)
|
||||
break;
|
||||
printf("%s ", av_hwdevice_get_type_name(config->device_type));
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
if (c->supported_framerates) {
|
||||
const AVRational *fps = c->supported_framerates;
|
||||
|
||||
@@ -1962,10 +1941,7 @@ static void show_help_bsf(const char *name)
|
||||
{
|
||||
const AVBitStreamFilter *bsf = av_bsf_get_by_name(name);
|
||||
|
||||
if (!name) {
|
||||
av_log(NULL, AV_LOG_ERROR, "No bitstream filter name specified.\n");
|
||||
return;
|
||||
} else if (!bsf) {
|
||||
if (!bsf) {
|
||||
av_log(NULL, AV_LOG_ERROR, "Unknown bit stream filter '%s'.\n", name);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -140,14 +140,8 @@ const char *const forced_keyframes_const_names[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
typedef struct BenchmarkTimeStamps {
|
||||
int64_t real_usec;
|
||||
int64_t user_usec;
|
||||
int64_t sys_usec;
|
||||
} BenchmarkTimeStamps;
|
||||
|
||||
static void do_video_stats(OutputStream *ost, int frame_size);
|
||||
static BenchmarkTimeStamps get_benchmark_time_stamps(void);
|
||||
static int64_t getutime(void);
|
||||
static int64_t getmaxrss(void);
|
||||
static int ifilter_has_all_input_formats(FilterGraph *fg);
|
||||
|
||||
@@ -159,7 +153,7 @@ static int64_t decode_error_stat[2];
|
||||
|
||||
static int want_sdp = 1;
|
||||
|
||||
static BenchmarkTimeStamps current_time;
|
||||
static int current_time;
|
||||
AVIOContext *progress_avio = NULL;
|
||||
|
||||
static uint8_t *subtitle_out;
|
||||
@@ -682,7 +676,7 @@ static void abort_codec_experimental(AVCodec *c, int encoder)
|
||||
static void update_benchmark(const char *fmt, ...)
|
||||
{
|
||||
if (do_benchmark_all) {
|
||||
BenchmarkTimeStamps t = get_benchmark_time_stamps();
|
||||
int64_t t = getutime();
|
||||
va_list va;
|
||||
char buf[1024];
|
||||
|
||||
@@ -690,11 +684,7 @@ static void update_benchmark(const char *fmt, ...)
|
||||
va_start(va, fmt);
|
||||
vsnprintf(buf, sizeof(buf), fmt, va);
|
||||
va_end(va);
|
||||
av_log(NULL, AV_LOG_INFO,
|
||||
"bench: %8" PRIu64 " user %8" PRIu64 " sys %8" PRIu64 " real %s \n",
|
||||
t.user_usec - current_time.user_usec,
|
||||
t.sys_usec - current_time.sys_usec,
|
||||
t.real_usec - current_time.real_usec, buf);
|
||||
av_log(NULL, AV_LOG_INFO, "bench: %8"PRIu64" %s \n", t - current_time, buf);
|
||||
}
|
||||
current_time = t;
|
||||
}
|
||||
@@ -747,11 +737,11 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
|
||||
if (ret < 0)
|
||||
exit_program(1);
|
||||
}
|
||||
ret = av_packet_make_refcounted(pkt);
|
||||
ret = av_packet_ref(&tmp_pkt, pkt);
|
||||
if (ret < 0)
|
||||
exit_program(1);
|
||||
av_packet_move_ref(&tmp_pkt, pkt);
|
||||
av_fifo_generic_write(ost->muxing_queue, &tmp_pkt, sizeof(tmp_pkt), NULL);
|
||||
av_packet_unref(pkt);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -795,7 +785,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
|
||||
- FFMIN3(pkt->pts, pkt->dts, ost->last_mux_dts + 1)
|
||||
- FFMAX3(pkt->pts, pkt->dts, ost->last_mux_dts + 1);
|
||||
}
|
||||
if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) &&
|
||||
if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) &&
|
||||
pkt->dts != AV_NOPTS_VALUE &&
|
||||
!(st->codecpar->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) &&
|
||||
ost->last_mux_dts != AV_NOPTS_VALUE) {
|
||||
@@ -1144,7 +1134,7 @@ static void do_video_out(OutputFile *of,
|
||||
format_video_sync != VSYNC_PASSTHROUGH &&
|
||||
format_video_sync != VSYNC_DROP) {
|
||||
if (delta0 < -0.6) {
|
||||
av_log(NULL, AV_LOG_VERBOSE, "Past duration %f too large\n", -delta0);
|
||||
av_log(NULL, AV_LOG_WARNING, "Past duration %f too large\n", -delta0);
|
||||
} else
|
||||
av_log(NULL, AV_LOG_DEBUG, "Clipping frame in rate conversion by %f\n", -delta0);
|
||||
sync_ipts = ost->sync_opts;
|
||||
@@ -1259,12 +1249,8 @@ static void do_video_out(OutputFile *of,
|
||||
in_picture->quality = enc->global_quality;
|
||||
in_picture->pict_type = 0;
|
||||
|
||||
if (ost->forced_kf_ref_pts == AV_NOPTS_VALUE &&
|
||||
in_picture->pts != AV_NOPTS_VALUE)
|
||||
ost->forced_kf_ref_pts = in_picture->pts;
|
||||
|
||||
pts_time = in_picture->pts != AV_NOPTS_VALUE ?
|
||||
(in_picture->pts - ost->forced_kf_ref_pts) * av_q2d(enc->time_base) : NAN;
|
||||
in_picture->pts * av_q2d(enc->time_base) : NAN;
|
||||
if (ost->forced_kf_index < ost->forced_kf_count &&
|
||||
in_picture->pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
|
||||
ost->forced_kf_index++;
|
||||
@@ -1797,7 +1783,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
|
||||
|
||||
vid = 0;
|
||||
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC);
|
||||
av_bprint_init(&buf_script, 0, AV_BPRINT_SIZE_AUTOMATIC);
|
||||
av_bprint_init(&buf_script, 0, 1);
|
||||
for (i = 0; i < nb_output_streams; i++) {
|
||||
float q = -1;
|
||||
ost = output_streams[i];
|
||||
@@ -1818,7 +1804,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
|
||||
av_bprintf(&buf, "frame=%5d fps=%3.*f q=%3.1f ",
|
||||
frame_number, fps < 9.95, fps, q);
|
||||
av_bprintf(&buf_script, "frame=%d\n", frame_number);
|
||||
av_bprintf(&buf_script, "fps=%.2f\n", fps);
|
||||
av_bprintf(&buf_script, "fps=%.1f\n", fps);
|
||||
av_bprintf(&buf_script, "stream_%d_%d_q=%.1f\n",
|
||||
ost->file_index, ost->index, q);
|
||||
if (is_last_report)
|
||||
@@ -1902,11 +1888,9 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
|
||||
if (total_size < 0) av_bprintf(&buf_script, "total_size=N/A\n");
|
||||
else av_bprintf(&buf_script, "total_size=%"PRId64"\n", total_size);
|
||||
if (pts == AV_NOPTS_VALUE) {
|
||||
av_bprintf(&buf_script, "out_time_us=N/A\n");
|
||||
av_bprintf(&buf_script, "out_time_ms=N/A\n");
|
||||
av_bprintf(&buf_script, "out_time=N/A\n");
|
||||
} else {
|
||||
av_bprintf(&buf_script, "out_time_us=%"PRId64"\n", pts);
|
||||
av_bprintf(&buf_script, "out_time_ms=%"PRId64"\n", pts);
|
||||
av_bprintf(&buf_script, "out_time=%s%02d:%02d:%02d.%06d\n",
|
||||
hours_sign, hours, mins, secs, us);
|
||||
@@ -2218,12 +2202,10 @@ static void check_decode_result(InputStream *ist, int *got_output, int ret)
|
||||
if (ret < 0 && exit_on_error)
|
||||
exit_program(1);
|
||||
|
||||
if (*got_output && ist) {
|
||||
if (exit_on_error && *got_output && ist) {
|
||||
if (ist->decoded_frame->decode_error_flags || (ist->decoded_frame->flags & AV_FRAME_FLAG_CORRUPT)) {
|
||||
av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING,
|
||||
"%s: corrupt decoded frame in stream %d\n", input_files[ist->file_index]->ctx->url, ist->st->index);
|
||||
if (exit_on_error)
|
||||
exit_program(1);
|
||||
av_log(NULL, AV_LOG_FATAL, "%s: corrupt decoded frame in stream %d\n", input_files[ist->file_index]->ctx->url, ist->st->index);
|
||||
exit_program(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2826,7 +2808,6 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
|
||||
ist->dts = ist->next_dts;
|
||||
switch (ist->dec_ctx->codec_type) {
|
||||
case AVMEDIA_TYPE_AUDIO:
|
||||
av_assert1(pkt->duration >= 0);
|
||||
if (ist->dec_ctx->sample_rate) {
|
||||
ist->next_dts += ((int64_t)AV_TIME_BASE * ist->dec_ctx->frame_size) /
|
||||
ist->dec_ctx->sample_rate;
|
||||
@@ -3186,13 +3167,7 @@ static int init_output_stream_streamcopy(OutputStream *ost)
|
||||
"Error setting up codec context options.\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = avcodec_parameters_from_context(par_src, ost->enc_ctx);
|
||||
if (ret < 0) {
|
||||
av_log(NULL, AV_LOG_FATAL,
|
||||
"Error getting reference codec parameters.\n");
|
||||
return ret;
|
||||
}
|
||||
avcodec_parameters_from_context(par_src, ost->enc_ctx);
|
||||
|
||||
if (!codec_tag) {
|
||||
unsigned int codec_tag_tmp;
|
||||
@@ -3520,12 +3495,6 @@ static int init_output_stream_encode(OutputStream *ost)
|
||||
enc_ctx->bits_per_raw_sample = frame_bits_per_raw_sample;
|
||||
}
|
||||
|
||||
if (ost->top_field_first == 0) {
|
||||
enc_ctx->field_order = AV_FIELD_BB;
|
||||
} else if (ost->top_field_first == 1) {
|
||||
enc_ctx->field_order = AV_FIELD_TT;
|
||||
}
|
||||
|
||||
if (ost->forced_keyframes) {
|
||||
if (!strncmp(ost->forced_keyframes, "expr:", 5)) {
|
||||
ret = av_expr_parse(&ost->forced_keyframes_pexpr, ost->forced_keyframes+5,
|
||||
@@ -3612,23 +3581,6 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
if (ist && ist->dec->type == AVMEDIA_TYPE_SUBTITLE && ost->enc->type == AVMEDIA_TYPE_SUBTITLE) {
|
||||
int input_props = 0, output_props = 0;
|
||||
AVCodecDescriptor const *input_descriptor =
|
||||
avcodec_descriptor_get(dec->codec_id);
|
||||
AVCodecDescriptor const *output_descriptor =
|
||||
avcodec_descriptor_get(ost->enc_ctx->codec_id);
|
||||
if (input_descriptor)
|
||||
input_props = input_descriptor->props & (AV_CODEC_PROP_TEXT_SUB | AV_CODEC_PROP_BITMAP_SUB);
|
||||
if (output_descriptor)
|
||||
output_props = output_descriptor->props & (AV_CODEC_PROP_TEXT_SUB | AV_CODEC_PROP_BITMAP_SUB);
|
||||
if (input_props && output_props && input_props != output_props) {
|
||||
snprintf(error, error_len,
|
||||
"Subtitle encoding currently only possible from text to text "
|
||||
"or bitmap to bitmap");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
}
|
||||
|
||||
if ((ret = avcodec_open2(ost->enc_ctx, codec, &ost->encoder_opts)) < 0) {
|
||||
if (ret == AVERROR_EXPERIMENTAL)
|
||||
@@ -4464,11 +4416,9 @@ static int process_input(int file_index)
|
||||
if (ist->discard)
|
||||
goto discard_packet;
|
||||
|
||||
if (pkt.flags & AV_PKT_FLAG_CORRUPT) {
|
||||
av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING,
|
||||
"%s: corrupt input packet in stream %d\n", is->url, pkt.stream_index);
|
||||
if (exit_on_error)
|
||||
exit_program(1);
|
||||
if (exit_on_error && (pkt.flags & AV_PKT_FLAG_CORRUPT)) {
|
||||
av_log(NULL, AV_LOG_FATAL, "%s: corrupt input packet in stream %d\n", is->url, pkt.stream_index);
|
||||
exit_program(1);
|
||||
}
|
||||
|
||||
if (debug_ts) {
|
||||
@@ -4903,30 +4853,23 @@ static int transcode(void)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static BenchmarkTimeStamps get_benchmark_time_stamps(void)
|
||||
|
||||
static int64_t getutime(void)
|
||||
{
|
||||
BenchmarkTimeStamps time_stamps = { av_gettime_relative() };
|
||||
#if HAVE_GETRUSAGE
|
||||
struct rusage rusage;
|
||||
|
||||
getrusage(RUSAGE_SELF, &rusage);
|
||||
time_stamps.user_usec =
|
||||
(rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
|
||||
time_stamps.sys_usec =
|
||||
(rusage.ru_stime.tv_sec * 1000000LL) + rusage.ru_stime.tv_usec;
|
||||
return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
|
||||
#elif HAVE_GETPROCESSTIMES
|
||||
HANDLE proc;
|
||||
FILETIME c, e, k, u;
|
||||
proc = GetCurrentProcess();
|
||||
GetProcessTimes(proc, &c, &e, &k, &u);
|
||||
time_stamps.user_usec =
|
||||
((int64_t)u.dwHighDateTime << 32 | u.dwLowDateTime) / 10;
|
||||
time_stamps.sys_usec =
|
||||
((int64_t)k.dwHighDateTime << 32 | k.dwLowDateTime) / 10;
|
||||
return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10;
|
||||
#else
|
||||
time_stamps.user_usec = time_stamps.sys_usec = 0;
|
||||
return av_gettime_relative();
|
||||
#endif
|
||||
return time_stamps;
|
||||
}
|
||||
|
||||
static int64_t getmaxrss(void)
|
||||
@@ -4994,7 +4937,7 @@ void cancel_operation()
|
||||
int execute(int argc, char **argv)
|
||||
{
|
||||
int i, ret;
|
||||
BenchmarkTimeStamps ti;
|
||||
int64_t ti;
|
||||
|
||||
int savedCode = setjmp(ex_buf__);
|
||||
if (savedCode == 0) {
|
||||
@@ -5051,18 +4994,12 @@ int execute(int argc, char **argv)
|
||||
want_sdp = 0;
|
||||
}
|
||||
|
||||
current_time = ti = get_benchmark_time_stamps();
|
||||
current_time = ti = getutime();
|
||||
if (transcode() < 0)
|
||||
exit_program(1);
|
||||
ti = getutime() - ti;
|
||||
if (do_benchmark) {
|
||||
int64_t utime, stime, rtime;
|
||||
current_time = get_benchmark_time_stamps();
|
||||
utime = current_time.user_usec - ti.user_usec;
|
||||
stime = current_time.sys_usec - ti.sys_usec;
|
||||
rtime = current_time.real_usec - ti.real_usec;
|
||||
av_log(NULL, AV_LOG_INFO,
|
||||
"bench: utime=%0.3fs stime=%0.3fs rtime=%0.3fs\n",
|
||||
utime / 1000000.0, stime / 1000000.0, rtime / 1000000.0);
|
||||
av_log(NULL, AV_LOG_INFO, "bench: utime=%0.3fs\n", ti / 1000000.0);
|
||||
}
|
||||
av_log(NULL, AV_LOG_DEBUG, "%"PRIu64" frames successfully decoded, %"PRIu64" decoding errors\n",
|
||||
decode_error_stat[0], decode_error_stat[1]);
|
||||
|
||||
@@ -496,7 +496,6 @@ typedef struct OutputStream {
|
||||
AVRational frame_aspect_ratio;
|
||||
|
||||
/* forced key frames */
|
||||
int64_t forced_kf_ref_pts;
|
||||
int64_t *forced_kf_pts;
|
||||
int forced_kf_count;
|
||||
int forced_kf_index;
|
||||
|
||||
@@ -73,7 +73,6 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCod
|
||||
if (codec && codec->pix_fmts) {
|
||||
const enum AVPixelFormat *p = codec->pix_fmts;
|
||||
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(target);
|
||||
//FIXME: This should check for AV_PIX_FMT_FLAG_ALPHA after PAL8 pixel format without alpha is implemented
|
||||
int has_alpha = desc ? desc->nb_components % 2 == 0 : 0;
|
||||
enum AVPixelFormat best= AV_PIX_FMT_NONE;
|
||||
|
||||
@@ -783,7 +782,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||
sar = ifilter->sample_aspect_ratio;
|
||||
if(!sar.den)
|
||||
sar = (AVRational){0,1};
|
||||
av_bprint_init(&args, 0, AV_BPRINT_SIZE_AUTOMATIC);
|
||||
av_bprint_init(&args, 0, 1);
|
||||
av_bprintf(&args,
|
||||
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:"
|
||||
"pixel_aspect=%d/%d:sws_param=flags=%d",
|
||||
|
||||
@@ -910,14 +910,13 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
|
||||
|
||||
static void assert_file_overwrite(const char *filename)
|
||||
{
|
||||
const char *proto_name = avio_find_protocol_name(filename);
|
||||
|
||||
if (file_overwrite && no_file_overwrite) {
|
||||
fprintf(stderr, "Error, both -y and -n supplied. Exiting.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
|
||||
if (!file_overwrite) {
|
||||
const char *proto_name = avio_find_protocol_name(filename);
|
||||
if (proto_name && !strcmp(proto_name, "file") && avio_check(filename, 0) == 0) {
|
||||
if (stdin_interaction && !no_file_overwrite) {
|
||||
fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
|
||||
@@ -936,19 +935,6 @@ static void assert_file_overwrite(const char *filename)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (proto_name && !strcmp(proto_name, "file")) {
|
||||
for (int i = 0; i < nb_input_files; i++) {
|
||||
InputFile *file = input_files[i];
|
||||
if (file->ctx->iformat->flags & AVFMT_NOFILE)
|
||||
continue;
|
||||
if (!strcmp(filename, file->ctx->url)) {
|
||||
av_log(NULL, AV_LOG_FATAL, "Output %s same as Input #%d - exiting\n", filename, i);
|
||||
av_log(NULL, AV_LOG_WARNING, "FFmpeg cannot edit existing files in-place.\n");
|
||||
exit_program(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void dump_attachment(AVStream *st, const char *filename)
|
||||
@@ -1127,22 +1113,9 @@ static int open_input_file(OptionsContext *o, const char *filename)
|
||||
}
|
||||
}
|
||||
|
||||
if (o->start_time != AV_NOPTS_VALUE && o->start_time_eof != AV_NOPTS_VALUE) {
|
||||
av_log(NULL, AV_LOG_WARNING, "Cannot use -ss and -sseof both, using -ss for %s\n", filename);
|
||||
o->start_time_eof = AV_NOPTS_VALUE;
|
||||
}
|
||||
|
||||
if (o->start_time_eof != AV_NOPTS_VALUE) {
|
||||
if (o->start_time_eof >= 0) {
|
||||
av_log(NULL, AV_LOG_ERROR, "-sseof value must be negative; aborting\n");
|
||||
exit_program(1);
|
||||
}
|
||||
if (ic->duration > 0) {
|
||||
if (ic->duration>0) {
|
||||
o->start_time = o->start_time_eof + ic->duration;
|
||||
if (o->start_time < 0) {
|
||||
av_log(NULL, AV_LOG_WARNING, "-sseof value seeks to before start of file %s; ignored\n", filename);
|
||||
o->start_time = AV_NOPTS_VALUE;
|
||||
}
|
||||
} else
|
||||
av_log(NULL, AV_LOG_WARNING, "Cannot use -sseof, duration of %s not known\n", filename);
|
||||
}
|
||||
@@ -1159,10 +1132,8 @@ static int open_input_file(OptionsContext *o, const char *filename)
|
||||
int dts_heuristic = 0;
|
||||
for (i=0; i<ic->nb_streams; i++) {
|
||||
const AVCodecParameters *par = ic->streams[i]->codecpar;
|
||||
if (par->video_delay) {
|
||||
if (par->video_delay)
|
||||
dts_heuristic = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (dts_heuristic) {
|
||||
seek_timestamp -= 3*AV_TIME_BASE / 23;
|
||||
@@ -1363,7 +1334,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
|
||||
ost->file_index = nb_output_files - 1;
|
||||
ost->index = idx;
|
||||
ost->st = st;
|
||||
ost->forced_kf_ref_pts = AV_NOPTS_VALUE;
|
||||
st->codecpar->codec_type = type;
|
||||
|
||||
ret = choose_encoder(o, oc, ost);
|
||||
@@ -3197,9 +3167,7 @@ void show_help_default(const char *opt, const char *arg)
|
||||
#if CONFIG_SWSCALE
|
||||
show_help_children(sws_get_class(), flags);
|
||||
#endif
|
||||
#if CONFIG_SWRESAMPLE
|
||||
show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM);
|
||||
#endif
|
||||
show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM);
|
||||
show_help_children(av_bsf_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_BSF_PARAM);
|
||||
}
|
||||
@@ -3379,7 +3347,7 @@ const OptionDef options[] = {
|
||||
OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(start_time) },
|
||||
"set the start time offset", "time_off" },
|
||||
{ "sseof", HAS_ARG | OPT_TIME | OPT_OFFSET |
|
||||
OPT_INPUT, { .off = OFFSET(start_time_eof) },
|
||||
OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(start_time_eof) },
|
||||
"set the start time offset relative to EOF", "time_off" },
|
||||
{ "seek_timestamp", HAS_ARG | OPT_INT | OPT_OFFSET |
|
||||
OPT_INPUT, { .off = OFFSET(seek_timestamp) },
|
||||
|
||||
@@ -18,10 +18,6 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* CHANGES 10.2018
|
||||
* --------------------------------------------------------
|
||||
* - getBuildConf method added
|
||||
*
|
||||
* CHANGES 09.2018
|
||||
* --------------------------------------------------------
|
||||
* - Merged with mobileffmpeg_config
|
||||
@@ -33,7 +29,6 @@
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "libavutil/bprint.h"
|
||||
#include "mobileffmpeg.h"
|
||||
#include "fftools_ffmpeg.h"
|
||||
@@ -87,12 +82,15 @@ JNINativeMethod configMethods[] = {
|
||||
{"enableNativeRedirection", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_enableNativeRedirection},
|
||||
{"disableNativeRedirection", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_disableNativeRedirection},
|
||||
{"setNativeLogLevel", "(I)V", (void*) Java_com_arthenica_mobileffmpeg_Config_setNativeLogLevel},
|
||||
{"getNativeLogLevel", "()I", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeLogLevel},
|
||||
{"getNativeFFmpegVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeFFmpegVersion},
|
||||
{"getNativeVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeVersion},
|
||||
{"nativeExecute", "([Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeExecute},
|
||||
{"nativeCancel", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeCancel},
|
||||
{"getNativeBuildConf", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeBuildConf}
|
||||
{"getNativeLogLevel", "()I", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeLogLevel}
|
||||
};
|
||||
|
||||
/** Prototypes of native functions defined by FFmpeg class. */
|
||||
JNINativeMethod ffmpegMethods[] = {
|
||||
{"getNativeFFmpegVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeFFmpegVersion},
|
||||
{"getNativeVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeVersion},
|
||||
{"nativeExecute", "([Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeExecute},
|
||||
{"nativeCancel", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeCancel}
|
||||
};
|
||||
|
||||
/** Forward declaration for function defined in fftools_ffmpeg.c */
|
||||
@@ -358,10 +356,6 @@ void mobileffmpeg_log_callback_function(void *ptr, int level, const char* format
|
||||
if (level >= 0) {
|
||||
level &= 0xff;
|
||||
}
|
||||
int activeLogLevel = av_log_get_level();
|
||||
if ((activeLogLevel == AV_LOG_QUIET) || (level > activeLogLevel)) {
|
||||
return;
|
||||
}
|
||||
|
||||
avutil_log_format_line(ptr, level, format, vargs, part, &print_prefix);
|
||||
snprintf(line, sizeof(line), "%s%s%s%s", part[0].str, part[1].str, part[2].str, part[3].str);
|
||||
@@ -479,7 +473,12 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
|
||||
return JNI_FALSE;
|
||||
}
|
||||
|
||||
if ((*env)->RegisterNatives(env, localConfigClass, configMethods, 9) < 0) {
|
||||
if ((*env)->RegisterNatives(env, localConfigClass, ffmpegMethods, 4) < 0) {
|
||||
LOGE("OnLoad failed to RegisterNatives for class %s.\n", configClassName);
|
||||
return JNI_FALSE;
|
||||
}
|
||||
|
||||
if ((*env)->RegisterNatives(env, localConfigClass, configMethods, 4) < 0) {
|
||||
LOGE("OnLoad failed to RegisterNatives for class %s.\n", configClassName);
|
||||
return JNI_FALSE;
|
||||
}
|
||||
@@ -671,14 +670,3 @@ JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeExecute(JNIE
|
||||
JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeCancel(JNIEnv *env, jclass object) {
|
||||
cancel_operation();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns build configuration for FFmpeg.
|
||||
*
|
||||
* \param env pointer to native method interface
|
||||
* \param object reference to the class on which this method is invoked
|
||||
* \return build configuration string
|
||||
*/
|
||||
JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeBuildConf(JNIEnv *env, jclass object) {
|
||||
return (*env)->NewStringUTF(env, FFMPEG_CONFIGURATION);
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "libavutil/ffversion.h"
|
||||
|
||||
/** Library version string */
|
||||
#define MOBILE_FFMPEG_VERSION "3.1"
|
||||
#define MOBILE_FFMPEG_VERSION "2.2"
|
||||
|
||||
/** Defines tag used for Android logging. */
|
||||
#define LIB_NAME "mobile-ffmpeg"
|
||||
@@ -103,11 +103,4 @@ JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeExecute(JNIE
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeCancel(JNIEnv *, jclass);
|
||||
|
||||
/*
|
||||
* Class: com_arthenica_mobileffmpeg_Config
|
||||
* Method: getNativeBuildConf
|
||||
* Signature: ()Ljava/lang/String;
|
||||
*/
|
||||
JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeBuildConf(JNIEnv *, jclass);
|
||||
|
||||
#endif /* MOBILE_FFMPEG_H */
|
||||
@@ -27,7 +27,6 @@ import android.util.Log;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
@@ -72,10 +71,6 @@ public class Config {
|
||||
|
||||
private static Statistics lastReceivedStatistics;
|
||||
|
||||
private static final AtomicReference<StringBuffer> systemCommandOutputReference;
|
||||
|
||||
private static boolean runningSystemCommand;
|
||||
|
||||
static {
|
||||
|
||||
Log.i(Config.TAG, "Loading mobile-ffmpeg.");
|
||||
@@ -103,7 +98,7 @@ public class Config {
|
||||
System.loadLibrary("mobileffmpeg");
|
||||
}
|
||||
|
||||
Log.i(Config.TAG, String.format("Loaded mobile-ffmpeg-%s-%s-%s.", getPackageName(), abi.getName(), getVersion()));
|
||||
Log.i(Config.TAG, String.format("Loaded mobile-ffmpeg-%s-%s.", abi.getName(), getVersion()));
|
||||
|
||||
/* NATIVE LOG LEVEL IS RECEIVED ONLY ON STARTUP */
|
||||
activeLogLevel = Level.from(getNativeLogLevel());
|
||||
@@ -111,11 +106,6 @@ public class Config {
|
||||
lastReceivedStatistics = new Statistics();
|
||||
|
||||
Config.enableRedirection();
|
||||
|
||||
systemCommandOutputReference = new AtomicReference<>();
|
||||
systemCommandOutputReference.set(new StringBuffer());
|
||||
|
||||
runningSystemCommand = false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -195,23 +185,11 @@ public class Config {
|
||||
final Level level = Level.from(levelValue);
|
||||
final String text = new String(logMessage);
|
||||
|
||||
if (runningSystemCommand) {
|
||||
|
||||
// REDIRECT SYSTEM OUTPUT
|
||||
if (activeLogLevel != Level.AV_LOG_QUIET && levelValue <= activeLogLevel.getValue()) {
|
||||
systemCommandOutputReference.get().append(text);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (activeLogLevel == Level.AV_LOG_QUIET || levelValue > activeLogLevel.getValue()) {
|
||||
// LOG NEITHER PRINTED NOR FORWARDED
|
||||
return;
|
||||
}
|
||||
|
||||
// ALWAYS REDIRECT COMMAND OUTPUT
|
||||
FFmpeg.appendCommandOutput(text);
|
||||
|
||||
if (logCallbackFunction != null) {
|
||||
logCallbackFunction.apply(new LogMessage(level, text));
|
||||
} else {
|
||||
@@ -255,16 +233,16 @@ public class Config {
|
||||
* <p>Statistics redirection method called by JNI/native part.
|
||||
*
|
||||
* @param videoFrameNumber last processed frame number for videos
|
||||
* @param videoFps frames processed per second for videos
|
||||
* @param videoQuality quality of the video stream
|
||||
* @param size size in bytes
|
||||
* @param time processed duration in milliseconds
|
||||
* @param bitrate output bit rate in kbits/s
|
||||
* @param speed processing speed = processed duration / operation duration
|
||||
* @param videoFps frames processed per second for videos
|
||||
* @param videoQuality quality of the video stream
|
||||
* @param size size in bytes
|
||||
* @param time processed duration in milliseconds
|
||||
* @param bitrate output bit rate in kbits/s
|
||||
* @param speed processing speed = processed duration / operation duration
|
||||
*/
|
||||
private static void statistics(final int videoFrameNumber, final float videoFps,
|
||||
final float videoQuality, final long size, final int time,
|
||||
final double bitrate, final double speed) {
|
||||
final float videoQuality, final long size, final int time,
|
||||
final double bitrate, final double speed) {
|
||||
final Statistics newStatistics = new Statistics(videoFrameNumber, videoFps, videoQuality, size, time, bitrate, speed);
|
||||
lastReceivedStatistics.update(newStatistics);
|
||||
|
||||
@@ -383,80 +361,6 @@ public class Config {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns package name.
|
||||
*
|
||||
* @return guessed package name according to supported external libraries
|
||||
* @since 3.0
|
||||
*/
|
||||
public static String getPackageName() {
|
||||
return Packages.getPackageName();
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns supported external libraries.
|
||||
*
|
||||
* @return list of supported external libraries
|
||||
* @since 3.0
|
||||
*/
|
||||
public static List<String> getExternalLibraries() {
|
||||
return Packages.getExternalLibraries();
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes system command. System command is not logged to output.
|
||||
*
|
||||
* @param arguments command arguments
|
||||
* @param commandOutputEndPatternList list of patterns which will indicate that operation has ended
|
||||
* @param timeout execution timeout
|
||||
* @return return code
|
||||
*/
|
||||
static int systemExecute(final String[] arguments, final List<String> commandOutputEndPatternList, final long timeout) {
|
||||
systemCommandOutputReference.set(new StringBuffer());
|
||||
runningSystemCommand = true;
|
||||
|
||||
int rc = Config.nativeExecute(arguments);
|
||||
|
||||
long totalWaitTime = 0;
|
||||
|
||||
try {
|
||||
while (!systemCommandOutputContainsPattern(commandOutputEndPatternList) && (totalWaitTime < timeout)) {
|
||||
synchronized (systemCommandOutputReference) {
|
||||
systemCommandOutputReference.wait(20);
|
||||
}
|
||||
totalWaitTime += 20;
|
||||
}
|
||||
} catch (final InterruptedException e) {
|
||||
Log.w(TAG, "systemExecute operation interrupted.", e);
|
||||
}
|
||||
|
||||
runningSystemCommand = false;
|
||||
|
||||
nativeCancel();
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
private static boolean systemCommandOutputContainsPattern(final List<String> patternList) {
|
||||
String string = systemCommandOutputReference.get().toString();
|
||||
for (String pattern : patternList) {
|
||||
if (string.contains(pattern)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns output of last executed system command.
|
||||
*
|
||||
* @return output of last executed system command
|
||||
*/
|
||||
static String getSystemCommandOutput() {
|
||||
return systemCommandOutputReference.get().toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Enables native redirection. Necessary for log and statistics callback functions.
|
||||
*/
|
||||
@@ -504,16 +408,10 @@ public class Config {
|
||||
native static int nativeExecute(final String[] arguments);
|
||||
|
||||
/**
|
||||
* <p>Cancels an ongoing operation natively. This function does not wait for termination to
|
||||
* complete and returns immediately.
|
||||
* <p>Cancels an ongoing operation natively.
|
||||
*
|
||||
* <p>This function does not wait for termination to complete and returns immediately.
|
||||
*/
|
||||
native static void nativeCancel();
|
||||
|
||||
/**
|
||||
* <p>Returns build configuration for <code>FFmpeg</code>.
|
||||
*
|
||||
* @return build configuration string
|
||||
*/
|
||||
native static String getNativeBuildConf();
|
||||
|
||||
}
|
||||
|
||||
@@ -19,10 +19,6 @@
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* <p>Main class for FFmpeg operations. Provides {@link #execute(String...)} method to execute
|
||||
* FFmpeg commands.
|
||||
@@ -40,10 +36,6 @@ public class FFmpeg {
|
||||
|
||||
public static final int RETURN_CODE_CANCEL = 255;
|
||||
|
||||
private static int lastReturnCode = 0;
|
||||
|
||||
private static StringBuffer lastCommandOutput = new StringBuffer();
|
||||
|
||||
static {
|
||||
AbiDetect.class.getName();
|
||||
Config.class.getName();
|
||||
@@ -55,15 +47,6 @@ public class FFmpeg {
|
||||
private FFmpeg() {
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Appends given log output to the last command output.
|
||||
*
|
||||
* @param output log output
|
||||
*/
|
||||
static void appendCommandOutput(final String output) {
|
||||
lastCommandOutput.append(output);
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns FFmpeg version bundled within the library.
|
||||
*
|
||||
@@ -89,94 +72,26 @@ public class FFmpeg {
|
||||
* @return zero on successful execution, 255 on user cancel and non-zero on error
|
||||
*/
|
||||
public static int execute(final String[] arguments) {
|
||||
lastCommandOutput = new StringBuffer();
|
||||
|
||||
lastReturnCode = Config.nativeExecute(arguments);
|
||||
|
||||
return lastReturnCode;
|
||||
return Config.nativeExecute(arguments);
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Synchronously executes FFmpeg command provided. Command is split into arguments using
|
||||
* provided delimiter.
|
||||
* <p>Synchronously executes FFmpeg with arguments provided.
|
||||
*
|
||||
* @param command FFmpeg command
|
||||
* @param delimiter delimiter used between arguments
|
||||
* @return zero on successful execution, 255 on user cancel and non-zero on error
|
||||
* @since 3.0
|
||||
*/
|
||||
public static int execute(final String command, final String delimiter) {
|
||||
return execute((command == null) ? new String[]{""} : command.split((delimiter == null) ? " " : delimiter));
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Synchronously executes FFmpeg command provided. Space character is used to split command
|
||||
* into arguments.
|
||||
*
|
||||
* @param command FFmpeg command
|
||||
* @param arguments FFmpeg command options/arguments in one string
|
||||
* @return zero on successful execution, 255 on user cancel and non-zero on error
|
||||
*/
|
||||
public static int execute(final String command) {
|
||||
return execute(command, " ");
|
||||
public static int execute(final String arguments) {
|
||||
return execute((arguments == null) ? new String[]{""} : arguments.split(" "));
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Cancels an ongoing operation. This function does not wait for termination to complete and
|
||||
* returns immediately.
|
||||
* <p>Cancels an ongoing operation.
|
||||
*
|
||||
* <p>This function does not wait for termination to complete and returns immediately.
|
||||
*/
|
||||
public static void cancel() {
|
||||
Config.nativeCancel();
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns return code of last executed command.
|
||||
*
|
||||
* @return return code of last executed command
|
||||
* @since 3.0
|
||||
*/
|
||||
public static int getLastReturnCode() {
|
||||
return lastReturnCode;
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns log output of last executed command. Please note that disabling redirection using
|
||||
* {@link Config#disableRedirection()} method also disables this functionality.
|
||||
*
|
||||
* @return output of last executed command
|
||||
* @since 3.0
|
||||
*/
|
||||
public static String getLastCommandOutput() {
|
||||
return lastCommandOutput.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns media information for given file.
|
||||
*
|
||||
* @param path path or uri of media file
|
||||
* @return media information
|
||||
* @since 3.0
|
||||
*/
|
||||
public static MediaInformation getMediaInformation(final String path) {
|
||||
return getMediaInformation(path, 10000L);
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns media information for given file.
|
||||
*
|
||||
* @param path path or uri of media file
|
||||
* @param timeout complete timeout
|
||||
* @return media information
|
||||
* @since 3.0
|
||||
*/
|
||||
public static MediaInformation getMediaInformation(final String path, final Long timeout) {
|
||||
int rc = Config.systemExecute(new String[]{"-v", "info", "-hide_banner", "-i", path, "-f", "null", "-"}, Arrays.asList("Press [q] to stop, [?] for help", "No such file or directory", "Input/output error", "Conversion failed"), timeout);
|
||||
|
||||
if (rc == 0) {
|
||||
return MediaInformationParser.from(Config.getSystemCommandOutput());
|
||||
} else {
|
||||
Log.i(Config.TAG, Config.getSystemCommandOutput());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,225 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Media information class.
|
||||
*
|
||||
* @since 3.0
|
||||
*/
|
||||
public class MediaInformation {
|
||||
|
||||
/**
|
||||
* Format
|
||||
*/
|
||||
private String format;
|
||||
|
||||
/**
|
||||
* Path
|
||||
*/
|
||||
private String path;
|
||||
|
||||
/**
|
||||
* Duration, in milliseconds
|
||||
*/
|
||||
private Long duration;
|
||||
|
||||
/**
|
||||
* Start time, in milliseconds
|
||||
*/
|
||||
private Long startTime;
|
||||
|
||||
/**
|
||||
* Bitrate, kb/s
|
||||
*/
|
||||
private Long bitrate;
|
||||
|
||||
/**
|
||||
* Metadata map
|
||||
*/
|
||||
private Map<String, String> metadata;
|
||||
|
||||
/**
|
||||
* List of streams
|
||||
*/
|
||||
private List<StreamInformation> streams;
|
||||
|
||||
/**
|
||||
* Raw unparsed media information
|
||||
*/
|
||||
private String rawInformation;
|
||||
|
||||
public MediaInformation() {
|
||||
this.metadata = new HashMap<>();
|
||||
this.streams = new ArrayList<>();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns format.
|
||||
*
|
||||
* @return media format
|
||||
*/
|
||||
public String getFormat() {
|
||||
return format;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets media format.
|
||||
*
|
||||
* @param format media format
|
||||
*/
|
||||
public void setFormat(String format) {
|
||||
this.format = format;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns path.
|
||||
*
|
||||
* @return media path
|
||||
*/
|
||||
public String getPath() {
|
||||
return path;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets path.
|
||||
*
|
||||
* @param path media path
|
||||
*/
|
||||
public void setPath(String path) {
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns duration.
|
||||
*
|
||||
* @return media duration in milliseconds
|
||||
*/
|
||||
public Long getDuration() {
|
||||
return duration;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets duration.
|
||||
*
|
||||
* @param duration media duration in milliseconds
|
||||
*/
|
||||
public void setDuration(Long duration) {
|
||||
this.duration = duration;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns start time.
|
||||
*
|
||||
* @return media start time in milliseconds
|
||||
*/
|
||||
public Long getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets start time.
|
||||
*
|
||||
* @param startTime media start time in milliseconds
|
||||
*/
|
||||
public void setStartTime(Long startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns bitrate.
|
||||
*
|
||||
* @return media bitrate in kb/s
|
||||
*/
|
||||
public Long getBitrate() {
|
||||
return bitrate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets bitrate.
|
||||
*
|
||||
* @param bitrate media bitrate in kb/s
|
||||
*/
|
||||
public void setBitrate(Long bitrate) {
|
||||
this.bitrate = bitrate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns unparsed media information.
|
||||
*
|
||||
* @return unparsed media information data
|
||||
*/
|
||||
public String getRawInformation() {
|
||||
return rawInformation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets unparsed media information.
|
||||
*
|
||||
* @param rawInformation unparsed media information data
|
||||
*/
|
||||
public void setRawInformation(String rawInformation) {
|
||||
this.rawInformation = rawInformation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds metadata.
|
||||
*
|
||||
* @param key metadata key
|
||||
* @param value metadata value
|
||||
*/
|
||||
public void addMetadata(String key, String value) {
|
||||
this.metadata.put(key, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all metadata entries.
|
||||
*
|
||||
* @return set of metadata entries
|
||||
*/
|
||||
public Set<Map.Entry<String, String>> getMetadataEntries() {
|
||||
return this.metadata.entrySet();
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds new stream.
|
||||
*
|
||||
* @param stream new stream information
|
||||
*/
|
||||
public void addStream(StreamInformation stream) {
|
||||
this.streams.add(stream);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all streams.
|
||||
*
|
||||
* @return list of streams
|
||||
*/
|
||||
public List<StreamInformation> getStreams() {
|
||||
return streams;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,501 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import com.arthenica.mobileffmpeg.util.Pair;
|
||||
import com.arthenica.mobileffmpeg.util.Trio;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* Helper class for {@link MediaInformation}.
|
||||
*
|
||||
* @since 3.0
|
||||
*/
|
||||
public class MediaInformationParser {
|
||||
|
||||
public static SimpleDateFormat DURATION_FORMAT;
|
||||
|
||||
public static Date REFERENCE_DURATION;
|
||||
|
||||
static {
|
||||
try {
|
||||
DURATION_FORMAT = new SimpleDateFormat("kk:mm:ss", Locale.getDefault());
|
||||
REFERENCE_DURATION = DURATION_FORMAT.parse("00:00:00");
|
||||
} catch (final ParseException e) {
|
||||
Log.i(Config.TAG, "Preparing duration reference failed.", e);
|
||||
DURATION_FORMAT = null;
|
||||
REFERENCE_DURATION = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses media information command output and builds a {@link MediaInformation} instance.
|
||||
*
|
||||
* @param rawCommandOutput media information command output
|
||||
* @return parsed instance of null if a parsing error occurs
|
||||
*/
|
||||
public static MediaInformation from(final String rawCommandOutput) {
|
||||
final MediaInformation mediaInformation = new MediaInformation();
|
||||
|
||||
if (rawCommandOutput != null) {
|
||||
final String[] split = rawCommandOutput.split("\n");
|
||||
boolean metadata = false;
|
||||
StreamInformation lastCreatedStream = null;
|
||||
final StringBuilder rawInformation = new StringBuilder();
|
||||
|
||||
for (final String outputLine : split) {
|
||||
if (outputLine.startsWith("[")) {
|
||||
metadata = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
final String trimmedLine = outputLine.trim();
|
||||
|
||||
if (trimmedLine.startsWith("Input")) {
|
||||
metadata = false;
|
||||
lastCreatedStream = null;
|
||||
Pair<String, String> pair = parseInputBlock(trimmedLine);
|
||||
mediaInformation.setFormat(pair.getFirst());
|
||||
mediaInformation.setPath(pair.getSecond());
|
||||
} else if (trimmedLine.startsWith("Duration")) {
|
||||
metadata = false;
|
||||
lastCreatedStream = null;
|
||||
Trio<Long, Long, Long> trio = parseDurationBlock(trimmedLine);
|
||||
mediaInformation.setDuration(trio.getFirst());
|
||||
mediaInformation.setStartTime(trio.getSecond());
|
||||
mediaInformation.setBitrate(trio.getThird());
|
||||
} else if (trimmedLine.startsWith("Metadata")) {
|
||||
metadata = true;
|
||||
} else if (trimmedLine.startsWith("Stream mapping") || trimmedLine.startsWith("Press [q] to stop") || trimmedLine.startsWith("Output")) {
|
||||
break;
|
||||
} else if (trimmedLine.startsWith("Stream")) {
|
||||
metadata = false;
|
||||
lastCreatedStream = MediaInformationParser.parseStreamBlock(trimmedLine);
|
||||
mediaInformation.addStream(lastCreatedStream);
|
||||
} else if (metadata) {
|
||||
Pair<String, String> pair = parseMetadataBlock(trimmedLine);
|
||||
|
||||
if (pair.getFirst() != null && pair.getSecond() != null) {
|
||||
if (lastCreatedStream != null) {
|
||||
lastCreatedStream.addMetadata(pair.getFirst(), pair.getSecond());
|
||||
} else {
|
||||
mediaInformation.addMetadata(pair.getFirst(), pair.getSecond());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rawInformation.append(outputLine);
|
||||
rawInformation.append("\n");
|
||||
}
|
||||
|
||||
mediaInformation.setRawInformation(rawInformation.toString());
|
||||
}
|
||||
|
||||
return mediaInformation;
|
||||
}
|
||||
|
||||
static Pair<String, String> parseInputBlock(final String input) {
|
||||
String format = substring(input, ",", ", from", Collections.<String>emptyList());
|
||||
String path = substring(input, "\'", "\'", Collections.<String>emptyList());
|
||||
|
||||
return new Pair<>(format, path);
|
||||
}
|
||||
|
||||
static Trio<Long, Long, Long> parseDurationBlock(final String line) {
|
||||
Long duration = parseDuration(substring(line, "Duration:", ",", Collections.singletonList("uration:")));
|
||||
Long start = parseStartTime(substring(line, "start:", ",", Collections.singletonList("tart:")));
|
||||
Long bitrate = toLongObject(substring(line, "bitrate:", Arrays.asList("itrate:", "kb/s")));
|
||||
|
||||
return new Trio<>(duration, start, bitrate);
|
||||
}
|
||||
|
||||
static Pair<String, String> parseMetadataBlock(final String metadata) {
|
||||
String key = null;
|
||||
String value = null;
|
||||
|
||||
if (metadata != null) {
|
||||
int index = metadata.indexOf(':');
|
||||
if (index > -1) {
|
||||
key = metadata.substring(0, index).trim();
|
||||
value = metadata.substring(index + 1).trim();
|
||||
}
|
||||
}
|
||||
|
||||
return new Pair<>(key, value);
|
||||
}
|
||||
|
||||
static StreamInformation parseStreamBlock(final String input) {
|
||||
final StreamInformation streamInformation = new StreamInformation();
|
||||
|
||||
if (input != null) {
|
||||
streamInformation.setIndex(parseStreamIndex(input));
|
||||
|
||||
int typeBlockStartIndex = index(input, ":", 0, 2);
|
||||
if (typeBlockStartIndex > -1 && (typeBlockStartIndex < input.length())) {
|
||||
String[] parts = input.substring(typeBlockStartIndex + 1).split(",");
|
||||
String typePart = safeGet(parts, 0);
|
||||
|
||||
final String type = parseStreamType(typePart);
|
||||
streamInformation.setType(type);
|
||||
streamInformation.setCodec(parseStreamCodec(typePart));
|
||||
streamInformation.setFullCodec(parseStreamFullCodec(typePart));
|
||||
|
||||
String part2 = safeGet(parts, 1);
|
||||
String part3 = safeGet(parts, 2);
|
||||
String part4 = safeGet(parts, 3);
|
||||
String part5 = safeGet(parts, 4);
|
||||
if ("video".equals(type)) {
|
||||
int lastUsedPart = 1;
|
||||
|
||||
if (part2 != null) {
|
||||
int pStart = count(part2, "(");
|
||||
int pEnd = count(part2, ")");
|
||||
|
||||
while (pStart != pEnd) {
|
||||
lastUsedPart++;
|
||||
String newPart = safeGet(parts, lastUsedPart);
|
||||
if (newPart == null) {
|
||||
break;
|
||||
}
|
||||
part2 = String.format("%s,%s", part2, newPart);
|
||||
pStart = count(part2, "(");
|
||||
pEnd = count(part2, ")");
|
||||
}
|
||||
|
||||
streamInformation.setFullFormat(part2.toLowerCase().trim());
|
||||
streamInformation.setFormat(part2.replaceAll("\\(.*\\)", "").toLowerCase().trim());
|
||||
}
|
||||
|
||||
lastUsedPart++;
|
||||
String videoDimensionPart = safeGet(parts, lastUsedPart);
|
||||
if (videoDimensionPart != null) {
|
||||
String videoLayout = videoDimensionPart.toLowerCase().trim();
|
||||
Pair<Long, Long> dimensions = parseVideoDimensions(videoLayout);
|
||||
streamInformation.setWidth(dimensions.getFirst());
|
||||
streamInformation.setHeight(dimensions.getSecond());
|
||||
streamInformation.setSampleAspectRatio(parseVideoStreamSampleAspectRatio(videoLayout));
|
||||
streamInformation.setDisplayAspectRatio(parseVideoStreamDisplayAspectRatio(videoLayout));
|
||||
}
|
||||
|
||||
for (int i = lastUsedPart + 1; i < parts.length; i++) {
|
||||
String part = parts[i].replaceAll("\\(.*\\)", "").toLowerCase();
|
||||
|
||||
if (part.contains("kb/s")) {
|
||||
streamInformation.setBitrate(toLongObject(part.replaceAll("kb/s", "").trim()));
|
||||
} else if (part.contains("fps")) {
|
||||
streamInformation.setAverageFrameRate(part.replaceAll("fps", "").trim());
|
||||
} else if (part.contains("tbr")) {
|
||||
streamInformation.setRealFrameRate(part.replaceAll("tbr", "").trim());
|
||||
} else if (part.contains("tbn")) {
|
||||
streamInformation.setTimeBase(part.replaceAll("tbn", "").trim());
|
||||
} else if (part.contains("tbc")) {
|
||||
streamInformation.setCodecTimeBase(part.replaceAll("tbc", "").trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
if ("audio".equals(type)) {
|
||||
if (part2 != null) {
|
||||
streamInformation.setSampleRate(parseAudioStreamSampleRate(part2));
|
||||
}
|
||||
if (part3 != null) {
|
||||
streamInformation.setChannelLayout(part3.toLowerCase().trim());
|
||||
}
|
||||
if (part4 != null) {
|
||||
streamInformation.setSampleFormat(part4.toLowerCase().trim());
|
||||
}
|
||||
if (part5 != null) {
|
||||
streamInformation.setBitrate(toLongObject(part5.toLowerCase().replaceAll("\\(.*\\)", "").replaceAll("kb/s", "").trim()));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return streamInformation;
|
||||
}
|
||||
|
||||
static Pair<Long, Long> parseVideoDimensions(final String input) {
|
||||
Long width = null;
|
||||
Long height = null;
|
||||
|
||||
if (input != null) {
|
||||
final String[] dimensions = input.toLowerCase().replaceAll("\\[.*\\]", "").trim().split("x");
|
||||
width = toLongObject(safeGet(dimensions, 0));
|
||||
height = toLongObject(safeGet(dimensions, 1));
|
||||
}
|
||||
|
||||
return new Pair<>(width, height);
|
||||
}
|
||||
|
||||
static String parseVideoStreamSampleAspectRatio(final String input) {
|
||||
if (input != null) {
|
||||
String[] parts = input.replaceAll("\\[", "").replaceAll("\\]", "").split(" ");
|
||||
for (int i = 0; i < parts.length; i++) {
|
||||
if (parts[i].toLowerCase().equals("sar")) {
|
||||
return safeGet(parts, i + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static String parseVideoStreamDisplayAspectRatio(final String input) {
|
||||
if (input != null) {
|
||||
String[] parts = input.replaceAll("\\[", "").replaceAll("\\]", "").split(" ");
|
||||
for (int i = 0; i < parts.length; i++) {
|
||||
if (parts[i].toLowerCase().equals("dar")) {
|
||||
return safeGet(parts, i + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static Long parseAudioStreamSampleRate(final String input) {
|
||||
if (input != null) {
|
||||
boolean khz = false;
|
||||
boolean mhz = false;
|
||||
|
||||
String lowerCase = input.toLowerCase();
|
||||
if (lowerCase.contains("khz")) {
|
||||
khz = true;
|
||||
}
|
||||
if (lowerCase.contains("mhz")) {
|
||||
mhz = true;
|
||||
}
|
||||
|
||||
String sampleRate = lowerCase
|
||||
.replaceAll("khz", "")
|
||||
.replaceAll("mhz", "")
|
||||
.replaceAll("hz", "")
|
||||
.trim();
|
||||
|
||||
if (khz) {
|
||||
return 1000 * toLong(sampleRate);
|
||||
} else if (mhz) {
|
||||
return 1000000 * toLong(sampleRate);
|
||||
} else {
|
||||
return toLong(sampleRate);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static String parseStreamType(final String input) {
|
||||
if (input != null) {
|
||||
if (input.toLowerCase().contains("audio:")) {
|
||||
return "audio";
|
||||
} else if (input.toLowerCase().contains("video:")) {
|
||||
return "video";
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static String parseStreamCodec(final String input) {
|
||||
if (input != null) {
|
||||
return input.toLowerCase()
|
||||
.replaceAll("\\(.*\\)", "")
|
||||
.replaceAll("video:", "")
|
||||
.replaceAll("audio:", "")
|
||||
.trim();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static String parseStreamFullCodec(final String input) {
|
||||
if (input != null) {
|
||||
return input.toLowerCase()
|
||||
.replaceAll("video:", "")
|
||||
.replaceAll("audio:", "")
|
||||
.trim();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static Long parseStreamIndex(final String input) {
|
||||
String substring = substring(input, "Stream #0:", ":", Collections.singletonList("tream #0"));
|
||||
if (substring != null) {
|
||||
|
||||
// DISCARD PARANTHESIS
|
||||
return toLongObject(substring
|
||||
.replace(":", "")
|
||||
.replaceAll("\\(.*\\)", ""));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static Long parseDuration(final String duration) {
|
||||
if (duration == null || duration.equals("N/A")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
final Date calculated = DURATION_FORMAT.parse(duration);
|
||||
|
||||
long secondsPartInMilliseconds = calculated.getTime() - REFERENCE_DURATION.getTime();
|
||||
|
||||
int index = duration.indexOf('.');
|
||||
if (index > -1) {
|
||||
Long centiSeconds = toLong(duration.substring(index + 1));
|
||||
secondsPartInMilliseconds += 10 * centiSeconds;
|
||||
}
|
||||
|
||||
return secondsPartInMilliseconds;
|
||||
|
||||
} catch (final ParseException e) {
|
||||
Log.d(Config.TAG, String.format("Parsing duration: %s failed.", duration), e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
static Long parseStartTime(final String startTime) {
|
||||
if (startTime == null || startTime.equals("N/A")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
BigDecimal bigDecimal = new BigDecimal(startTime);
|
||||
bigDecimal = bigDecimal.setScale(3, BigDecimal.ROUND_CEILING).multiply(new BigDecimal(1000));
|
||||
return bigDecimal.longValue();
|
||||
} catch (NumberFormatException e) {
|
||||
Log.d(Config.TAG, String.format("Parsing startTime: %s failed.", startTime), e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static String substring(final String string, final String start, final String end, final List<String> ignoredTokens) {
|
||||
String extractedSubstring = null;
|
||||
|
||||
if (string != null) {
|
||||
int formatStart = string.indexOf(start);
|
||||
if (formatStart > -1) {
|
||||
|
||||
int formatEnd = string.indexOf(end, formatStart + start.length());
|
||||
if (formatEnd > -1) {
|
||||
extractedSubstring = string.substring(formatStart + start.length(), formatEnd);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((ignoredTokens != null) && (extractedSubstring != null)) {
|
||||
for (String token : ignoredTokens) {
|
||||
extractedSubstring = extractedSubstring.replaceAll(token, "");
|
||||
}
|
||||
}
|
||||
|
||||
return (extractedSubstring == null) ? null : extractedSubstring.trim();
|
||||
}
|
||||
|
||||
public static String substring(final String string, final String start, final List<String> ignoredTokens) {
|
||||
String extractedSubstring = null;
|
||||
|
||||
if (string != null) {
|
||||
int formatStart = string.indexOf(start);
|
||||
if (formatStart > -1) {
|
||||
extractedSubstring = string.substring(formatStart + 1);
|
||||
}
|
||||
}
|
||||
|
||||
if ((ignoredTokens != null) && (extractedSubstring != null)) {
|
||||
for (String token : ignoredTokens) {
|
||||
extractedSubstring = extractedSubstring.replaceAll(token, "");
|
||||
}
|
||||
}
|
||||
|
||||
return (extractedSubstring == null) ? null : extractedSubstring.trim();
|
||||
}
|
||||
|
||||
public static int index(final String string, String substring, int startIndex, int n) {
|
||||
int count = 1;
|
||||
|
||||
while (count <= n) {
|
||||
startIndex = string.indexOf(substring, startIndex + substring.length());
|
||||
count++;
|
||||
}
|
||||
|
||||
return startIndex;
|
||||
}
|
||||
|
||||
public static int count(final String string, String substring) {
|
||||
int count = 0;
|
||||
int index = 0;
|
||||
|
||||
do {
|
||||
index = string.indexOf(substring, index);
|
||||
if (index >= 0) {
|
||||
count++;
|
||||
index = index + substring.length();
|
||||
}
|
||||
} while (index >= 0);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
private static <K> K safeGet(final K[] array, final int index) {
|
||||
if (array == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
final int size = array.length;
|
||||
if (size > index) {
|
||||
return array[index];
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
} catch (final ArrayIndexOutOfBoundsException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static long toLong(final String value) {
|
||||
try {
|
||||
return Long.parseLong(value);
|
||||
} catch (NumberFormatException e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
static Long toLongObject(final String value) {
|
||||
try {
|
||||
return Long.parseLong(value);
|
||||
} catch (NumberFormatException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,279 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>Provides helper methods to extract binary package information.
|
||||
*
|
||||
* @since 3.0
|
||||
*/
|
||||
class Packages {
|
||||
|
||||
private static final List<String> supportedExternalLibraries;
|
||||
|
||||
static {
|
||||
supportedExternalLibraries = new ArrayList<>();
|
||||
supportedExternalLibraries.add("chromaprint");
|
||||
supportedExternalLibraries.add("fontconfig");
|
||||
supportedExternalLibraries.add("freetype");
|
||||
supportedExternalLibraries.add("fribidi");
|
||||
supportedExternalLibraries.add("gmp");
|
||||
supportedExternalLibraries.add("gnutls");
|
||||
supportedExternalLibraries.add("kvazaar");
|
||||
supportedExternalLibraries.add("mp3lame");
|
||||
supportedExternalLibraries.add("libaom");
|
||||
supportedExternalLibraries.add("libass");
|
||||
supportedExternalLibraries.add("iconv");
|
||||
supportedExternalLibraries.add("libilbc");
|
||||
supportedExternalLibraries.add("libtheora");
|
||||
supportedExternalLibraries.add("libvidstab");
|
||||
supportedExternalLibraries.add("libvorbis");
|
||||
supportedExternalLibraries.add("libvpx");
|
||||
supportedExternalLibraries.add("libwebp");
|
||||
supportedExternalLibraries.add("libxml2");
|
||||
supportedExternalLibraries.add("opencore-amr");
|
||||
supportedExternalLibraries.add("opus");
|
||||
supportedExternalLibraries.add("shine");
|
||||
supportedExternalLibraries.add("sdl");
|
||||
supportedExternalLibraries.add("snappy");
|
||||
supportedExternalLibraries.add("soxr");
|
||||
supportedExternalLibraries.add("speex");
|
||||
supportedExternalLibraries.add("tesseract");
|
||||
supportedExternalLibraries.add("twolame");
|
||||
supportedExternalLibraries.add("wavpack");
|
||||
supportedExternalLibraries.add("x264");
|
||||
supportedExternalLibraries.add("x265");
|
||||
supportedExternalLibraries.add("xvid");
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns enabled external libraries by FFmpeg.
|
||||
*
|
||||
* @return enabled external libraries
|
||||
*/
|
||||
static List<String> getExternalLibraries() {
|
||||
final String buildConfiguration = Config.getNativeBuildConf();
|
||||
|
||||
final List<String> enabledLibraryList = new ArrayList<>();
|
||||
for (String supportedExternalLibrary : supportedExternalLibraries) {
|
||||
if (buildConfiguration.contains("enable-" + supportedExternalLibrary) ||
|
||||
buildConfiguration.contains("enable-lib" + supportedExternalLibrary)) {
|
||||
enabledLibraryList.add(supportedExternalLibrary);
|
||||
}
|
||||
}
|
||||
|
||||
Collections.sort(enabledLibraryList);
|
||||
|
||||
return enabledLibraryList;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns MobileFFmpeg binary package name.
|
||||
*
|
||||
* @return guessed MobileFFmpeg binary package name
|
||||
*/
|
||||
static String getPackageName() {
|
||||
final List<String> externalLibraryList = getExternalLibraries();
|
||||
final boolean speex = externalLibraryList.contains("speex");
|
||||
final boolean fribidi = externalLibraryList.contains("fribidi");
|
||||
final boolean gnutls = externalLibraryList.contains("gnutls");
|
||||
final boolean xvid = externalLibraryList.contains("xvid");
|
||||
|
||||
boolean min = false;
|
||||
boolean minGpl = false;
|
||||
boolean https = false;
|
||||
boolean httpsGpl = false;
|
||||
boolean audio = false;
|
||||
boolean video = false;
|
||||
boolean full = false;
|
||||
boolean fullGpl = false;
|
||||
|
||||
if (speex && fribidi) {
|
||||
if (xvid) {
|
||||
fullGpl = true;
|
||||
} else {
|
||||
full = true;
|
||||
}
|
||||
} else if (speex) {
|
||||
audio = true;
|
||||
} else if (fribidi) {
|
||||
video = true;
|
||||
} else if (xvid) {
|
||||
if (gnutls) {
|
||||
httpsGpl = true;
|
||||
} else {
|
||||
minGpl = true;
|
||||
}
|
||||
} else {
|
||||
if (gnutls) {
|
||||
https = true;
|
||||
} else {
|
||||
min = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (fullGpl) {
|
||||
if (externalLibraryList.contains("chromaprint") &&
|
||||
externalLibraryList.contains("fontconfig") &&
|
||||
externalLibraryList.contains("freetype") &&
|
||||
externalLibraryList.contains("fribidi") &&
|
||||
externalLibraryList.contains("gmp") &&
|
||||
externalLibraryList.contains("gnutls") &&
|
||||
externalLibraryList.contains("kvazaar") &&
|
||||
externalLibraryList.contains("mp3lame") &&
|
||||
externalLibraryList.contains("libaom") &&
|
||||
externalLibraryList.contains("libass") &&
|
||||
externalLibraryList.contains("iconv") &&
|
||||
externalLibraryList.contains("libilbc") &&
|
||||
externalLibraryList.contains("libtheora") &&
|
||||
externalLibraryList.contains("libvidstab") &&
|
||||
externalLibraryList.contains("libvorbis") &&
|
||||
externalLibraryList.contains("libvpx") &&
|
||||
externalLibraryList.contains("libwebp") &&
|
||||
externalLibraryList.contains("libxml2") &&
|
||||
externalLibraryList.contains("opencore-amr") &&
|
||||
externalLibraryList.contains("opus") &&
|
||||
externalLibraryList.contains("shine") &&
|
||||
externalLibraryList.contains("sdl") &&
|
||||
externalLibraryList.contains("snappy") &&
|
||||
externalLibraryList.contains("soxr") &&
|
||||
externalLibraryList.contains("speex") &&
|
||||
externalLibraryList.contains("tesseract") &&
|
||||
externalLibraryList.contains("twolame") &&
|
||||
externalLibraryList.contains("wavpack") &&
|
||||
externalLibraryList.contains("x264") &&
|
||||
externalLibraryList.contains("x265") &&
|
||||
externalLibraryList.contains("xvid")) {
|
||||
return "full-gpl";
|
||||
} else {
|
||||
return "custom";
|
||||
}
|
||||
}
|
||||
|
||||
if (full) {
|
||||
if (externalLibraryList.contains("chromaprint") &&
|
||||
externalLibraryList.contains("fontconfig") &&
|
||||
externalLibraryList.contains("freetype") &&
|
||||
externalLibraryList.contains("fribidi") &&
|
||||
externalLibraryList.contains("gmp") &&
|
||||
externalLibraryList.contains("gnutls") &&
|
||||
externalLibraryList.contains("kvazaar") &&
|
||||
externalLibraryList.contains("mp3lame") &&
|
||||
externalLibraryList.contains("libaom") &&
|
||||
externalLibraryList.contains("libass") &&
|
||||
externalLibraryList.contains("iconv") &&
|
||||
externalLibraryList.contains("libilbc") &&
|
||||
externalLibraryList.contains("libtheora") &&
|
||||
externalLibraryList.contains("libvorbis") &&
|
||||
externalLibraryList.contains("libvpx") &&
|
||||
externalLibraryList.contains("libwebp") &&
|
||||
externalLibraryList.contains("libxml2") &&
|
||||
externalLibraryList.contains("opencore-amr") &&
|
||||
externalLibraryList.contains("opus") &&
|
||||
externalLibraryList.contains("shine") &&
|
||||
externalLibraryList.contains("sdl") &&
|
||||
externalLibraryList.contains("snappy") &&
|
||||
externalLibraryList.contains("soxr") &&
|
||||
externalLibraryList.contains("speex") &&
|
||||
externalLibraryList.contains("tesseract") &&
|
||||
externalLibraryList.contains("twolame") &&
|
||||
externalLibraryList.contains("wavpack")) {
|
||||
return "full";
|
||||
} else {
|
||||
return "custom";
|
||||
}
|
||||
}
|
||||
|
||||
if (video) {
|
||||
if (externalLibraryList.contains("fontconfig") &&
|
||||
externalLibraryList.contains("freetype") &&
|
||||
externalLibraryList.contains("fribidi") &&
|
||||
externalLibraryList.contains("kvazaar") &&
|
||||
externalLibraryList.contains("libaom") &&
|
||||
externalLibraryList.contains("libass") &&
|
||||
externalLibraryList.contains("iconv") &&
|
||||
externalLibraryList.contains("libtheora") &&
|
||||
externalLibraryList.contains("libvpx") &&
|
||||
externalLibraryList.contains("libwebp") &&
|
||||
externalLibraryList.contains("snappy")) {
|
||||
return "video";
|
||||
} else {
|
||||
return "custom";
|
||||
}
|
||||
}
|
||||
|
||||
if (audio) {
|
||||
if (externalLibraryList.contains("mp3lame") &&
|
||||
externalLibraryList.contains("libilbc") &&
|
||||
externalLibraryList.contains("libvorbis") &&
|
||||
externalLibraryList.contains("opencore-amr") &&
|
||||
externalLibraryList.contains("opus") &&
|
||||
externalLibraryList.contains("shine") &&
|
||||
externalLibraryList.contains("soxr") &&
|
||||
externalLibraryList.contains("speex") &&
|
||||
externalLibraryList.contains("twolame") &&
|
||||
externalLibraryList.contains("wavpack")) {
|
||||
return "audio";
|
||||
} else {
|
||||
return "custom";
|
||||
}
|
||||
}
|
||||
|
||||
if (httpsGpl) {
|
||||
if (externalLibraryList.contains("gmp") &&
|
||||
externalLibraryList.contains("gnutls") &&
|
||||
externalLibraryList.contains("libvidstab") &&
|
||||
externalLibraryList.contains("x264") &&
|
||||
externalLibraryList.contains("x265") &&
|
||||
externalLibraryList.contains("xvid")) {
|
||||
return "https-gpl";
|
||||
} else {
|
||||
return "custom";
|
||||
}
|
||||
}
|
||||
|
||||
if (https) {
|
||||
if (externalLibraryList.contains("gmp") &&
|
||||
externalLibraryList.contains("gnutls")) {
|
||||
return "https";
|
||||
} else {
|
||||
return "custom";
|
||||
}
|
||||
}
|
||||
|
||||
if (minGpl) {
|
||||
if (externalLibraryList.contains("libvidstab") &&
|
||||
externalLibraryList.contains("x264") &&
|
||||
externalLibraryList.contains("x265") &&
|
||||
externalLibraryList.contains("xvid")) {
|
||||
return "min-gpl";
|
||||
} else {
|
||||
return "custom";
|
||||
}
|
||||
}
|
||||
|
||||
return "min";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,434 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Stream information class.
|
||||
*
|
||||
* @since 3.0
|
||||
*/
|
||||
public class StreamInformation {
|
||||
|
||||
/**
|
||||
* Stream index
|
||||
*/
|
||||
private Long index;
|
||||
|
||||
private String type;
|
||||
private String codec;
|
||||
private String fullCodec;
|
||||
private String format;
|
||||
private String fullFormat;
|
||||
|
||||
private Long width;
|
||||
private Long height;
|
||||
|
||||
private Long bitrate;
|
||||
private Long sampleRate;
|
||||
private String sampleFormat;
|
||||
private String channelLayout;
|
||||
|
||||
/**
|
||||
* SAR
|
||||
*/
|
||||
private String sampleAspectRatio;
|
||||
|
||||
/**
|
||||
* DAR
|
||||
*/
|
||||
private String displayAspectRatio;
|
||||
|
||||
/**
|
||||
* fps
|
||||
*/
|
||||
private String averageFrameRate;
|
||||
|
||||
/**
|
||||
* tbr
|
||||
*/
|
||||
private String realFrameRate;
|
||||
|
||||
/**
|
||||
* tbn
|
||||
*/
|
||||
private String timeBase;
|
||||
|
||||
/**
|
||||
* tbc
|
||||
*/
|
||||
private String codecTimeBase;
|
||||
|
||||
/**
|
||||
* Metadata map
|
||||
*/
|
||||
private final Map<String, String> metadata;
|
||||
|
||||
public StreamInformation() {
|
||||
this.metadata = new HashMap<>();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns stream index.
|
||||
*
|
||||
* @return stream index, starting from zero
|
||||
*/
|
||||
public Long getIndex() {
|
||||
return index;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets stream index.
|
||||
*
|
||||
* @param index stream index, starting from zero
|
||||
*/
|
||||
public void setIndex(Long index) {
|
||||
this.index = index;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns stream type.
|
||||
*
|
||||
* @return stream type; audio or video
|
||||
*/
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets stream type.
|
||||
*
|
||||
* @param type stream type; audio or video
|
||||
*/
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns stream codec.
|
||||
*
|
||||
* @return stream codec
|
||||
*/
|
||||
public String getCodec() {
|
||||
return codec;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets stream codec.
|
||||
*
|
||||
* @param codec stream codec
|
||||
*/
|
||||
public void setCodec(String codec) {
|
||||
this.codec = codec;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns full stream codec.
|
||||
*
|
||||
* @return stream codec with additional profile and mode information
|
||||
*/
|
||||
public String getFullCodec() {
|
||||
return fullCodec;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets full stream codec.
|
||||
*
|
||||
* @param fullCodec stream codec with additional profile and mode information
|
||||
*/
|
||||
public void setFullCodec(String fullCodec) {
|
||||
this.fullCodec = fullCodec;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns stream format.
|
||||
*
|
||||
* @return stream format
|
||||
*/
|
||||
public String getFormat() {
|
||||
return format;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets stream format.
|
||||
*
|
||||
* @param format stream format
|
||||
*/
|
||||
public void setFormat(String format) {
|
||||
this.format = format;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns full stream format.
|
||||
*
|
||||
* @return stream format with
|
||||
*/
|
||||
public String getFullFormat() {
|
||||
return fullFormat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets full stream format.
|
||||
*
|
||||
* @param fullFormat stream format with
|
||||
*/
|
||||
public void setFullFormat(String fullFormat) {
|
||||
this.fullFormat = fullFormat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns width.
|
||||
*
|
||||
* @return width in pixels
|
||||
*/
|
||||
public Long getWidth() {
|
||||
return width;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets width.
|
||||
*
|
||||
* @param width width in pixels
|
||||
*/
|
||||
public void setWidth(Long width) {
|
||||
this.width = width;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns height.
|
||||
*
|
||||
* @return height in pixels
|
||||
*/
|
||||
public Long getHeight() {
|
||||
return height;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets height.
|
||||
*
|
||||
* @param height height in pixels
|
||||
*/
|
||||
public void setHeight(Long height) {
|
||||
this.height = height;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns bitrate.
|
||||
*
|
||||
* @return bitrate in kb/s
|
||||
*/
|
||||
public Long getBitrate() {
|
||||
return bitrate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets bitrate.
|
||||
*
|
||||
* @param bitrate bitrate in kb/s
|
||||
*/
|
||||
public void setBitrate(Long bitrate) {
|
||||
this.bitrate = bitrate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns sample rate.
|
||||
*
|
||||
* @return sample rate in hz
|
||||
*/
|
||||
public Long getSampleRate() {
|
||||
return sampleRate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets sample rate.
|
||||
*
|
||||
* @param sampleRate sample rate in hz
|
||||
*/
|
||||
public void setSampleRate(Long sampleRate) {
|
||||
this.sampleRate = sampleRate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns sample format.
|
||||
*
|
||||
* @return sample format
|
||||
*/
|
||||
public String getSampleFormat() {
|
||||
return sampleFormat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets sample format.
|
||||
*
|
||||
* @param sampleFormat sample format
|
||||
*/
|
||||
public void setSampleFormat(String sampleFormat) {
|
||||
this.sampleFormat = sampleFormat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns channel layout.
|
||||
*
|
||||
* @return channel layout
|
||||
*/
|
||||
public String getChannelLayout() {
|
||||
return channelLayout;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets channel layout.
|
||||
*
|
||||
* @param channelLayout channel layout
|
||||
*/
|
||||
public void setChannelLayout(String channelLayout) {
|
||||
this.channelLayout = channelLayout;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns sample aspect ratio.
|
||||
*
|
||||
* @return sample aspect ratio
|
||||
*/
|
||||
public String getSampleAspectRatio() {
|
||||
return sampleAspectRatio;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets sample aspect ratio.
|
||||
*
|
||||
* @param sampleAspectRatio sample aspect ratio
|
||||
*/
|
||||
public void setSampleAspectRatio(String sampleAspectRatio) {
|
||||
this.sampleAspectRatio = sampleAspectRatio;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns display aspect ratio.
|
||||
*
|
||||
* @return display aspect ratio
|
||||
*/
|
||||
public String getDisplayAspectRatio() {
|
||||
return displayAspectRatio;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets display aspect ratio.
|
||||
*
|
||||
* @param displayAspectRatio display aspect ratio
|
||||
*/
|
||||
public void setDisplayAspectRatio(String displayAspectRatio) {
|
||||
this.displayAspectRatio = displayAspectRatio;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns display aspect ratio.
|
||||
*
|
||||
* @return average frame rate in fps
|
||||
*/
|
||||
public String getAverageFrameRate() {
|
||||
return averageFrameRate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets average frame rate.
|
||||
*
|
||||
* @param averageFrameRate average frame rate in fps
|
||||
*/
|
||||
public void setAverageFrameRate(String averageFrameRate) {
|
||||
this.averageFrameRate = averageFrameRate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns real frame rate.
|
||||
*
|
||||
* @return real frame rate in tbr
|
||||
*/
|
||||
public String getRealFrameRate() {
|
||||
return realFrameRate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets real frame rate.
|
||||
*
|
||||
* @param realFrameRate real frame rate in tbr
|
||||
*/
|
||||
public void setRealFrameRate(String realFrameRate) {
|
||||
this.realFrameRate = realFrameRate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns time base.
|
||||
*
|
||||
* @return time base in tbn
|
||||
*/
|
||||
public String getTimeBase() {
|
||||
return timeBase;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets time base.
|
||||
*
|
||||
* @param timeBase time base in tbn
|
||||
*/
|
||||
public void setTimeBase(String timeBase) {
|
||||
this.timeBase = timeBase;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns codec time base.
|
||||
*
|
||||
* @return codec time base in tbc
|
||||
*/
|
||||
public String getCodecTimeBase() {
|
||||
return codecTimeBase;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets codec time base.
|
||||
*
|
||||
* @param codecTimeBase codec time base in tbc
|
||||
*/
|
||||
public void setCodecTimeBase(String codecTimeBase) {
|
||||
this.codecTimeBase = codecTimeBase;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds metadata.
|
||||
*
|
||||
* @param key metadata key
|
||||
* @param value metadata value
|
||||
*/
|
||||
public void addMetadata(String key, String value) {
|
||||
this.metadata.put(key, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all metadata entries.
|
||||
*
|
||||
* @return set of metadata entries
|
||||
*/
|
||||
public Set<Map.Entry<String, String>> getMetadataEntries() {
|
||||
return this.metadata.entrySet();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg.util;
|
||||
|
||||
public class Trio<A, B, C> {
|
||||
|
||||
/**
|
||||
* The first element of the trio.
|
||||
*/
|
||||
protected final A first;
|
||||
|
||||
/**
|
||||
* The second element of the trio.
|
||||
*/
|
||||
protected final B second;
|
||||
|
||||
/**
|
||||
* The third element of the trio.
|
||||
*/
|
||||
protected final C third;
|
||||
|
||||
public Trio(final A first, final B second, final C third) {
|
||||
this.first = first;
|
||||
this.second = second;
|
||||
this.third = third;
|
||||
}
|
||||
|
||||
public A getFirst() {
|
||||
return first;
|
||||
}
|
||||
|
||||
public B getSecond() {
|
||||
return second;
|
||||
}
|
||||
|
||||
public C getThird() {
|
||||
return third;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,187 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>Tests for {@link Config} class.
|
||||
*/
|
||||
public class ConfigTest {
|
||||
|
||||
private static final String externalLibrariesCommandOutput = " configuration:\n" +
|
||||
" --cross-prefix=i686-linux-android-\n" +
|
||||
" --sysroot=/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot\n" +
|
||||
" --prefix=/Users/taner/Projects/mobile-ffmpeg/prebuilt/android-x86/ffmpeg\n" +
|
||||
" --pkg-config=/usr/local/bin/pkg-config --extra-cflags='-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32 -Wno-unused-function -fstrict-aliasing -fPIC -DANDROID -D__ANDROID__ -D__ANDROID_API__=21 -O2 -I/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot/usr/include -I/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot/usr/local/include'\n" +
|
||||
" --extra-cxxflags='-std=c++11 -fno-exceptions -fno-rtti'\n" +
|
||||
" --extra-ldflags='-march=i686 -Wl,--gc-sections,--icf=safe -lc -lm -ldl -llog -lc++_shared -L/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/i686-linux-android/lib -L/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot/usr/lib -L/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/lib -L/Users/taner/Library/Android/sdk/ndk-bundle/platforms/android-21/arch-x86/usr/lib'\n" +
|
||||
" --enable-version3\n" +
|
||||
" --arch=i686\n" +
|
||||
" --cpu=i686\n" +
|
||||
" --target-os=android\n" +
|
||||
" --disable-neon\n" +
|
||||
" --disable-asm\n" +
|
||||
" --disable-inline-asm\n" +
|
||||
" --enable-cross-compile\n" +
|
||||
" --enable-pic\n" +
|
||||
" --enable-jni\n" +
|
||||
" --enable-libvorbis\n" +
|
||||
" --enable-optimizations\n" +
|
||||
" --enable-swscale\n" +
|
||||
" --enable-shared\n" +
|
||||
" --enable-v4l2-m2m\n" +
|
||||
" --enable-small\n" +
|
||||
" --disable-openssl\n" +
|
||||
" --disable-xmm-clobber-test\n" +
|
||||
" --disable-debug\n" +
|
||||
" --disable-neon-clobber-test\n" +
|
||||
" --disable-programs\n" +
|
||||
" --disable-postproc\n" +
|
||||
" --disable-doc\n" +
|
||||
" --disable-htmlpages\n" +
|
||||
" --disable-manpages\n" +
|
||||
" --disable-podpages\n" +
|
||||
" --disable-txtpages\n" +
|
||||
" --disable-static\n" +
|
||||
" --disable-sndio\n" +
|
||||
" --disable-schannel\n" +
|
||||
" --disable-securetransport\n" +
|
||||
" --disable-xlib\n" +
|
||||
" --disable-cuda\n" +
|
||||
" --disable-cuvid\n" +
|
||||
" --disable-nvenc\n" +
|
||||
" --disable-vaapi\n" +
|
||||
" --disable-vdpau\n" +
|
||||
" --disable-videotoolbox\n" +
|
||||
" --disable-audiotoolbox\n" +
|
||||
" --disable-appkit\n" +
|
||||
" --disable-alsa\n" +
|
||||
" --disable-cuda\n" +
|
||||
" --disable-cuvid\n" +
|
||||
" --disable-nvenc\n" +
|
||||
" --disable-vaapi\n" +
|
||||
" --disable-vdpau\n" +
|
||||
" --disable-zlib\n";
|
||||
|
||||
@Test
|
||||
public void getExternalLibraries() {
|
||||
|
||||
final List<String> supportedExternalLibraries = new ArrayList<>();
|
||||
supportedExternalLibraries.add("chromaprint");
|
||||
supportedExternalLibraries.add("fontconfig");
|
||||
supportedExternalLibraries.add("freetype");
|
||||
supportedExternalLibraries.add("fribidi");
|
||||
supportedExternalLibraries.add("gmp");
|
||||
supportedExternalLibraries.add("gnutls");
|
||||
supportedExternalLibraries.add("kvazaar");
|
||||
supportedExternalLibraries.add("lame");
|
||||
supportedExternalLibraries.add("libaom");
|
||||
supportedExternalLibraries.add("libass");
|
||||
supportedExternalLibraries.add("libiconv");
|
||||
supportedExternalLibraries.add("libilbc");
|
||||
supportedExternalLibraries.add("libtheora");
|
||||
supportedExternalLibraries.add("libvidstab");
|
||||
supportedExternalLibraries.add("libvorbis");
|
||||
supportedExternalLibraries.add("libvpx");
|
||||
supportedExternalLibraries.add("libwebp");
|
||||
supportedExternalLibraries.add("libxml2");
|
||||
supportedExternalLibraries.add("opencore-amr");
|
||||
supportedExternalLibraries.add("opus");
|
||||
supportedExternalLibraries.add("shine");
|
||||
supportedExternalLibraries.add("sdl");
|
||||
supportedExternalLibraries.add("snappy");
|
||||
supportedExternalLibraries.add("soxr");
|
||||
supportedExternalLibraries.add("speex");
|
||||
supportedExternalLibraries.add("tesseract");
|
||||
supportedExternalLibraries.add("twolame");
|
||||
supportedExternalLibraries.add("wavpack");
|
||||
supportedExternalLibraries.add("x264");
|
||||
supportedExternalLibraries.add("x265");
|
||||
supportedExternalLibraries.add("xvidcore");
|
||||
supportedExternalLibraries.add("android-zlib");
|
||||
supportedExternalLibraries.add("android-media-codec");
|
||||
|
||||
|
||||
final List<String> enabledList = new ArrayList<>();
|
||||
for (String supportedExternalLibrary : supportedExternalLibraries) {
|
||||
if (externalLibrariesCommandOutput.contains("enable-" + supportedExternalLibrary) ||
|
||||
externalLibrariesCommandOutput.contains("enable-lib" + supportedExternalLibrary)) {
|
||||
enabledList.add(supportedExternalLibrary);
|
||||
}
|
||||
}
|
||||
|
||||
Collections.sort(enabledList);
|
||||
|
||||
Assert.assertNotNull(enabledList);
|
||||
Assert.assertTrue(enabledList.size() == 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getPackageName() {
|
||||
Assert.assertEquals("min", listToPackageName(Collections.singletonList("")));
|
||||
Assert.assertEquals("min-gpl", listToPackageName(Collections.singletonList("xvidcore")));
|
||||
Assert.assertEquals("full-gpl", listToPackageName(Arrays.asList("gnutls", "speex", "fribidi", "xvidcore")));
|
||||
Assert.assertEquals("full", listToPackageName(Arrays.asList("fribidi", "speex")));
|
||||
Assert.assertEquals("video", listToPackageName(Collections.singletonList("fribidi")));
|
||||
Assert.assertEquals("audio", listToPackageName(Collections.singletonList("speex")));
|
||||
Assert.assertEquals("https", listToPackageName(Collections.singletonList("gnutls")));
|
||||
Assert.assertEquals("https-gpl", listToPackageName(Arrays.asList("gnutls", "xvidcore")));
|
||||
}
|
||||
|
||||
private String listToPackageName(final List<String> externalLibraryList) {
|
||||
boolean speex = externalLibraryList.contains("speex");
|
||||
boolean fribidi = externalLibraryList.contains("fribidi");
|
||||
boolean gnutls = externalLibraryList.contains("gnutls");
|
||||
boolean xvidcore = externalLibraryList.contains("xvidcore");
|
||||
|
||||
if (speex && fribidi) {
|
||||
if (xvidcore) {
|
||||
return "full-gpl";
|
||||
} else {
|
||||
return "full";
|
||||
}
|
||||
} else if (speex) {
|
||||
return "audio";
|
||||
} else if (fribidi) {
|
||||
return "video";
|
||||
} else if (xvidcore) {
|
||||
if (gnutls) {
|
||||
return "https-gpl";
|
||||
} else {
|
||||
return "min-gpl";
|
||||
}
|
||||
} else {
|
||||
if (gnutls) {
|
||||
return "https";
|
||||
} else {
|
||||
return "min";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+13
-24
@@ -17,31 +17,20 @@
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg.util;
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
public class Pair<A, B> {
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* The first element of the pair.
|
||||
*/
|
||||
protected A first;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* The second element of the pair.
|
||||
*/
|
||||
protected B second;
|
||||
|
||||
public Pair(final A first, final B second) {
|
||||
this.first = first;
|
||||
this.second = second;
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||
*/
|
||||
public class ExampleUnitTest {
|
||||
@Test
|
||||
public void addition_isCorrect() throws Exception {
|
||||
assertEquals(4, 2 + 2);
|
||||
}
|
||||
|
||||
public A getFirst() {
|
||||
return first;
|
||||
}
|
||||
|
||||
public B getSecond() {
|
||||
return second;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,458 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* <p>Tests for {@link FFmpeg} class.
|
||||
*/
|
||||
public class FFmpegTest {
|
||||
|
||||
private static final String MEDIA_INFORMATION_MP3 =
|
||||
"Unknown attached picture mimetype: audio/x-wav, skipping.\n" +
|
||||
"[mp3 @ 0x7ffb94805800] Estimating duration from bitrate, this may be inaccurate\n" +
|
||||
"Input #0, mp3, from 'beethoven_-_symphony_no_9.mp3':\n" +
|
||||
" Metadata:\n" +
|
||||
" comment : \n" +
|
||||
" album : Symphony No.9\n" +
|
||||
" compilation : 0\n" +
|
||||
" date : -1\n" +
|
||||
" title : Symphony No.9\n" +
|
||||
" artist : Beethoven\n" +
|
||||
" album_artist : Beethoven\n" +
|
||||
" track : -1\n" +
|
||||
" lyrics-XXX : \n" +
|
||||
" Duration: 00:03:33.24, start: 0.000000, bitrate: 320 kb/s\n" +
|
||||
" Stream #0:0: Audio: mp3, 48000 Hz, stereo, fltp, 320 kb/s\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (mp3 (mp3float) -> pcm_s16le (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" comment : \n" +
|
||||
" album : Symphony No.9\n" +
|
||||
" compilation : 0\n" +
|
||||
" date : -1\n" +
|
||||
" title : Symphony No.9\n" +
|
||||
" artist : Beethoven\n" +
|
||||
" album_artist : Beethoven\n" +
|
||||
" track : -1\n" +
|
||||
" lyrics-XXX : \n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0: Audio: pcm_s16le, 48000 Hz, stereo, s16, 1536 kb/s\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavc58.18.100 pcm_s16le\n" +
|
||||
"size=N/A time=00:03:33.24 bitrate=N/A speed= 618x \n" +
|
||||
"video:0kB audio:39982kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown";
|
||||
|
||||
private static final String MEDIA_INFORMATION_JPG =
|
||||
"Input #0, image2, from '/data/user/0/com.arthenica.mobileffmpeg.test/cache/colosseum.jpg':\n" +
|
||||
" Duration: 00:00:00.04, start: 0.000000, bitrate: 391187 kb/s\n" +
|
||||
" Stream #0:0: Video: mjpeg, yuvj420p(pc, bt470bg/unknown/unknown), 2560x1708 [SAR 1:1 DAR 640:427], 25 tbr, 25 tbn, 25 tbc\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (mjpeg (native) -> wrapped_avframe (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavf58.18.104\n" +
|
||||
" Stream #0:0: Video: wrapped_avframe, yuvj420p, 2560x1708 [SAR 1:1 DAR 640:427], q=2-31, 200 kb/s, 25 fps, 25 tbn, 25 tbc\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavc58.31.102 wrapped_avframe\n" +
|
||||
"frame= 1 fps=0.0 q=-0.0 Lsize=N/A time=00:00:00.04 bitrate=N/A speed=0.668x \n" +
|
||||
"video:0kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown\n";
|
||||
|
||||
private static final String MEDIA_INFORMATION_GIF =
|
||||
"Input #0, gif, from 'advanced_zoom_in_and_pan_with_fade_in_out.gif':\n" +
|
||||
" Duration: N/A, bitrate: N/A\n" +
|
||||
" Stream #0:0: Video: gif, bgra, 420x236, 6 fps, 6 tbr, 100 tbn, 100 tbc\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (gif (native) -> wrapped_avframe (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0: Video: wrapped_avframe, bgra, 420x236 [SAR 63:64 DAR 6615:3776], q=2-31, 200 kb/s, 6 fps, 6 tbn, 6 tbc\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavc58.18.100 wrapped_avframe\n" +
|
||||
"frame= 61 fps=0.0 q=-0.0 Lsize=N/A time=00:00:10.16 bitrate=N/A speed= 219x \n" +
|
||||
"video:32kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown";
|
||||
|
||||
private static final String MEDIA_INFORMATION_H264 =
|
||||
"Input #0, mov,mp4,m4a,3gp,3g2,mj2, from 'transition_rotate.mp4':\n" +
|
||||
" Metadata:\n" +
|
||||
" major_brand : isom\n" +
|
||||
" minor_version : 512\n" +
|
||||
" compatible_brands: isomiso2avc1mp41\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Duration: 00:00:15.00, start: 0.000000, bitrate: 7764 kb/s\n" +
|
||||
" Stream #0:0(und): Video: h264 (Main) (avc1 / 0x31637661), yuv420p, 1280x720 [SAR 1:1 DAR 16:9], 7762 kb/s, 25 fps, 30 tbr, 15360 tbn, 60 tbc (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" handler_name : VideoHandler\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (h264 (native) -> wrapped_avframe (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" major_brand : isom\n" +
|
||||
" minor_version : 512\n" +
|
||||
" compatible_brands: isomiso2avc1mp41\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0(und): Video: wrapped_avframe, yuv420p, 1280x720 [SAR 1:1 DAR 16:9], q=2-31, 200 kb/s, 30 fps, 30 tbn, 30 tbc (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" handler_name : VideoHandler\n" +
|
||||
" encoder : Lavc58.18.100 wrapped_avframe\n" +
|
||||
"frame= 375 fps=0.0 q=-0.0 Lsize=N/A time=00:00:15.00 bitrate=N/A speed=35.9x \n" +
|
||||
"video:196kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown";
|
||||
|
||||
private static final String MEDIA_INFORMATION_PNG =
|
||||
"Input #0, png_pipe, from 'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png':\n" +
|
||||
" Duration: N/A, bitrate: N/A\n" +
|
||||
" Stream #0:0: Video: png, rgba(pc), 544x184, 25 tbr, 25 tbn, 25 tbc\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (png (native) -> wrapped_avframe (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0: Video: wrapped_avframe, rgba, 544x184, q=2-31, 200 kb/s, 25 fps, 25 tbn, 25 tbc\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavc58.18.100 wrapped_avframe\n" +
|
||||
"frame= 1 fps=0.0 q=-0.0 Lsize=N/A time=00:00:00.04 bitrate=N/A speed=27.1x \n" +
|
||||
"video:1kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown";
|
||||
|
||||
private static final String MEDIA_INFORMATION_H264_2 =
|
||||
"Input #0, h264, from 'test.h264':\n" +
|
||||
" Duration: N/A, bitrate: N/A\n" +
|
||||
" Stream #0:0: Video: h264 (Main), yuv420p(tv, bt709, progressive), 1920x1080, 25 fps, 25 tbr, 1200k tbn, 50 tbc\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (h264 (native) -> wrapped_avframe (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0: Video: wrapped_avframe, yuv420p, 1920x1080, q=2-31, 200 kb/s, 25 fps, 25 tbn, 25 tbc\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavc58.18.100 wrapped_avframe\n" +
|
||||
"frame= 360 fps=0.0 q=-0.0 Lsize=N/A time=00:00:14.40 bitrate=N/A speed=25.5x \n" +
|
||||
"video:188kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown";
|
||||
|
||||
private static final String MEDIA_INFORMATION_MP4 =
|
||||
"Input #0, mov,mp4,m4a,3gp,3g2,mj2, from 'http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_2160p_30fps_stereo_abl.mp4':\n" +
|
||||
" Metadata:\n" +
|
||||
" major_brand : isom\n" +
|
||||
" minor_version : 1\n" +
|
||||
" compatible_brands: isomavc1\n" +
|
||||
" creation_time : 2013-12-16T17:21:55.000000Z\n" +
|
||||
" title : Big Buck Bunny, Sunflower version\n" +
|
||||
" artist : Blender Foundation 2008, Janus Bager Kristensen 2013\n" +
|
||||
" comment : Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net\n" +
|
||||
" genre : Animation\n" +
|
||||
" composer : Sacha Goedegebure\n" +
|
||||
" Duration: 00:10:34.53, start: 0.000000, bitrate: 10385 kb/s\n" +
|
||||
" Stream #0:0(und): Video: h264 (High) (avc1 / 0x31637661), yuv420p, 3840x4320 [SAR 1:1 DAR 8:9], 9902 kb/s, 30 fps, 30 tbr, 30k tbn, 60 tbc (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:21:55.000000Z\n" +
|
||||
" handler_name : GPAC ISO Video Handler\n" +
|
||||
" Stream #0:1(und): Audio: mp3 (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 160 kb/s (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:21:58.000000Z\n" +
|
||||
" handler_name : GPAC ISO Audio Handler\n" +
|
||||
" Stream #0:2(und): Audio: ac3 (ac-3 / 0x332D6361), 48000 Hz, 5.1(side), fltp, 320 kb/s (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:21:58.000000Z\n" +
|
||||
" handler_name : GPAC ISO Audio Handler\n" +
|
||||
" Side data:\n" +
|
||||
" audio service type: main\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (h264 (native) -> wrapped_avframe (native))\n" +
|
||||
" Stream #0:2 -> #0:1 (ac3 (native) -> pcm_s16le (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" major_brand : isom\n" +
|
||||
" minor_version : 1\n" +
|
||||
" compatible_brands: isomavc1\n" +
|
||||
" composer : Sacha Goedegebure\n" +
|
||||
" title : Big Buck Bunny, Sunflower version\n" +
|
||||
" artist : Blender Foundation 2008, Janus Bager Kristensen 2013\n" +
|
||||
" comment : Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net\n" +
|
||||
" genre : Animation\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0(und): Video: wrapped_avframe, yuv420p(progressive), 3840x4320 [SAR 1:1 DAR 8:9], q=2-31, 200 kb/s, 30 fps, 30 tbn, 30 tbc (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:21:55.000000Z\n" +
|
||||
" handler_name : GPAC ISO Video Handler\n" +
|
||||
" encoder : Lavc58.18.100 wrapped_avframe\n" +
|
||||
" Stream #0:1(und): Audio: pcm_s16le, 48000 Hz, 5.1(side), s16, 4608 kb/s (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:21:58.000000Z\n" +
|
||||
" handler_name : GPAC ISO Audio Handler\n" +
|
||||
" encoder : Lavc58.18.100 pcm_s16le\n" +
|
||||
" Side data:\n" +
|
||||
" audio service type: main\n" +
|
||||
"frame= 2798 fps= 85 q=-0.0 size=N/A time=00:01:33.33 bitrate=N/A speed=2.85x \n";
|
||||
|
||||
private static final String MEDIA_INFORMATION_MP4_2 =
|
||||
"Input #0, mov,mp4,m4a,3gp,3g2,mj2, from 'http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_stereo_arcd.mp4':\n" +
|
||||
" Metadata:\n" +
|
||||
" major_brand : isom\n" +
|
||||
" minor_version : 1\n" +
|
||||
" compatible_brands: isomavc1\n" +
|
||||
" creation_time : 2013-12-16T17:49:59.000000Z\n" +
|
||||
" title : Big Buck Bunny, Sunflower version\n" +
|
||||
" artist : Blender Foundation 2008, Janus Bager Kristensen 2013\n" +
|
||||
" comment : Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net\n" +
|
||||
" genre : Animation\n" +
|
||||
" composer : Sacha Goedegebure\n" +
|
||||
" Duration: 00:10:34.53, start: 0.000000, bitrate: 4474 kb/s\n" +
|
||||
" Stream #0:0(und): Video: h264 (High) (avc1 / 0x31637661), yuv420p, 1920x1080 [SAR 1:1 DAR 16:9], 3992 kb/s, 30 fps, 30 tbr, 30k tbn, 60 tbc (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:49:59.000000Z\n" +
|
||||
" handler_name : GPAC ISO Video Handler\n" +
|
||||
" Stream #0:1(und): Audio: mp3 (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 160 kb/s (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:50:04.000000Z\n" +
|
||||
" handler_name : GPAC ISO Audio Handler\n" +
|
||||
" Stream #0:2(und): Audio: ac3 (ac-3 / 0x332D6361), 48000 Hz, 5.1(side), fltp, 320 kb/s (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:50:04.000000Z\n" +
|
||||
" handler_name : GPAC ISO Audio Handler\n" +
|
||||
" Side data:\n" +
|
||||
" audio service type: main\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (h264 (native) -> wrapped_avframe (native))\n" +
|
||||
" Stream #0:2 -> #0:1 (ac3 (native) -> pcm_s16le (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" major_brand : isom\n" +
|
||||
" minor_version : 1\n" +
|
||||
" compatible_brands: isomavc1\n" +
|
||||
" composer : Sacha Goedegebure\n" +
|
||||
" title : Big Buck Bunny, Sunflower version\n" +
|
||||
" artist : Blender Foundation 2008, Janus Bager Kristensen 2013\n" +
|
||||
" comment : Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net\n" +
|
||||
" genre : Animation\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0(und): Video: wrapped_avframe, yuv420p(progressive), 1920x1080 [SAR 1:1 DAR 16:9], q=2-31, 200 kb/s, 30 fps, 30 tbn, 30 tbc (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:49:59.000000Z\n" +
|
||||
" handler_name : GPAC ISO Video Handler\n" +
|
||||
" encoder : Lavc58.18.100 wrapped_avframe\n" +
|
||||
" Stream #0:1(und): Audio: pcm_s16le, 48000 Hz, 5.1(side), s16, 4608 kb/s (default)\n" +
|
||||
" Metadata:\n" +
|
||||
" creation_time : 2013-12-16T17:50:04.000000Z\n" +
|
||||
" handler_name : GPAC ISO Audio Handler\n" +
|
||||
" encoder : Lavc58.18.100 pcm_s16le\n" +
|
||||
" Side data:\n" +
|
||||
" audio service type: main\n" +
|
||||
"frame=19036 fps=401 q=-0.0 Lsize=N/A time=00:10:34.60 bitrate=N/A speed=13.4x \n" +
|
||||
"video:9964kB audio:356706kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown";
|
||||
|
||||
private static final String MEDIA_INFORMATION_OGG =
|
||||
"[theora @ 0x7fa30c026e00] 7 bits left in packet 82\n" +
|
||||
"[ogg @ 0x7fa30c005e00] Broken file, keyframe not correctly marked.\n" +
|
||||
"Input #0, ogg, from 'trailer_400p.ogg':\n" +
|
||||
" Duration: 00:00:33.00, start: 0.000000, bitrate: 1057 kb/s\n" +
|
||||
" Stream #0:0: Video: theora, yuv420p(bt470bg/bt470bg/bt709), 720x400, 25 fps, 25 tbr, 25 tbn, 25 tbc\n" +
|
||||
" Metadata:\n" +
|
||||
" ENCODER : ffmpeg2theora 0.19\n" +
|
||||
" Stream #0:1: Audio: vorbis, 48000 Hz, stereo, fltp, 80 kb/s\n" +
|
||||
" Metadata:\n" +
|
||||
" ENCODER : ffmpeg2theora 0.19\n" +
|
||||
"[theora @ 0x7fa30c1bd600] 7 bits left in packet 82\n" +
|
||||
"Stream mapping:\n" +
|
||||
" Stream #0:0 -> #0:0 (theora (native) -> wrapped_avframe (native))\n" +
|
||||
" Stream #0:1 -> #0:1 (vorbis (native) -> pcm_s16le (native))\n" +
|
||||
"Press [q] to stop, [?] for help\n" +
|
||||
"Output #0, null, to 'pipe:':\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavf58.12.100\n" +
|
||||
" Stream #0:0: Video: wrapped_avframe, yuv420p(progressive), 720x400, q=2-31, 200 kb/s, 25 fps, 25 tbn, 25 tbc\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavc58.18.100 wrapped_avframe\n" +
|
||||
" Stream #0:1: Audio: pcm_s16le, 48000 Hz, stereo, s16, 1536 kb/s\n" +
|
||||
" Metadata:\n" +
|
||||
" encoder : Lavc58.18.100 pcm_s16le\n" +
|
||||
"[ogg @ 0x7fa30c005e00] Broken file, keyframe not correctly marked.\n" +
|
||||
" Last message repeated 5 times\n" +
|
||||
"frame= 813 fps=0.0 q=-0.0 Lsize=N/A time=00:00:33.01 bitrate=N/A speed= 234x \n" +
|
||||
"video:426kB audio:6190kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown";
|
||||
|
||||
@Test
|
||||
public void mediaInformationMp3() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_MP3);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "mp3", "beethoven_-_symphony_no_9.mp3");
|
||||
assertMediaDuration(mediaInformation, 213240L, 0L, 320L);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(1, mediaInformation.getStreams().size());
|
||||
assertAudioStream(mediaInformation.getStreams().get(0), 0L, "mp3", "mp3", 48000L, "stereo", "fltp", 320L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationJpg() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_JPG);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "image2", "/data/user/0/com.arthenica.mobileffmpeg.test/cache/colosseum.jpg");
|
||||
assertMediaDuration(mediaInformation, 40L, 0L, 391187L);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(1, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "mjpeg", "mjpeg", "yuvj420p", "yuvj420p(pc, bt470bg/unknown/unknown)", 2560L, 1708L, "1:1", "640:427", null, null, "25", "25", "25");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationGif() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_GIF);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "gif", "advanced_zoom_in_and_pan_with_fade_in_out.gif");
|
||||
assertMediaDuration(mediaInformation, null, null, null);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(1, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "gif", "gif", "bgra", "bgra", 420L, 236L, null, null, null, "6", "6", "100", "100");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationH264() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_H264);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "mov,mp4,m4a,3gp,3g2,mj2", "transition_rotate.mp4");
|
||||
assertMediaDuration(mediaInformation, 15000L, 0L, 7764L);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(1, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "h264", "h264 (main) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 1280L, 720L, "1:1", "16:9", 7762L, "25", "30", "15360", "60");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationPng() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_PNG);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "png_pipe", "https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png");
|
||||
assertMediaDuration(mediaInformation, null, null, null);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(1, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "png", "png", "rgba", "rgba(pc)", 544L, 184L, null, null, null, null, "25", "25", "25");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationH2642() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_H264_2);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "h264", "test.h264");
|
||||
assertMediaDuration(mediaInformation, null, null, null);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(1, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "h264", "h264 (main)", "yuv420p", "yuv420p(tv, bt709, progressive)", 1920L, 1080L, null, null, null, "25", "25", "1200k", "50");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationMp4() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_MP4);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "mov,mp4,m4a,3gp,3g2,mj2", "http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_2160p_30fps_stereo_abl.mp4");
|
||||
assertMediaDuration(mediaInformation, 634530L, 0L, 10385L);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(3, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "h264", "h264 (high) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 3840L, 4320L, "1:1", "8:9", 9902L, "30", "30", "30k", "60");
|
||||
assertAudioStream(mediaInformation.getStreams().get(1), 1L, "mp3", "mp3 (mp4a / 0x6134706d)", 48000L, "stereo", "fltp", 160L);
|
||||
assertAudioStream(mediaInformation.getStreams().get(2), 2L, "ac3", "ac3 (ac-3 / 0x332d6361)", 48000L, "5.1(side)", "fltp", 320L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationMp42() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_MP4_2);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "mov,mp4,m4a,3gp,3g2,mj2", "http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_stereo_arcd.mp4");
|
||||
assertMediaDuration(mediaInformation, 634530L, 0L, 4474L);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(3, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "h264", "h264 (high) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 1920L, 1080L, "1:1", "16:9", 3992L, "30", "30", "30k", "60");
|
||||
assertAudioStream(mediaInformation.getStreams().get(1), 1L, "mp3", "mp3 (mp4a / 0x6134706d)", 48000L, "stereo", "fltp", 160L);
|
||||
assertAudioStream(mediaInformation.getStreams().get(2), 2L, "ac3", "ac3 (ac-3 / 0x332d6361)", 48000L, "5.1(side)", "fltp", 320L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mediaInformationOgg() {
|
||||
MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_OGG);
|
||||
|
||||
Assert.assertNotNull(mediaInformation);
|
||||
assertMediaInput(mediaInformation, "ogg", "trailer_400p.ogg");
|
||||
assertMediaDuration(mediaInformation, 33000L, 0L, 1057L);
|
||||
Assert.assertNotNull(mediaInformation.getStreams());
|
||||
Assert.assertEquals(2, mediaInformation.getStreams().size());
|
||||
assertVideoStream(mediaInformation.getStreams().get(0), 0L, "theora", "theora", "yuv420p", "yuv420p(bt470bg/bt470bg/bt709)", 720L, 400L, null, null, null, "25", "25", "25", "25");
|
||||
assertAudioStream(mediaInformation.getStreams().get(1), 1L, "vorbis", "vorbis", 48000L, "stereo", "fltp", 80L);
|
||||
}
|
||||
|
||||
private void assertMediaInput(MediaInformation mediaInformation, String format, String path) {
|
||||
Assert.assertEquals(format, mediaInformation.getFormat());
|
||||
Assert.assertEquals(path, mediaInformation.getPath());
|
||||
}
|
||||
|
||||
private void assertMediaDuration(MediaInformation mediaInformation, Long duration, Long startTime, Long bitrate) {
|
||||
Assert.assertEquals(duration, mediaInformation.getDuration());
|
||||
Assert.assertEquals(startTime, mediaInformation.getStartTime());
|
||||
Assert.assertEquals(bitrate, mediaInformation.getBitrate());
|
||||
}
|
||||
|
||||
private void assertAudioStream(StreamInformation streamInformation, Long index, String codec, String fullCodec, Long sampleRate, String channelLayout, String sampleFormat, Long bitrate) {
|
||||
Assert.assertEquals(index, streamInformation.getIndex());
|
||||
Assert.assertEquals("audio", streamInformation.getType());
|
||||
Assert.assertEquals(codec, streamInformation.getCodec());
|
||||
Assert.assertEquals(fullCodec, streamInformation.getFullCodec());
|
||||
Assert.assertEquals(sampleRate, streamInformation.getSampleRate());
|
||||
Assert.assertEquals(channelLayout, streamInformation.getChannelLayout());
|
||||
Assert.assertEquals(sampleFormat, streamInformation.getSampleFormat());
|
||||
Assert.assertEquals(bitrate, streamInformation.getBitrate());
|
||||
}
|
||||
|
||||
private void assertVideoStream(StreamInformation streamInformation, Long index, String codec, String fullCodec, String format, String fullFormat, Long width, Long height, String sar, String dar, Long bitrate, String averageFrameRate, String realFrameRate, String timeBase, String codecTimeBase) {
|
||||
Assert.assertEquals(index, streamInformation.getIndex());
|
||||
Assert.assertEquals("video", streamInformation.getType());
|
||||
Assert.assertEquals(codec, streamInformation.getCodec());
|
||||
Assert.assertEquals(fullCodec, streamInformation.getFullCodec());
|
||||
|
||||
Assert.assertEquals(format, streamInformation.getFormat());
|
||||
Assert.assertEquals(fullFormat, streamInformation.getFullFormat());
|
||||
|
||||
Assert.assertEquals(width, streamInformation.getWidth());
|
||||
Assert.assertEquals(height, streamInformation.getHeight());
|
||||
Assert.assertEquals(sar, streamInformation.getSampleAspectRatio());
|
||||
Assert.assertEquals(dar, streamInformation.getDisplayAspectRatio());
|
||||
|
||||
Assert.assertEquals(bitrate, streamInformation.getBitrate());
|
||||
|
||||
Assert.assertEquals(averageFrameRate, streamInformation.getAverageFrameRate());
|
||||
Assert.assertEquals(realFrameRate, streamInformation.getRealFrameRate());
|
||||
Assert.assertEquals(timeBase, streamInformation.getTimeBase());
|
||||
Assert.assertEquals(codecTimeBase, streamInformation.getCodecTimeBase());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,300 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Taner Sener
|
||||
*
|
||||
* This file is part of MobileFFmpeg.
|
||||
*
|
||||
* MobileFFmpeg is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* MobileFFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with MobileFFmpeg. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.arthenica.mobileffmpeg;
|
||||
|
||||
import com.arthenica.mobileffmpeg.util.Pair;
|
||||
import com.arthenica.mobileffmpeg.util.Trio;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
public class MediaInformationTest {
|
||||
|
||||
@Test
|
||||
public void parseVideoStream() {
|
||||
parseVideoStreamBlock(" Stream #0:0: Video: mjpeg, yuvj420p(pc, bt470bg/unknown/unknown), 2560x1708 [SAR 1:1 DAR 640:427], 25 tbr, 25 tbn, 25 tbc", 0L, "mjpeg", "mjpeg", "yuvj420p", "yuvj420p(pc, bt470bg/unknown/unknown)", 2560L, 1708L, "1:1", "640:427", null, null, "25", "25", "25");
|
||||
parseVideoStreamBlock(" Stream #0:0: Video: gif, bgra, 420x236, 6 fps, 6 tbr, 100 tbn, 100 tbc", 0L, "gif",
|
||||
"gif", "bgra", "bgra", 420L, 236L, null, null, null, "6", "6", "100", "100");
|
||||
parseVideoStreamBlock(" Stream #0:0(und): Video: h264 (Main) (avc1 / 0x31637661), yuv420p, 1280x720 [SAR 1:1 DAR 16:9], 7762 kb/s, 25 fps, 30 tbr, 15360 tbn, 60 tbc (default)", 0L, "h264", "h264 (main) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 1280L, 720L, "1:1", "16:9", 7762L, "25", "30", "15360", "60");
|
||||
parseVideoStreamBlock(" Stream #0:0: Video: png, rgba(pc), 544x184, 25 tbr, 25 tbn, 25 tbc", 0L, "png", "png", "rgba", "rgba(pc)", 544L, 184L, null, null, null, null, "25", "25", "25");
|
||||
parseVideoStreamBlock(" Stream #0:0: Video: h264 (Main), yuv420p(tv, bt709, progressive), 1920x1080, 25 fps, 25 tbr, 1200k tbn, 50 tbc", 0L, "h264", "h264 (main)", "yuv420p", "yuv420p(tv, bt709, progressive)", 1920L, 1080L, null, null, null, "25", "25", "1200k", "50");
|
||||
parseVideoStreamBlock(" Stream #0:0(und): Video: h264 (High) (avc1 / 0x31637661), yuv420p, 3840x4320 [SAR 1:1 DAR 8:9], 9902 kb/s, 30 fps, 30 tbr, 30k tbn, 60 tbc (default)", 0L, "h264", "h264 (high) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 3840L, 4320L, "1:1", "8:9", 9902L, "30", "30", "30k", "60");
|
||||
parseVideoStreamBlock(" Stream #0:0(und): Video: h264 (High) (avc1 / 0x31637661), yuv420p, 1920x1080 [SAR 1:1 DAR 16:9], 3992 kb/s, 30 fps, 30 tbr, 30k tbn, 60 tbc (default)", 0L, "h264", "h264 (high) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 1920L, 1080L, "1:1", "16:9", 3992L, "30", "30", "30k", "60");
|
||||
parseVideoStreamBlock(" Stream #0:0: Video: theora, yuv420p(bt470bg/bt470bg/bt709), 720x400, 25 fps, 25 tbr, 25 tbn, 25 tbc", 0L, "theora", "theora", "yuv420p", "yuv420p(bt470bg/bt470bg/bt709)", 720L, 400L, null, null, null, "25", "25", "25", "25");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseAudioStream() {
|
||||
parseAudioStreamBlock("Stream #0:0: Audio: adpcm_ms ([2][0][0][0] / 0x0002), 22050 Hz, stereo, s16, 176 kb/s", 0L, "adpcm_ms", "adpcm_ms ([2][0][0][0] / 0x0002)", 22050L, "stereo", "s16", 176L);
|
||||
parseAudioStreamBlock("Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 44100 Hz, mono, s16, 705 kb/s", 0L, "pcm_s16le", "pcm_s16le ([1][0][0][0] / 0x0001)", 44100L, "mono", "s16", 705L);
|
||||
parseAudioStreamBlock("Stream #0:0: Audio: pcm_s24le ([1][0][0][0] / 0x0001), 48000 Hz, mono, s32 (24 bit), 1152 kb/s", 0L, "pcm_s24le", "pcm_s24le ([1][0][0][0] / 0x0001)", 48000L, "mono", "s32 (24 bit)", 1152L);
|
||||
parseAudioStreamBlock("Stream #0:0: Audio: mp3, 48000 Hz, stereo, fltp, 192 kb/s", 0L, "mp3", "mp3", 48000L, "stereo", "fltp", 192L);
|
||||
parseAudioStreamBlock("Stream #0:0: Audio: vorbis, 44100 Hz, stereo, fltp, 128 kb/s", 0L, "vorbis", "vorbis", 44100L, "stereo", "fltp", 128L);
|
||||
parseAudioStreamBlock("Stream #0:0: Audio: pcm_u8 ([1][0][0][0] / 0x0001), 44100 Hz, stereo, u8, 705 kb/s", 0L, "pcm_u8", "pcm_u8 ([1][0][0][0] / 0x0001)", 44100L, "stereo", "u8", 705L);
|
||||
parseAudioStreamBlock("Stream #0:1(und): Audio: mp3 (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 160 kb/s (default)", 1L, "mp3", "mp3 (mp4a / 0x6134706d)", 48000L, "stereo", "fltp", 160L);
|
||||
parseAudioStreamBlock("Stream #0:2(und): Audio: ac3 (ac-3 / 0x332D6361), 48000 Hz, 5.1(side), fltp, 320 kb/s (default)", 2L, "ac3", "ac3 (ac-3 / 0x332d6361)", 48000L, "5.1(side)", "fltp", 320L);
|
||||
parseAudioStreamBlock("Stream #0:1(und): Audio: mp3 (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 160 kb/s (default)", 1L, "mp3", "mp3 (mp4a / 0x6134706d)", 48000L, "stereo", "fltp", 160L);
|
||||
parseAudioStreamBlock("Stream #0:2(und): Audio: ac3 (ac-3 / 0x332D6361), 48000 Hz, 5.1(side), fltp, 320 kb/s (default)", 2L, "ac3", "ac3 (ac-3 / 0x332d6361)", 48000L, "5.1(side)", "fltp", 320L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void index() {
|
||||
Assert.assertEquals(7, MediaInformationParser.index("one:two:three:", ":", 0, 2));
|
||||
Assert.assertEquals(13, MediaInformationParser.index("one:two:three:", ":", 0, 3));
|
||||
Assert.assertEquals(8, MediaInformationParser.index("one::two::three::", "::", 0, 2));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void count() {
|
||||
Assert.assertEquals(3, MediaInformationParser.count("one:two:three:", ":"));
|
||||
Assert.assertEquals(2, MediaInformationParser.count("one,two:three,four", ","));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseAverageFrameRate() {
|
||||
Assert.assertEquals("24", "24 fps".replaceAll("fps", "").trim());
|
||||
Assert.assertEquals("30", "30 fps".replaceAll("fps", "").trim());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseBitrate() {
|
||||
Assert.assertEquals((Long) 3992L, MediaInformationParser.toLongObject("3992 kb/s".replaceAll("kb/s", "").trim()));
|
||||
Assert.assertEquals((Long) 7762L, MediaInformationParser.toLongObject("7762 kb/s".replaceAll("kb/s", "").trim()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseVideoStreamDisplayAspectRatio() {
|
||||
Assert.assertEquals(null, MediaInformationParser.parseVideoStreamDisplayAspectRatio(""));
|
||||
Assert.assertEquals(null, MediaInformationParser.parseVideoStreamDisplayAspectRatio("544x184"));
|
||||
Assert.assertEquals("640:427", MediaInformationParser.parseVideoStreamDisplayAspectRatio("2560x1708 [SAR 1:1 DAR 640:427]"));
|
||||
Assert.assertEquals("8:9", MediaInformationParser.parseVideoStreamDisplayAspectRatio("3840x4320 [SAR 1:1 DAR 8:9]"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseVideoStreamSampleAspectRatio() {
|
||||
Assert.assertEquals(null, MediaInformationParser.parseVideoStreamSampleAspectRatio(""));
|
||||
Assert.assertEquals(null, MediaInformationParser.parseVideoStreamSampleAspectRatio("544x184"));
|
||||
Assert.assertEquals("1:1", MediaInformationParser.parseVideoStreamSampleAspectRatio("2560x1708 [SAR 1:1 DAR 640:427]"));
|
||||
Assert.assertEquals("1:1", MediaInformationParser.parseVideoStreamSampleAspectRatio("3840x4320 [SAR 1:1 DAR 8:9]"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseVideoDimensions() {
|
||||
parseVideoDimensions("", null, null);
|
||||
parseVideoDimensions("544x184", 544L, 184L);
|
||||
parseVideoDimensions("720x400", 720L, 400L);
|
||||
parseVideoDimensions("2560x1708 [SAR 1:1 DAR 640:427]", 2560L, 1708L);
|
||||
parseVideoDimensions("3840x4320 [SAR 1:1 DAR 8:9]", 3840L, 4320L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseAudioSampleRate() {
|
||||
Assert.assertEquals((Long) 44000L, MediaInformationParser.parseAudioStreamSampleRate("44000"));
|
||||
Assert.assertEquals((Long) 44000L, MediaInformationParser.parseAudioStreamSampleRate("44 khz"));
|
||||
Assert.assertEquals((Long) 44100L, MediaInformationParser.parseAudioStreamSampleRate("44100"));
|
||||
Assert.assertEquals((Long) 5000000L, MediaInformationParser.parseAudioStreamSampleRate("5 mhz"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseAudioStreamType() {
|
||||
Assert.assertEquals("video", MediaInformationParser.parseStreamType("Video: theora"));
|
||||
Assert.assertEquals("video", MediaInformationParser.parseStreamType("Video: png"));
|
||||
Assert.assertEquals("video", MediaInformationParser.parseStreamType("Video: h264 (Main)"));
|
||||
Assert.assertEquals("audio", MediaInformationParser.parseStreamType("Audio: adpcm_ms ([2][0][0][0] / 0x0002)"));
|
||||
Assert.assertEquals("audio", MediaInformationParser.parseStreamType("Audio: mp3 (mp4a / 0x6134706D)"));
|
||||
Assert.assertEquals("audio", MediaInformationParser.parseStreamType("Audio: pcm_u8 ([1][0][0][0] / 0x0001)"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseStreamCodec() {
|
||||
Assert.assertEquals("theora", MediaInformationParser.parseStreamCodec("Video: theora"));
|
||||
Assert.assertEquals("png", MediaInformationParser.parseStreamCodec("Video: png"));
|
||||
Assert.assertEquals("h264", MediaInformationParser.parseStreamCodec("Video: h264 (Main)"));
|
||||
Assert.assertEquals("adpcm_ms", MediaInformationParser.parseStreamCodec("Audio: adpcm_ms ([2][0][0][0] / 0x0002)"));
|
||||
Assert.assertEquals("mp3", MediaInformationParser.parseStreamCodec("Audio: mp3 (mp4a / 0x6134706D)"));
|
||||
Assert.assertEquals("pcm_u8", MediaInformationParser.parseStreamCodec("Audio: pcm_u8 ([1][0][0][0] / 0x0001)"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseStreamFullCodec() {
|
||||
Assert.assertEquals("theora", MediaInformationParser.parseStreamFullCodec("Video: theora"));
|
||||
Assert.assertEquals("png", MediaInformationParser.parseStreamFullCodec("Video: png"));
|
||||
Assert.assertEquals("h264 (main)", MediaInformationParser.parseStreamFullCodec("Video: h264 (Main)"));
|
||||
Assert.assertEquals("adpcm_ms ([2][0][0][0] / 0x0002)", MediaInformationParser.parseStreamFullCodec("Audio: adpcm_ms ([2][0][0][0] / 0x0002)"));
|
||||
Assert.assertEquals("mp3 (mp4a / 0x6134706d)", MediaInformationParser.parseStreamFullCodec("Audio: mp3 (mp4a / 0x6134706D)"));
|
||||
Assert.assertEquals("pcm_u8 ([1][0][0][0] / 0x0001)", MediaInformationParser.parseStreamFullCodec("Audio: pcm_u8 ([1][0][0][0] / 0x0001)"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseStreamIndex() {
|
||||
Assert.assertEquals((Long) 0L, MediaInformationParser.parseStreamIndex("Stream #0:0(und): Audio"));
|
||||
Assert.assertEquals((Long) 1L, MediaInformationParser.parseStreamIndex("Stream #0:1(und): Video"));
|
||||
Assert.assertEquals((Long) 2L, MediaInformationParser.parseStreamIndex("Stream #0:2(und): Audio"));
|
||||
Assert.assertEquals((Long) 0L, MediaInformationParser.parseStreamIndex("Stream #0:0: Video"));
|
||||
Assert.assertEquals((Long) 1L, MediaInformationParser.parseStreamIndex("Stream #0:1: Audio"));
|
||||
Assert.assertEquals((Long) 2L, MediaInformationParser.parseStreamIndex("Stream #0:2: Video"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseDuration() {
|
||||
parseDuration(null, null);
|
||||
parseDuration("", null);
|
||||
parseDuration("N/A", null);
|
||||
parseDuration("00:03:33.24", 213240L);
|
||||
parseDuration("00:10:34.53", 634530L);
|
||||
parseDuration("00:00:00.04", 40L);
|
||||
parseDuration("00:00:15.00", 15000L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseStartTime() {
|
||||
parseStartTime(null, null);
|
||||
parseStartTime("", null);
|
||||
parseStartTime("N/A", null);
|
||||
parseStartTime("0.000000", 0L);
|
||||
parseStartTime("10.003000", 10003L);
|
||||
parseStartTime("324.000000", 324000L);
|
||||
parseStartTime("-4.000000", -4000L);
|
||||
parseStartTime("14.00030", 14001L);
|
||||
parseStartTime("14.00080", 14001L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseDurationBlock() {
|
||||
parseDurationBlock(" Duration: 00:03:33.24, start: 0.000000, bitrate: 320 kb/s", 213240L, 0L, 320L);
|
||||
parseDurationBlock(" Duration: 00:00:00.04, start: 0.000000, bitrate: 391187 kb/s", 40L, 0L, 391187L);
|
||||
parseDurationBlock(" Duration: N/A, bitrate: N/A", null, null, null);
|
||||
parseDurationBlock(" Duration: 00:00:15.00, start: 0.000000, bitrate: 7764 kb/s", 15000L, 0L, 7764L);
|
||||
parseDurationBlock(" Duration: 00:10:34.53, start: 0.000000, bitrate: 4474 kb/s", 634530L, 0L, 4474L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseInputBlock() {
|
||||
parseInputBlock("Input #0,", null, null);
|
||||
parseInputBlock("Input #0, ogg, from 'trailer_400p.ogg':", "ogg", "trailer_400p.ogg");
|
||||
parseInputBlock("Input #0, mp3, from 'beethoven_-_symphony_no_9.mp3':", "mp3", "beethoven_-_symphony_no_9.mp3");
|
||||
parseInputBlock("Input #0, image2, from '/data/user/0/com.arthenica.mobileffmpeg.test/cache/colosseum.jpg':", "image2", "/data/user/0/com.arthenica.mobileffmpeg.test/cache/colosseum.jpg");
|
||||
parseInputBlock("Input #0, gif, from 'advanced_zoom_in_and_pan_with_fade_in_out.gif':", "gif", "advanced_zoom_in_and_pan_with_fade_in_out.gif");
|
||||
parseInputBlock("Input #0, mov,mp4,m4a,3gp,3g2,mj2, from 'transition_rotate.mp4':", "mov,mp4,m4a,3gp,3g2,mj2", "transition_rotate.mp4");
|
||||
parseInputBlock("Input #0, png_pipe, from 'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png':", "png_pipe", "https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseMetadataBlock() {
|
||||
parseMetadataBlock(" ENCODER:", "ENCODER", "");
|
||||
parseMetadataBlock(" ENCODER:ffmpeg2theora 0.19", "ENCODER", "ffmpeg2theora 0.19");
|
||||
parseMetadataBlock(" ENCODER : ffmpeg2theora 0.19", "ENCODER", "ffmpeg2theora 0.19");
|
||||
parseMetadataBlock(" creation_time : 2013-12-16T17:50:04.000000Z", "creation_time", "2013-12-16T17:50:04.000000Z");
|
||||
parseMetadataBlock(" handler_name : GPAC ISO Audio Handler", "handler_name", "GPAC ISO Audio Handler");
|
||||
parseMetadataBlock(" comment : Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net", "comment", "Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net");
|
||||
parseMetadataBlock(" minor_version : 1", "minor_version", "1");
|
||||
parseMetadataBlock(" encoder : Lavf58.12.100", "encoder", "Lavf58.12.100");
|
||||
parseMetadataBlock(" title : Planet X", "title", "Planet X");
|
||||
parseMetadataBlock(" compatible_brands: isomiso2avc1mp41", "compatible_brands", "isomiso2avc1mp41");
|
||||
}
|
||||
|
||||
private void parseVideoStreamBlock(String input, Long index, String codec, String fullCodec, String format, String fullFormat, Long width, Long height, String sampleAspectRatio, String displayAspectRatio, Long bitrate, String averageFrameRate, String realFrameRate, String timeBase, String codecTimeBase) {
|
||||
StreamInformation stream = MediaInformationParser.parseStreamBlock(input);
|
||||
|
||||
Assert.assertNotNull(stream);
|
||||
Assert.assertEquals(index, stream.getIndex());
|
||||
Assert.assertEquals("video", stream.getType());
|
||||
Assert.assertEquals(codec, stream.getCodec());
|
||||
Assert.assertEquals(fullCodec, stream.getFullCodec());
|
||||
|
||||
Assert.assertEquals(format, stream.getFormat());
|
||||
Assert.assertEquals(fullFormat, stream.getFullFormat());
|
||||
|
||||
Assert.assertEquals(width, stream.getWidth());
|
||||
Assert.assertEquals(height, stream.getHeight());
|
||||
Assert.assertEquals(sampleAspectRatio, stream.getSampleAspectRatio());
|
||||
Assert.assertEquals(displayAspectRatio, stream.getDisplayAspectRatio());
|
||||
|
||||
Assert.assertEquals(bitrate, stream.getBitrate());
|
||||
|
||||
Assert.assertEquals(averageFrameRate, stream.getAverageFrameRate());
|
||||
Assert.assertEquals(realFrameRate, stream.getRealFrameRate());
|
||||
Assert.assertEquals(timeBase, stream.getTimeBase());
|
||||
Assert.assertEquals(codecTimeBase, stream.getCodecTimeBase());
|
||||
}
|
||||
|
||||
private void parseAudioStreamBlock(String input, Long index, String codec, String fullCodec, Long sampleRate, String channelLayout, String sampleFormat, Long bitrate) {
|
||||
StreamInformation stream = MediaInformationParser.parseStreamBlock(input);
|
||||
|
||||
Assert.assertNotNull(stream);
|
||||
Assert.assertEquals(index, stream.getIndex());
|
||||
Assert.assertEquals("audio", stream.getType());
|
||||
Assert.assertEquals(codec, stream.getCodec());
|
||||
Assert.assertEquals(fullCodec, stream.getFullCodec());
|
||||
Assert.assertEquals(sampleRate, stream.getSampleRate());
|
||||
Assert.assertEquals(channelLayout, stream.getChannelLayout());
|
||||
Assert.assertEquals(sampleFormat, stream.getSampleFormat());
|
||||
Assert.assertEquals(bitrate, stream.getBitrate());
|
||||
}
|
||||
|
||||
private void parseVideoDimensions(String value, Long width, Long height) {
|
||||
Pair<Long, Long> videoDimensions = MediaInformationParser.parseVideoDimensions(value);
|
||||
|
||||
Assert.assertNotNull(videoDimensions);
|
||||
Assert.assertEquals(width, videoDimensions.getFirst());
|
||||
Assert.assertEquals(height, videoDimensions.getSecond());
|
||||
}
|
||||
|
||||
private void parseDuration(String value, Long expected) {
|
||||
Long duration = MediaInformationParser.parseDuration(value);
|
||||
|
||||
Assert.assertEquals(expected, duration);
|
||||
}
|
||||
|
||||
private void parseStartTime(String value, Long expected) {
|
||||
Long duration = MediaInformationParser.parseStartTime(value);
|
||||
|
||||
Assert.assertEquals(expected, duration);
|
||||
}
|
||||
|
||||
private void parseDurationBlock(String value, Long first, Long second, Long third) {
|
||||
Trio<Long, Long, Long> pair = MediaInformationParser.parseDurationBlock(value);
|
||||
|
||||
Assert.assertNotNull(pair);
|
||||
Assert.assertEquals(first, pair.getFirst());
|
||||
Assert.assertEquals(second, pair.getSecond());
|
||||
Assert.assertEquals(third, pair.getThird());
|
||||
}
|
||||
|
||||
private void parseInputBlock(String value, String first, String second) {
|
||||
Pair<String, String> pair = MediaInformationParser.parseInputBlock(value);
|
||||
|
||||
Assert.assertNotNull(pair);
|
||||
Assert.assertEquals(first, pair.getFirst());
|
||||
Assert.assertEquals(second, pair.getSecond());
|
||||
}
|
||||
|
||||
private void parseMetadataBlock(String value, String first, String second) {
|
||||
Pair<String, String> pair = MediaInformationParser.parseMetadataBlock(value);
|
||||
|
||||
Assert.assertNotNull(pair);
|
||||
Assert.assertNotNull(pair.getFirst());
|
||||
Assert.assertNotNull(pair.getSecond());
|
||||
Assert.assertEquals(first, pair.getFirst());
|
||||
Assert.assertEquals(second, pair.getSecond());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -7,7 +7,7 @@ buildscript {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.2.1'
|
||||
classpath 'com.android.tools.build:gradle:3.1.4'
|
||||
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
||||
BIN
Binary file not shown.
+2
-1
@@ -1,5 +1,6 @@
|
||||
#Thu Mar 15 21:50:32 EET 2018
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
|
||||
|
||||
Vendored
+44
-56
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
#!/usr/bin/env bash
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
@@ -6,6 +6,42 @@
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# 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
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
esac
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
@@ -24,46 +60,6 @@ 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.
|
||||
@@ -89,7 +85,7 @@ location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
@@ -154,19 +150,11 @@ if $cygwin ; then
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||
function splitJvmOpts() {
|
||||
JVM_OPTS=("$@")
|
||||
}
|
||||
APP_ARGS=$(save "$@")
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
|
||||
# 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" "$@"
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
|
||||
Vendored
+10
-4
@@ -8,14 +8,14 @@
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
@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=
|
||||
|
||||
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
|
||||
|
||||
@@ -46,9 +46,10 @@ echo location of your Java installation.
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
@rem Get command-line arguments, handling Windowz variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
@@ -59,6 +60,11 @@ set _SKIP=2
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
goto execute
|
||||
|
||||
:4NT_args
|
||||
@rem Get arguments from the 4NT Shell from JP Software
|
||||
set CMD_LINE_ARGS=%$
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/build
|
||||
/.idea/
|
||||
/gradle/
|
||||
/local.properties
|
||||
|
||||
@@ -6,8 +6,8 @@ android {
|
||||
applicationId "com.arthenica.mobileffmpeg.test"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 27
|
||||
versionCode 210310
|
||||
versionName "3.1"
|
||||
versionCode 22
|
||||
versionName "2.2"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
buildTypes {
|
||||
@@ -16,31 +16,11 @@ android {
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
splits {
|
||||
abi {
|
||||
enable true
|
||||
reset()
|
||||
include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
|
||||
universalApk false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ext.abiCodes = ['x86':1, 'x86_64':2, 'armeabi-v7a':3, 'arm64-v8a':4]
|
||||
|
||||
import com.android.build.OutputFile
|
||||
|
||||
android.applicationVariants.all { variant ->
|
||||
variant.outputs.each {
|
||||
output ->
|
||||
def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
|
||||
output.versionCodeOverride = baseAbiVersionCode + variant.versionCode
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation 'com.arthenica:mobile-ffmpeg-full:3.1'
|
||||
implementation 'com.arthenica:mobile-ffmpeg-full:2.2'
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation 'com.android.support.test:runner:1.0.2'
|
||||
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
|
||||
|
||||
Binary file not shown.
@@ -1,5 +0,0 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
Vendored
-172
@@ -1,172 +0,0 @@
|
||||
#!/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" "$@"
|
||||
Vendored
-84
@@ -1,84 +0,0 @@
|
||||
@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
|
||||
@@ -7,9 +7,6 @@
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
|
||||
<uses-feature android:name="android.hardware.camera" android:required="true" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
|
||||
+10
-31
@@ -25,7 +25,6 @@ import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.text.method.ScrollingMovementMethod;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@@ -78,7 +77,6 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
encodeAudio();
|
||||
// encodeChromaprint();
|
||||
}
|
||||
});
|
||||
encodeButton.setEnabled(false);
|
||||
@@ -186,20 +184,6 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
}, ffmpegCommand);
|
||||
}
|
||||
|
||||
protected void encodeChromaprint() {
|
||||
File audioSampleFile = getAudioSampleFile();
|
||||
|
||||
Log.d(TAG, "Testing AUDIO encoding with 'chromaprint' muxer");
|
||||
|
||||
final String ffmpegCommand = String.format("-v quiet -i %s -f chromaprint -fp_format 2 -", audioSampleFile.getAbsolutePath());
|
||||
|
||||
Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
|
||||
|
||||
int returnCode = FFmpeg.execute(ffmpegCommand);
|
||||
|
||||
Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
|
||||
}
|
||||
|
||||
public void createAudioSample() {
|
||||
android.util.Log.d(TAG, "Creating AUDIO sample before the test.");
|
||||
|
||||
@@ -208,7 +192,7 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
audioSampleFile.delete();
|
||||
}
|
||||
|
||||
String ffmpegCommand = String.format("-hide_banner -y -f lavfi -i sine=frequency=1000:duration=5 -c:a pcm_s16le %s", audioSampleFile.getAbsolutePath());
|
||||
String ffmpegCommand = String.format("-y -f lavfi -i sine=frequency=1000:duration=5 -c:a pcm_s16le %s", audioSampleFile.getAbsolutePath());
|
||||
|
||||
android.util.Log.d(TAG, String.format("Sample file is created with '%s'", ffmpegCommand));
|
||||
|
||||
@@ -227,9 +211,6 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
|
||||
String extension;
|
||||
switch (audioCodec) {
|
||||
case "mp2 (twolame)":
|
||||
extension = "mpg";
|
||||
break;
|
||||
case "mp3 (liblame)":
|
||||
case "mp3 (libshine)":
|
||||
extension = "mp3";
|
||||
@@ -297,28 +278,26 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
String audioOutputFile = getAudioOutputFile().getAbsolutePath();
|
||||
|
||||
switch (audioCodec) {
|
||||
case "mp2 (twolame)":
|
||||
return String.format("-hide_banner -y -i %s -c:a mp2 -b:a 192k %s", audioSampleFile, audioOutputFile);
|
||||
case "mp3 (liblame)":
|
||||
return String.format("-hide_banner -y -i %s -c:a libmp3lame -qscale:a 2 %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -c:a libmp3lame -qscale:a 2 %s", audioSampleFile, audioOutputFile);
|
||||
case "mp3 (libshine)":
|
||||
return String.format("-hide_banner -y -i %s -c:a libshine -qscale:a 2 %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -c:a libshine -qscale:a 2 %s", audioSampleFile, audioOutputFile);
|
||||
case "vorbis":
|
||||
return String.format("-hide_banner -y -i %s -c:a libvorbis -b:a 64k %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -c:a libvorbis -b:a 64k %s", audioSampleFile, audioOutputFile);
|
||||
case "opus":
|
||||
return String.format("-hide_banner -y -i %s -c:a libopus -b:a 64k -vbr on -compression_level 10 %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -c:a libopus -b:a 64k -vbr on -compression_level 10 %s", audioSampleFile, audioOutputFile);
|
||||
case "amr":
|
||||
return String.format("-hide_banner -y -i %s -ar 8000 -ab 12.2k -c:a libopencore_amrnb %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -ar 8000 -ab 12.2k %s", audioSampleFile, audioOutputFile);
|
||||
case "ilbc":
|
||||
return String.format("-hide_banner -y -i %s -c:a ilbc -ar 8000 -b:a 15200 %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -c:a ilbc -ar 8000 -b:a 15200 %s", audioSampleFile, audioOutputFile);
|
||||
case "speex":
|
||||
return String.format("-hide_banner -y -i %s -c:a libspeex -ar 16000 %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -c:a libspeex -ar 16000 %s", audioSampleFile, audioOutputFile);
|
||||
case "wavpack":
|
||||
return String.format("-hide_banner -y -i %s -c:a wavpack -b:a 64k %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -c:a wavpack -b:a 64k %s", audioSampleFile, audioOutputFile);
|
||||
default:
|
||||
|
||||
// soxr
|
||||
return String.format("-hide_banner -y -i %s -af aresample=resampler=soxr -ar 44100 %s", audioSampleFile, audioOutputFile);
|
||||
return String.format("-y -i %s -af aresample=resampler=soxr -ar 44100 %s", audioSampleFile, audioOutputFile);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -117,13 +117,13 @@ public class CommandTabFragment extends Fragment {
|
||||
public void runFFmpeg() {
|
||||
clearLog();
|
||||
|
||||
final String ffmpegCommand = String.format("-hide_banner %s", commandText.getText().toString());
|
||||
final String ffmpegCommand = commandText.getText().toString();
|
||||
|
||||
android.util.Log.d(MainActivity.TAG, "Testing COMMAND synchronously.");
|
||||
|
||||
android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process started with arguments\n\'%s\'", ffmpegCommand));
|
||||
|
||||
int result = FFmpeg.execute(ffmpegCommand, " ");
|
||||
int result = FFmpeg.execute(ffmpegCommand);
|
||||
|
||||
android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process exited with rc %d", result));
|
||||
|
||||
@@ -135,7 +135,7 @@ public class CommandTabFragment extends Fragment {
|
||||
public void runFFmpegAsync() {
|
||||
clearLog();
|
||||
|
||||
final String ffmpegCommand = String.format("-hide_banner %s", commandText.getText().toString());
|
||||
final String ffmpegCommand = commandText.getText().toString();
|
||||
|
||||
android.util.Log.d(MainActivity.TAG, "Testing COMMAND asynchronously.");
|
||||
|
||||
|
||||
+2
-2
@@ -39,7 +39,7 @@ import java.util.concurrent.Callable;
|
||||
|
||||
public class HttpsTabFragment extends Fragment {
|
||||
|
||||
public static final String HTTPS_TEST_DEFAULT_URL = "https://upload.wikimedia.org/wikipedia/commons/thumb/4/4b/FFmpeg-Logo.svg/568px-FFmpeg-Logo.svg.png";
|
||||
public static final String HTTPS_TEST_DEFAULT_URL = "https://download.blender.org/peach/trailer/trailer_400p.ogg";
|
||||
|
||||
private MainActivity mainActivity;
|
||||
private EditText urlText;
|
||||
@@ -119,7 +119,7 @@ public class HttpsTabFragment extends Fragment {
|
||||
}
|
||||
|
||||
// HTTPS COMMAND ARGUMENTS
|
||||
final String ffmpegCommand = String.format("-hide_banner -i %s -f null -", testUrl);
|
||||
final String ffmpegCommand = String.format("-hide_banner -i %s", testUrl);
|
||||
|
||||
android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ import com.arthenica.mobileffmpeg.Config;
|
||||
import com.arthenica.mobileffmpeg.FFmpeg;
|
||||
import com.arthenica.mobileffmpeg.util.RunCallback;
|
||||
import com.arthenica.mobileffmpeg.util.AsynchronousTaskService;
|
||||
import com.arthenica.mobileffmpeg.util.RunCallback;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
@@ -60,10 +59,9 @@ public class MainActivity extends AppCompatActivity {
|
||||
public static final String TAG = "mobile-ffmpeg-test";
|
||||
|
||||
public static final int REQUEST_EXTERNAL_STORAGE = 1;
|
||||
public static String[] PERMISSIONS_ALL = {
|
||||
public static String[] PERMISSIONS_STORAGE = {
|
||||
Manifest.permission.READ_EXTERNAL_STORAGE,
|
||||
Manifest.permission.WRITE_EXTERNAL_STORAGE,
|
||||
Manifest.permission.CAMERA
|
||||
Manifest.permission.WRITE_EXTERNAL_STORAGE
|
||||
};
|
||||
|
||||
protected static final AsynchronousTaskService asynchronousTaskService = new AsynchronousTaskService();
|
||||
@@ -121,19 +119,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
int permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
|
||||
if (permission != PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
PERMISSIONS_ALL,
|
||||
REQUEST_EXTERNAL_STORAGE);
|
||||
}
|
||||
permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
|
||||
if (permission != PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
PERMISSIONS_ALL,
|
||||
REQUEST_EXTERNAL_STORAGE);
|
||||
}
|
||||
permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
|
||||
if (permission != PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
PERMISSIONS_ALL,
|
||||
PERMISSIONS_STORAGE,
|
||||
REQUEST_EXTERNAL_STORAGE);
|
||||
}
|
||||
|
||||
@@ -164,7 +150,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
@Override
|
||||
public Integer call() {
|
||||
int returnCode = FFmpeg.execute(arguments, " ");
|
||||
int returnCode = FFmpeg.execute(arguments);
|
||||
if (runCallback != null) {
|
||||
runCallback.apply(returnCode);
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ public class Video {
|
||||
|
||||
public static String generateEncodeVideoScript(final String image1Path, final String image2Path, final String image3Path, final String videoFilePath, final String videoCodec, final String customOptions) {
|
||||
return
|
||||
"-hide_banner -y -loop 1 -i " + image1Path + " " +
|
||||
"-y -loop 1 -i " + image1Path + " " +
|
||||
"-loop 1 -i " + image2Path + " " +
|
||||
"-loop 1 -i " + image3Path + " " +
|
||||
"-filter_complex " +
|
||||
@@ -49,7 +49,7 @@ public class Video {
|
||||
|
||||
public static String generateShakingVideoScript(final String image1Path, final String image2Path, final String image3Path, final String videoFilePath) {
|
||||
return
|
||||
"-hide_banner -y -loop 1 -i " + image1Path + " " +
|
||||
"-y -loop 1 -i " + image1Path + " " +
|
||||
"-loop 1 -i " + image2Path + " " +
|
||||
"-loop 1 -i " + image3Path + " " +
|
||||
"-f lavfi -i color=black:s=640x427 " +
|
||||
|
||||
+1
-29
@@ -38,12 +38,11 @@ import android.widget.TextView;
|
||||
import android.widget.VideoView;
|
||||
|
||||
import com.arthenica.mobileffmpeg.Config;
|
||||
import com.arthenica.mobileffmpeg.FFmpeg;
|
||||
import com.arthenica.mobileffmpeg.LogCallback;
|
||||
import com.arthenica.mobileffmpeg.LogMessage;
|
||||
import com.arthenica.mobileffmpeg.util.RunCallback;
|
||||
import com.arthenica.mobileffmpeg.Statistics;
|
||||
import com.arthenica.mobileffmpeg.StatisticsCallback;
|
||||
import com.arthenica.mobileffmpeg.util.RunCallback;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
@@ -85,7 +84,6 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
encodeVideo();
|
||||
// encodeWebp();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -215,28 +213,6 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
}
|
||||
}
|
||||
|
||||
protected void encodeWebp() {
|
||||
final File imageFile = new File(mainActivity.getCacheDir(), "colosseum.jpg");
|
||||
final File outputFile = new File(mainActivity.getFilesDir(), "video.webp");
|
||||
|
||||
try {
|
||||
mainActivity.resourceToFile(R.drawable.colosseum, imageFile);
|
||||
|
||||
Log.d(TAG, "Testing VIDEO encoding with 'webp' codec");
|
||||
|
||||
final String ffmpegCommand = String.format("-hide_banner -i %s %s", imageFile.getAbsolutePath(), outputFile.getAbsolutePath());
|
||||
|
||||
Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
|
||||
|
||||
int returnCode = FFmpeg.execute(ffmpegCommand);
|
||||
|
||||
Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
|
||||
} catch (IOException e) {
|
||||
Log.e(TAG, "Encode webp failed", e);
|
||||
Popup.show(mainActivity, "Encode webp failed");
|
||||
}
|
||||
}
|
||||
|
||||
protected void playVideo() {
|
||||
MediaController mediaController = new MediaController(mainActivity);
|
||||
mediaController.setAnchorView(videoView);
|
||||
@@ -262,8 +238,6 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
}
|
||||
|
||||
public String getSelectedVideoCodec() {
|
||||
|
||||
// NOTE THAT MPEG4 CODEC IS ASSIGNED HERE
|
||||
String videoCodec = selectedCodec;
|
||||
|
||||
// VIDEO CODEC SPINNER HAS BASIC NAMES, FFMPEG NEEDS LONGER AND EXACT CODEC NAMES.
|
||||
@@ -346,8 +320,6 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
|
||||
case "hap":
|
||||
return "-format hap_q ";
|
||||
default:
|
||||
|
||||
// mpeg4, x264, xvid
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string-array name="audio_codec">
|
||||
<item>mp2 (twolame)</item>
|
||||
<item>mp3 (liblame)</item>
|
||||
<item>mp3 (libshine)</item>
|
||||
<item>vorbis</item>
|
||||
|
||||
@@ -47,18 +47,17 @@ cmake -Wno-dev \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
-DFFT_LIB=kissfft \
|
||||
-DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
|
||||
-DBUILD_SHARED_LIBS=0 .. || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
+56
-58
@@ -46,21 +46,16 @@ get_library_name() {
|
||||
25) echo "soxr" ;;
|
||||
26) echo "libaom" ;;
|
||||
27) echo "chromaprint" ;;
|
||||
28) echo "twolame" ;;
|
||||
29) echo "sdl" ;;
|
||||
30) echo "tesseract" ;;
|
||||
31) echo "giflib" ;;
|
||||
32) echo "jpeg" ;;
|
||||
33) echo "libogg" ;;
|
||||
34) echo "libpng" ;;
|
||||
35) echo "libuuid" ;;
|
||||
36) echo "nettle" ;;
|
||||
37) echo "tiff" ;;
|
||||
38) echo "expat" ;;
|
||||
39) echo "libsndfile" ;;
|
||||
40) echo "leptonica" ;;
|
||||
41) echo "android-zlib" ;;
|
||||
42) echo "android-media-codec" ;;
|
||||
28) echo "giflib" ;;
|
||||
29) echo "jpeg" ;;
|
||||
30) echo "libogg" ;;
|
||||
31) echo "libpng" ;;
|
||||
32) echo "libuuid" ;;
|
||||
33) echo "nettle" ;;
|
||||
34) echo "tiff" ;;
|
||||
35) echo "expat" ;;
|
||||
36) echo "android-zlib" ;;
|
||||
37) echo "android-media-codec" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
@@ -180,7 +175,7 @@ get_android_arch() {
|
||||
}
|
||||
|
||||
get_common_includes() {
|
||||
echo "-I${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot/usr/include -I${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot/usr/local/include"
|
||||
echo "-I${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/include -I${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/local/include"
|
||||
}
|
||||
|
||||
get_common_cflags() {
|
||||
@@ -240,10 +235,7 @@ get_app_specific_cflags() {
|
||||
xvidcore)
|
||||
APP_FLAGS=""
|
||||
;;
|
||||
ffmpeg)
|
||||
APP_FLAGS="-Wno-unused-function -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD"
|
||||
;;
|
||||
shine)
|
||||
ffmpeg | shine)
|
||||
APP_FLAGS="-Wno-unused-function"
|
||||
;;
|
||||
soxr | snappy | libwebp)
|
||||
@@ -264,11 +256,7 @@ get_cflags() {
|
||||
ARCH_FLAGS=$(get_arch_specific_cflags)
|
||||
APP_FLAGS=$(get_app_specific_cflags $1)
|
||||
COMMON_FLAGS=$(get_common_cflags)
|
||||
if [[ -z ${MOBILE_FFMPEG_DEBUG} ]]; then
|
||||
OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
|
||||
else
|
||||
OPTIMIZATION_FLAGS=""
|
||||
fi
|
||||
OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
|
||||
COMMON_INCLUDES=$(get_common_includes)
|
||||
|
||||
echo "${ARCH_FLAGS} ${APP_FLAGS} ${COMMON_FLAGS} ${OPTIMIZATION_FLAGS} ${COMMON_INCLUDES}"
|
||||
@@ -292,10 +280,10 @@ get_cxxflags() {
|
||||
}
|
||||
|
||||
get_common_linked_libraries() {
|
||||
local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/${TARGET_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/lib"
|
||||
local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/${TARGET_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/lib"
|
||||
|
||||
case $1 in
|
||||
ffmpeg | tesseract)
|
||||
ffmpeg)
|
||||
echo "-lc -lm -ldl -llog -lc++_shared ${COMMON_LIBRARY_PATHS}"
|
||||
;;
|
||||
libvpx)
|
||||
@@ -478,7 +466,7 @@ libdir=\${prefix}/lib
|
||||
includedir=\${prefix}/include
|
||||
|
||||
Name: aom
|
||||
Description: AV1 codec library v${AOM_VERSION}.
|
||||
Description: AV1 codec library v0.1.0.
|
||||
Version: ${AOM_VERSION}
|
||||
|
||||
Requires:
|
||||
@@ -653,29 +641,6 @@ Cflags: -I\${includedir}
|
||||
EOF
|
||||
}
|
||||
|
||||
create_tesseract_package_config() {
|
||||
local TESSERACT_VERSION="$1"
|
||||
|
||||
cat > "${INSTALL_PKG_CONFIG_DIR}/tesseract.pc" << EOF
|
||||
prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/tesseract
|
||||
exec_prefix=\${prefix}
|
||||
bindir=\${exec_prefix}/bin
|
||||
datarootdir=\${prefix}/share
|
||||
datadir=\${datarootdir}
|
||||
libdir=\${exec_prefix}/lib
|
||||
includedir=\${prefix}/include
|
||||
|
||||
Name: tesseract
|
||||
Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
|
||||
URL: https://github.com/tesseract-ocr/tesseract
|
||||
Version: ${TESSERACT_VERSION}
|
||||
|
||||
Requires: lept, libjpeg, libpng, giflib, zlib, libwebp, libtiff-4
|
||||
Libs: -L\${libdir} -ltesseract
|
||||
Cflags: -I\${includedir}
|
||||
EOF
|
||||
}
|
||||
|
||||
create_uuid_package_config() {
|
||||
local UUID_VERSION="$1"
|
||||
|
||||
@@ -734,10 +699,10 @@ EOF
|
||||
}
|
||||
|
||||
create_zlib_package_config() {
|
||||
ZLIB_VERSION=$(grep '#define ZLIB_VERSION' ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g')
|
||||
ZLIB_VERSION=$(grep '#define ZLIB_VERSION' ${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g')
|
||||
|
||||
cat > "${INSTALL_PKG_CONFIG_DIR}/zlib.pc" << EOF
|
||||
prefix=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot/usr
|
||||
prefix=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr
|
||||
exec_prefix=\${prefix}
|
||||
libdir=${ANDROID_NDK_ROOT}/platforms/android-${API}/arch-${TOOLCHAIN_ARCH}/usr/lib
|
||||
includedir=\${prefix}/include
|
||||
@@ -815,9 +780,9 @@ download_gpl_library_source() {
|
||||
GPL_LIB_DEST_DIR="libvidstab"
|
||||
;;
|
||||
x264)
|
||||
GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20181208-2245-stable.tar.bz2"
|
||||
GPL_LIB_FILE="x264-snapshot-20181208-2245-stable.tar.bz2"
|
||||
GPL_LIB_ORIG_DIR="x264-snapshot-20181208-2245-stable"
|
||||
GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20181107-2245-stable.tar.bz2"
|
||||
GPL_LIB_FILE="x264-snapshot-20181107-2245-stable.tar.bz2"
|
||||
GPL_LIB_ORIG_DIR="x264-snapshot-20181107-2245-stable"
|
||||
GPL_LIB_DEST_DIR="x264"
|
||||
;;
|
||||
x265)
|
||||
@@ -903,7 +868,7 @@ download_gpl_library_source() {
|
||||
}
|
||||
|
||||
set_toolchain_clang_paths() {
|
||||
export PATH=$PATH:${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin
|
||||
export PATH=$PATH:${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin
|
||||
|
||||
TARGET_HOST=$(get_target_host)
|
||||
|
||||
@@ -935,8 +900,41 @@ set_toolchain_clang_paths() {
|
||||
prepare_inline_sed
|
||||
}
|
||||
|
||||
set_toolchain_gcc_paths() {
|
||||
export PATH=$PATH:${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin
|
||||
|
||||
TARGET_HOST=$(get_target_host)
|
||||
|
||||
export AR=${TARGET_HOST}-ar
|
||||
export CC=${TARGET_HOST}-gcc
|
||||
export CXX=${TARGET_HOST}-g++
|
||||
|
||||
if [ "$1" == "x264" ]; then
|
||||
export AS=${CC}
|
||||
else
|
||||
export AS=${TARGET_HOST}-as
|
||||
fi
|
||||
|
||||
export LD=${TARGET_HOST}-ld
|
||||
export RANLIB=${TARGET_HOST}-ranlib
|
||||
export STRIP=${TARGET_HOST}-strip
|
||||
|
||||
export INSTALL_PKG_CONFIG_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/pkgconfig"
|
||||
export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc"
|
||||
|
||||
if [ ! -d ${INSTALL_PKG_CONFIG_DIR} ]; then
|
||||
mkdir -p ${INSTALL_PKG_CONFIG_DIR}
|
||||
fi
|
||||
|
||||
if [ ! -f ${ZLIB_PACKAGE_CONFIG_PATH} ]; then
|
||||
create_zlib_package_config
|
||||
fi
|
||||
|
||||
prepare_inline_sed
|
||||
}
|
||||
|
||||
create_toolchain() {
|
||||
local TOOLCHAIN_DIR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-"${TOOLCHAIN}
|
||||
local TOOLCHAIN_DIR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-"${TOOLCHAIN}
|
||||
|
||||
if [ ! -d ${TOOLCHAIN_DIR} ]; then
|
||||
${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch ${TOOLCHAIN_ARCH} --api ${API} --stl libc++ --install-dir ${TOOLCHAIN_DIR} || exit 1
|
||||
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--without-docbook \
|
||||
--without-xmlwf \
|
||||
--enable-static \
|
||||
|
||||
+7
-35
@@ -74,9 +74,8 @@ case ${ARCH} in
|
||||
esac
|
||||
|
||||
CONFIGURE_POSTFIX=""
|
||||
HIGH_PRIORITY_INCLUDES=""
|
||||
|
||||
for library in {1..43}
|
||||
for library in {1..38}
|
||||
do
|
||||
if [[ ${!library} -eq 1 ]]; then
|
||||
ENABLED_LIBRARY=$(get_library_name $((library - 1)))
|
||||
@@ -138,7 +137,6 @@ do
|
||||
CFLAGS+=" $(pkg-config --cflags libiconv)"
|
||||
LDFLAGS+=" $(pkg-config --libs --static libiconv)"
|
||||
CONFIGURE_POSTFIX+=" --enable-iconv"
|
||||
HIGH_PRIORITY_INCLUDES+=" $(pkg-config --cflags libiconv)"
|
||||
;;
|
||||
libilbc)
|
||||
CFLAGS+=" $(pkg-config --cflags libilbc)"
|
||||
@@ -194,11 +192,6 @@ do
|
||||
LDFLAGS+=" $(pkg-config --libs --static shine)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libshine"
|
||||
;;
|
||||
sdl)
|
||||
CFLAGS+=" $(pkg-config --cflags sdl2)"
|
||||
LDFLAGS+=" $(pkg-config --libs --static sdl2)"
|
||||
CONFIGURE_POSTFIX+=" --enable-sdl2"
|
||||
;;
|
||||
snappy)
|
||||
CFLAGS+=" $(pkg-config --cflags snappy)"
|
||||
LDFLAGS+=" $(pkg-config --libs --static snappy)"
|
||||
@@ -214,18 +207,6 @@ do
|
||||
LDFLAGS+=" $(pkg-config --libs --static speex)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libspeex"
|
||||
;;
|
||||
tesseract)
|
||||
CFLAGS+=" $(pkg-config --cflags tesseract)"
|
||||
LDFLAGS+=" $(pkg-config --libs --static tesseract)"
|
||||
CFLAGS+=" $(pkg-config --cflags giflib)"
|
||||
LDFLAGS+=" $(pkg-config --libs --static giflib)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libtesseract"
|
||||
;;
|
||||
twolame)
|
||||
CFLAGS+=" $(pkg-config --cflags twolame)"
|
||||
LDFLAGS+=" $(pkg-config --libs --static twolame)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libtwolame"
|
||||
;;
|
||||
wavpack)
|
||||
CFLAGS+=" $(pkg-config --cflags wavpack)"
|
||||
LDFLAGS+=" $(pkg-config --libs --static wavpack)"
|
||||
@@ -280,9 +261,7 @@ do
|
||||
else
|
||||
|
||||
# THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
|
||||
if [[ ${library} -eq 30 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-sdl2"
|
||||
elif [[ ${library} -eq 42 ]]; then
|
||||
if [[ ${library} -eq 37 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-zlib"
|
||||
fi
|
||||
fi
|
||||
@@ -290,13 +269,6 @@ done
|
||||
|
||||
LDFLAGS+=" -L${ANDROID_NDK_ROOT}/platforms/android-${API}/arch-${TOOLCHAIN_ARCH}/usr/lib"
|
||||
|
||||
# OPTIMIZE FOR SPEED INSTEAD OF SIZE
|
||||
if [[ -z ${MOBILE_FFMPEG_OPTIMIZED_FOR_SPEED} ]]; then
|
||||
SIZE_OPTIONS="--enable-small";
|
||||
else
|
||||
SIZE_OPTIONS="";
|
||||
fi
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
echo -n -e "\n${LIB_NAME}: "
|
||||
@@ -305,10 +277,10 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
./configure \
|
||||
--cross-prefix="${TARGET_HOST}-" \
|
||||
--sysroot="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
--sysroot="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
--prefix="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
--pkg-config="${HOST_PKG_CONFIG_PATH}" \
|
||||
--extra-cflags="${HIGH_PRIORITY_INCLUDES} ${CFLAGS}" \
|
||||
--extra-cflags="${CFLAGS}" \
|
||||
--extra-cxxflags="${CXXFLAGS}" \
|
||||
--extra-ldflags="${LDFLAGS}" \
|
||||
--enable-version3 \
|
||||
@@ -320,10 +292,9 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--enable-pic \
|
||||
--enable-jni \
|
||||
--enable-optimizations \
|
||||
--enable-small \
|
||||
--enable-swscale \
|
||||
--enable-shared \
|
||||
--enable-v4l2-m2m \
|
||||
${SIZE_OPTIONS} \
|
||||
--disable-openssl \
|
||||
--disable-xmm-clobber-test \
|
||||
--disable-debug \
|
||||
@@ -338,6 +309,7 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--disable-static \
|
||||
--disable-sndio \
|
||||
--disable-schannel \
|
||||
--disable-sdl2 \
|
||||
--disable-securetransport \
|
||||
--disable-xlib \
|
||||
--disable-cuda \
|
||||
@@ -346,7 +318,6 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--disable-vaapi \
|
||||
--disable-vdpau \
|
||||
--disable-videotoolbox \
|
||||
--disable-audiotoolbox \
|
||||
--disable-appkit \
|
||||
--disable-alsa \
|
||||
--disable-cuda \
|
||||
@@ -354,6 +325,7 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--disable-nvenc \
|
||||
--disable-vaapi \
|
||||
--disable-vdpau \
|
||||
--disable-videotoolbox \
|
||||
${CONFIGURE_POSTFIX} 1>>${BASEDIR}/build.log 2>&1
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
|
||||
@@ -47,7 +47,7 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib
|
||||
--with-pic \
|
||||
--with-zlib \
|
||||
--with-png \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--without-harfbuzz \
|
||||
--without-bzip2 \
|
||||
--without-fsref \
|
||||
|
||||
@@ -46,7 +46,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -46,7 +46,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-assembly \
|
||||
--disable-shared \
|
||||
|
||||
@@ -56,7 +56,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--with-included-libtasn1 \
|
||||
--with-included-unistring \
|
||||
--without-idn \
|
||||
|
||||
+10
-10
@@ -47,24 +47,24 @@ cmake -Wno-dev \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
-DENABLE_PIC=1 \
|
||||
-DENABLE_STATIC=1 \
|
||||
-DENABLE_SHARED=0 \
|
||||
-DWITH_JPEG8=1 \
|
||||
-DWITH_SIMD=1 \
|
||||
-DWITH_TURBOJPEG=0 \
|
||||
-DWITH_JAVA=0 \
|
||||
-DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) .. || exit 1
|
||||
-DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
|
||||
-DENABLE_SHARED=0 .. || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -46,7 +46,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--with-libiconv-prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/libiconv \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ANDROID_NDK_ROOT} ]]; then
|
||||
echo -e "(*) ANDROID_NDK_ROOT not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${API} ]]; then
|
||||
echo -e "(*) API not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/android-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="leptonica"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export CPPFLAGS="-I${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include"
|
||||
export LDFLAGS="$(get_ldflags ${LIB_NAME}) -L${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/lib -lgif"
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
export LIBPNG_CFLAGS="$(pkg-config --cflags libpng)"
|
||||
export LIBPNG_LIBS="$(pkg-config --libs --static libpng)"
|
||||
|
||||
export LIBWEBP_CFLAGS="$(pkg-config --cflags libwebp)"
|
||||
export LIBWEBP_LIBS="$(pkg-config --libs --static libwebp)"
|
||||
|
||||
export LIBTIFF_CFLAGS="$(pkg-config --cflags libtiff-4)"
|
||||
export LIBTIFF_LIBS="$(pkg-config --libs --static libtiff-4)"
|
||||
|
||||
export ZLIB_CFLAGS="$(pkg-config --cflags zlib)"
|
||||
export ZLIB_LIBS="$(pkg-config --libs --static zlib)"
|
||||
|
||||
export JPEG_CFLAGS="$(pkg-config --cflags libjpeg)"
|
||||
export JPEG_LIBS="$(pkg-config --libs --static libjpeg)"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ${RECONF_leptonica} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-zlib \
|
||||
--with-libpng \
|
||||
--with-jpeg \
|
||||
--with-giflib \
|
||||
--with-libtiff \
|
||||
--with-libwebp \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--disable-programs \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp lept.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
@@ -67,17 +67,16 @@ cmake -Wno-dev \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
${ARCH_OPTIONS} \
|
||||
-DENABLE_TESTS=0 \
|
||||
-DENABLE_EXAMPLES=0 \
|
||||
@@ -89,6 +88,6 @@ cmake -Wno-dev \
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# CREATE PACKAGE CONFIG MANUALLY
|
||||
create_libaom_package_config "1.0.0"
|
||||
create_libaom_package_config "0.1.0"
|
||||
|
||||
make install || exit 1
|
||||
@@ -59,7 +59,7 @@ esac
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--disable-libtool-lock \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -61,7 +61,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ANDROID_NDK_ROOT} ]]; then
|
||||
echo -e "(*) ANDROID_NDK_ROOT not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${API} ]]; then
|
||||
echo -e "(*) API not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/android-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="libsndfile"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
if [[ ! -f ${BASEDIR}/src/${LIB_NAME}/configure ]] || [[ ${RECONF_libsndfile} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--disable-sqlite \
|
||||
--disable-alsa \
|
||||
--disable-full-suite \
|
||||
--disable-external-libs \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp ./*.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -57,16 +57,15 @@ cmake -Wno-dev \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
-DUSE_OMP=0 \
|
||||
${ASM_FLAGS} \
|
||||
-DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
|
||||
|
||||
@@ -25,7 +25,7 @@ fi
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="libvorbis"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
set_toolchain_gcc_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
@@ -37,16 +37,15 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# -mno-ieee-fp option is not compatible with clang. removing it
|
||||
${SED_INLINE} 's/\-mno-ieee-fp//g' ${BASEDIR}/src/${LIB_NAME}/configure.ac
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ${RECONF_libvorbis} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
# ALWAYS RECONFIGURE
|
||||
autoreconf_library ${LIB_NAME}
|
||||
|
||||
./configure \
|
||||
PKG_CONFIG= ./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--with-ogg-includes=${BASEDIR}/prebuilt/android-$(get_target_build)/libogg/include \
|
||||
--with-ogg-libraries=${BASEDIR}/prebuilt/android-$(get_target_build)/libogg/lib \
|
||||
--enable-static \
|
||||
|
||||
@@ -42,55 +42,36 @@ fi
|
||||
mkdir build;
|
||||
cd build
|
||||
|
||||
# OVERRIDING INCLUDE PATH ORDER
|
||||
CFLAGS="-I${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include \
|
||||
-I${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/include \
|
||||
-I${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/include \
|
||||
-I${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/include $CFLAGS"
|
||||
|
||||
cmake -Wno-dev \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=0 \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
-DGIF_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include" \
|
||||
-DGIF_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/lib" \
|
||||
-DJPEG_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/include" \
|
||||
-DJPEG_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/lib" \
|
||||
-DPNG_PNG_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/include" \
|
||||
-DPNG_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib" \
|
||||
-DTIFF_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/include" \
|
||||
-DTIFF_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/lib" \
|
||||
-DZLIB_INCLUDE_DIR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot/usr/include" \
|
||||
-DZLIB_INCLUDE_DIR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/include" \
|
||||
-DZLIB_LIBRARY="${ANDROID_NDK_ROOT}/platform/android-${API}/arch-$(get_target_build)/usr/lib" \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DGLUT_INCLUDE_DIR= \
|
||||
-DGLUT_cocoa_LIBRARY= \
|
||||
-DGLUT_glut_LIBRARY= \
|
||||
-DOPENGL_INCLUDE_DIR= \
|
||||
-DSDLMAIN_LIBRARY= \
|
||||
-DSDL_INCLUDE_DIR= \
|
||||
-DWEBP_BUILD_CWEBP=0 \
|
||||
-DWEBP_BUILD_DWEBP=0 \
|
||||
-DWEBP_BUILD_EXTRAS=0 \
|
||||
-DWEBP_BUILD_GIF2WEBP=0 \
|
||||
-DWEBP_BUILD_IMG2WEBP=0 \
|
||||
-DWEBP_BUILD_WEBPMUX=0 \
|
||||
-DWEBP_BUILD_WEBPINFO=0 \
|
||||
-DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
|
||||
-DBUILD_SHARED_LIBS=0 .. || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# CREATE PACKAGE CONFIG MANUALLY
|
||||
create_libwebp_package_config "1.0.1"
|
||||
create_libwebp_package_config "1.0.0"
|
||||
|
||||
make install || exit 1
|
||||
|
||||
@@ -40,7 +40,7 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# NOTE THAT PYTHON IS DISABLED DUE TO THE FOLLOWING ERROR
|
||||
#
|
||||
# .../android-sdk/ndk-bundle/toolchains/mobile-ffmpeg-api-21-arm/include/python2.7/pyport.h:1029:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
|
||||
# .../android-sdk/ndk-bundle/toolchains/mobile-ffmpeg-arm/include/python2.7/pyport.h:1029:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
|
||||
# #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
|
||||
#
|
||||
|
||||
@@ -50,7 +50,7 @@ autoreconf_library ${LIB_NAME}
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--with-zlib \
|
||||
--with-iconv=${BASEDIR}/prebuilt/android-$(get_target_build)/libiconv/lib \
|
||||
--with-sax1 \
|
||||
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--enable-rtcd \
|
||||
--enable-asm \
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ANDROID_NDK_ROOT} ]]; then
|
||||
echo -e "(*) ANDROID_NDK_ROOT not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${API} ]]; then
|
||||
echo -e "(*) API not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/android-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="sdl"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ${RECONF_sdl} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--without-x \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp ./*.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
|
||||
@@ -47,17 +47,16 @@ cmake -Wno-dev \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
-DSNAPPY_BUILD_TESTS=0 \
|
||||
-DHAVE_LIBLZO2=0 \
|
||||
-DHAVE_LIBZ=1 \
|
||||
|
||||
@@ -47,17 +47,16 @@ cmake -Wno-dev \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
-DBUILD_TESTS=0 \
|
||||
-DWITH_DEV_TRACE=0 \
|
||||
-DWITH_LSR_BINDINGS=0 \
|
||||
|
||||
@@ -51,7 +51,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static ${OPTIONAL_CPU_SUPPORT} \
|
||||
--disable-shared \
|
||||
--disable-binaries \
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ANDROID_NDK_ROOT} ]]; then
|
||||
echo -e "(*) ANDROID_NDK_ROOT not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${API} ]]; then
|
||||
echo -e "(*) API not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/android-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="tesseract"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ! -f ${BASEDIR}/src/${LIB_NAME}/configure ]] || [[ ${RECONF_tesseract} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
export LEPTONICA_CFLAGS="-I${BASEDIR}/prebuilt/android-$(get_target_build)/leptonica/include/leptonica"
|
||||
export LEPTONICA_LIBS="-L${BASEDIR}/prebuilt/android-$(get_target_build)/leptonica/lib -llept"
|
||||
|
||||
# MANUALLY SET ENDIANNESS
|
||||
export ac_cv_c_bigendian=no
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--disable-debug \
|
||||
--disable-graphics \
|
||||
--disable-cube \
|
||||
--disable-tessdata-prefix \
|
||||
--disable-largefile \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
${SED_INLINE} 's/\-lrt//g' ${BASEDIR}/src/${LIB_NAME}/api/Makefile
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# CREATE PACKAGE CONFIG MANUALLY
|
||||
create_tesseract_package_config "3.05.02"
|
||||
|
||||
make install || exit 1
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--with-jpeg-include-dir=${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/include \
|
||||
--with-jpeg-lib-dir=${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/lib \
|
||||
--enable-static \
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ANDROID_NDK_ROOT} ]]; then
|
||||
echo -e "(*) ANDROID_NDK_ROOT not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${API} ]]; then
|
||||
echo -e "(*) API not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/android-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="twolame"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ${RECONF_twolame} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
export SNDFILE_CFLAGS="$(pkg-config --cflags sndfile)"
|
||||
export SNDFILE_LIBS="$(pkg-config --libs --static sndfile)"
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp ./*.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
@@ -45,7 +45,7 @@ fi
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--without-iconv \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
|
||||
@@ -67,7 +67,7 @@ esac
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
|
||||
--enable-pic \
|
||||
--sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot \
|
||||
--sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
|
||||
--enable-static \
|
||||
--disable-cli \
|
||||
${ASM_FLAGS} \
|
||||
|
||||
@@ -76,17 +76,16 @@ cmake -Wno-dev \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
|
||||
-DCMAKE_SYSTEM_NAME=Generic \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-api-${API}-${TOOLCHAIN}/bin/$AS" \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
|
||||
-DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
|
||||
-DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CXX" \
|
||||
-DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
|
||||
-DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
|
||||
-DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
|
||||
-DSTATIC_LINK_CRT=1 \
|
||||
-DENABLE_PIC=1 \
|
||||
-DENABLE_CLI=0 \
|
||||
|
||||
+28
-84
@@ -46,25 +46,18 @@ get_library_name() {
|
||||
25) echo "soxr" ;;
|
||||
26) echo "libaom" ;;
|
||||
27) echo "chromaprint" ;;
|
||||
28) echo "twolame" ;;
|
||||
29) echo "sdl" ;;
|
||||
30) echo "tesseract" ;;
|
||||
31) echo "giflib" ;;
|
||||
32) echo "jpeg" ;;
|
||||
33) echo "libogg" ;;
|
||||
34) echo "libpng" ;;
|
||||
35) echo "libuuid" ;;
|
||||
36) echo "nettle" ;;
|
||||
37) echo "tiff" ;;
|
||||
38) echo "expat" ;;
|
||||
39) echo "libsndfile" ;;
|
||||
40) echo "leptonica" ;;
|
||||
41) echo "ios-zlib" ;;
|
||||
42) echo "ios-audiotoolbox" ;;
|
||||
43) echo "ios-coreimage" ;;
|
||||
44) echo "ios-bzip2" ;;
|
||||
45) echo "ios-videotoolbox" ;;
|
||||
46) echo "ios-avfoundation" ;;
|
||||
28) echo "giflib" ;;
|
||||
29) echo "jpeg" ;;
|
||||
30) echo "libogg" ;;
|
||||
31) echo "libpng" ;;
|
||||
32) echo "libuuid" ;;
|
||||
33) echo "nettle" ;;
|
||||
34) echo "tiff" ;;
|
||||
35) echo "expat" ;;
|
||||
36) echo "ios-zlib" ;;
|
||||
37) echo "ios-audiotoolbox" ;;
|
||||
38) echo "ios-coreimage" ;;
|
||||
39) echo "ios-bzip2" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
@@ -77,15 +70,10 @@ get_static_archive_name() {
|
||||
21) echo "libvidstab.a" ;;
|
||||
22) echo "libilbc.a" ;;
|
||||
26) echo "libaom.a" ;;
|
||||
28) echo "libtwolame.a" ;;
|
||||
29) echo "libSDL2.a" ;;
|
||||
30) echo "libtesseract.a" ;;
|
||||
31) echo "libgif.a" ;;
|
||||
33) echo "libogg.a" ;;
|
||||
34) echo "libpng.a" ;;
|
||||
35) echo "libuuid.a" ;;
|
||||
39) echo "libsndfile.a" ;;
|
||||
40) echo "liblept.a" ;;
|
||||
28) echo "libgif.a" ;;
|
||||
30) echo "libogg.a" ;;
|
||||
31) echo "libpng.a" ;;
|
||||
32) echo "libuuid.a" ;;
|
||||
*) echo lib$(get_library_name $1).a
|
||||
esac
|
||||
}
|
||||
@@ -101,7 +89,7 @@ get_arch_name() {
|
||||
}
|
||||
|
||||
get_target_host() {
|
||||
echo "$(get_target_arch)-ios-darwin"
|
||||
echo "$(get_target_arch)-apple-darwin"
|
||||
}
|
||||
|
||||
get_target_arch() {
|
||||
@@ -233,18 +221,12 @@ get_app_specific_cflags() {
|
||||
kvazaar)
|
||||
APP_FLAGS="-std=gnu99 -Wno-unused-function"
|
||||
;;
|
||||
leptonica)
|
||||
APP_FLAGS="-std=c99 -Wno-unused-function -DOS_IOS"
|
||||
;;
|
||||
libwebp | xvidcore)
|
||||
APP_FLAGS="-fno-common -DPIC"
|
||||
;;
|
||||
mobile-ffmpeg)
|
||||
APP_FLAGS="-std=c99 -Wno-unused-function -Wall -Wno-deprecated-declarations -Wno-pointer-sign -Wno-switch -Wno-unused-result -Wno-unused-variable -DPIC -fobjc-arc"
|
||||
;;
|
||||
sdl2)
|
||||
APP_FLAGS="-DPIC -Wno-unused-function -D__IPHONEOS__"
|
||||
;;
|
||||
shine)
|
||||
APP_FLAGS="-Wno-unused-function"
|
||||
;;
|
||||
@@ -266,11 +248,7 @@ get_cflags() {
|
||||
ARCH_FLAGS=$(get_arch_specific_cflags)
|
||||
APP_FLAGS=$(get_app_specific_cflags $1)
|
||||
COMMON_FLAGS=$(get_common_cflags)
|
||||
if [[ -z ${MOBILE_FFMPEG_DEBUG} ]]; then
|
||||
OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
|
||||
else
|
||||
OPTIMIZATION_FLAGS=""
|
||||
fi
|
||||
OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
|
||||
MIN_VERSION_FLAGS=$(get_min_version_cflags $1)
|
||||
COMMON_INCLUDES=$(get_common_includes)
|
||||
|
||||
@@ -281,11 +259,7 @@ get_asmflags() {
|
||||
ARCH_FLAGS=$(get_arch_specific_cflags)
|
||||
APP_FLAGS=$(get_app_specific_cflags $1)
|
||||
COMMON_FLAGS=$(get_common_cflags)
|
||||
if [[ -z ${MOBILE_FFMPEG_DEBUG} ]]; then
|
||||
OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
|
||||
else
|
||||
OPTIMIZATION_FLAGS=""
|
||||
fi
|
||||
OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
|
||||
MIN_VERSION_FLAGS=$(get_min_version_cflags $1)
|
||||
COMMON_INCLUDES=$(get_common_includes)
|
||||
|
||||
@@ -295,31 +269,24 @@ get_asmflags() {
|
||||
get_cxxflags() {
|
||||
local COMMON_CFLAGS="$(get_common_cflags $1) $(get_common_includes $1) $(get_arch_specific_cflags) $(get_min_version_cflags $1)"
|
||||
|
||||
local BITCODE_FLAGS=""
|
||||
case ${ARCH} in
|
||||
armv7 | armv7s | arm64)
|
||||
BITCODE_FLAGS="-fembed-bitcode"
|
||||
;;
|
||||
esac
|
||||
|
||||
case $1 in
|
||||
x265)
|
||||
echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
|
||||
echo "-std=c++11 -fno-exceptions -fembed-bitcode ${COMMON_CFLAGS}"
|
||||
;;
|
||||
gnutls)
|
||||
echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
|
||||
echo "-std=c++11 -fno-rtti -fembed-bitcode ${COMMON_CFLAGS}"
|
||||
;;
|
||||
opencore-amr)
|
||||
echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
|
||||
echo "-fno-rtti -fembed-bitcode ${COMMON_CFLAGS}"
|
||||
;;
|
||||
libwebp | xvidcore)
|
||||
echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS}"
|
||||
echo "-std=c++11 -fno-exceptions -fno-rtti -fembed-bitcode -fno-common -DPIC ${COMMON_CFLAGS}"
|
||||
;;
|
||||
libaom)
|
||||
echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
|
||||
echo "-std=c++11 -fno-exceptions -fembed-bitcode ${COMMON_CFLAGS}"
|
||||
;;
|
||||
*)
|
||||
echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS}"
|
||||
echo "-std=c++11 -fno-exceptions -fno-rtti -fembed-bitcode ${COMMON_CFLAGS}"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@@ -662,29 +629,6 @@ Cflags: -I\${includedir}
|
||||
EOF
|
||||
}
|
||||
|
||||
create_tesseract_package_config() {
|
||||
local TESSERACT_VERSION="$1"
|
||||
|
||||
cat > "${INSTALL_PKG_CONFIG_DIR}/tesseract.pc" << EOF
|
||||
prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/tesseract
|
||||
exec_prefix=\${prefix}
|
||||
bindir=\${exec_prefix}/bin
|
||||
datarootdir=\${prefix}/share
|
||||
datadir=\${datarootdir}
|
||||
libdir=\${exec_prefix}/lib
|
||||
includedir=\${prefix}/include
|
||||
|
||||
Name: tesseract
|
||||
Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
|
||||
URL: https://github.com/tesseract-ocr/tesseract
|
||||
Version: ${TESSERACT_VERSION}
|
||||
|
||||
Requires: lept
|
||||
Libs: -L\${libdir} -ltesseract
|
||||
Cflags: -I\${includedir}
|
||||
EOF
|
||||
}
|
||||
|
||||
create_uuid_package_config() {
|
||||
local UUID_VERSION="$1"
|
||||
|
||||
@@ -806,9 +750,9 @@ download_gpl_library_source() {
|
||||
GPL_LIB_DEST_DIR="libvidstab"
|
||||
;;
|
||||
x264)
|
||||
GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20181208-2245-stable.tar.bz2"
|
||||
GPL_LIB_FILE="x264-snapshot-20181208-2245-stable.tar.bz2"
|
||||
GPL_LIB_ORIG_DIR="x264-snapshot-20181208-2245-stable"
|
||||
GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20181107-2245-stable.tar.bz2"
|
||||
GPL_LIB_FILE="x264-snapshot-20181107-2245-stable.tar.bz2"
|
||||
GPL_LIB_ORIG_DIR="x264-snapshot-20181107-2245-stable"
|
||||
GPL_LIB_DEST_DIR="x264"
|
||||
;;
|
||||
x265)
|
||||
|
||||
+14
-47
@@ -82,7 +82,7 @@ esac
|
||||
|
||||
CONFIGURE_POSTFIX=""
|
||||
|
||||
for library in {1..47}
|
||||
for library in {1..40}
|
||||
do
|
||||
if [[ ${!library} -eq 1 ]]; then
|
||||
ENABLED_LIBRARY=$(get_library_name $((library - 1)))
|
||||
@@ -193,11 +193,6 @@ do
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static opus)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libopus"
|
||||
;;
|
||||
sdl)
|
||||
FFMPEG_CFLAGS+=" $(pkg-config --cflags sdl2)"
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static sdl2)"
|
||||
CONFIGURE_POSTFIX+=" --enable-sdl2"
|
||||
;;
|
||||
shine)
|
||||
FFMPEG_CFLAGS+=" $(pkg-config --cflags shine)"
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static shine)"
|
||||
@@ -218,18 +213,6 @@ do
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static speex)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libspeex"
|
||||
;;
|
||||
tesseract)
|
||||
FFMPEG_CFLAGS+=" $(pkg-config --cflags tesseract)"
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static tesseract)"
|
||||
FFMPEG_CFLAGS+=" $(pkg-config --cflags giflib)"
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static giflib)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libtesseract"
|
||||
;;
|
||||
twolame)
|
||||
FFMPEG_CFLAGS+=" $(pkg-config --cflags twolame)"
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static twolame)"
|
||||
CONFIGURE_POSTFIX+=" --enable-libtwolame"
|
||||
;;
|
||||
wavpack)
|
||||
FFMPEG_CFLAGS+=" $(pkg-config --cflags wavpack)"
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static wavpack)"
|
||||
@@ -280,23 +263,17 @@ do
|
||||
FFMPEG_LDFLAGS+=" $(pkg-config --libs --static zlib)"
|
||||
|
||||
case ${ENABLED_LIBRARY} in
|
||||
ios-zlib)
|
||||
CONFIGURE_POSTFIX+=" --enable-zlib"
|
||||
;;
|
||||
ios-audiotoolbox)
|
||||
CONFIGURE_POSTFIX+=" --enable-audiotoolbox"
|
||||
;;
|
||||
ios-avfoundation)
|
||||
CONFIGURE_POSTFIX+=" --enable-avfoundation"
|
||||
;;
|
||||
ios-bzip2)
|
||||
CONFIGURE_POSTFIX+=" --enable-bzlib"
|
||||
;;
|
||||
ios-coreimage)
|
||||
CONFIGURE_POSTFIX+=" --enable-coreimage"
|
||||
;;
|
||||
ios-videotoolbox)
|
||||
CONFIGURE_POSTFIX+=" --enable-videotoolbox"
|
||||
;;
|
||||
ios-zlib)
|
||||
CONFIGURE_POSTFIX+=" --enable-zlib"
|
||||
ios-bzip2)
|
||||
CONFIGURE_POSTFIX+=" --enable-bzlib"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -306,20 +283,14 @@ do
|
||||
# THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
|
||||
if [[ ${library} -eq 8 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-iconv"
|
||||
elif [[ ${library} -eq 30 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-sdl2"
|
||||
elif [[ ${library} -eq 42 ]]; then
|
||||
elif [[ ${library} -eq 37 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-zlib"
|
||||
elif [[ ${library} -eq 43 ]]; then
|
||||
elif [[ ${library} -eq 38 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-audiotoolbox"
|
||||
elif [[ ${library} -eq 44 ]]; then
|
||||
elif [[ ${library} -eq 39 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-coreimage"
|
||||
elif [[ ${library} -eq 45 ]]; then
|
||||
elif [[ ${library} -eq 40 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-bzlib"
|
||||
elif [[ ${library} -eq 46 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-videotoolbox"
|
||||
elif [[ ${library} -eq 47 ]]; then
|
||||
CONFIGURE_POSTFIX+=" --disable-avfoundation"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@@ -331,13 +302,6 @@ else
|
||||
BUILD_LIBRARY_OPTIONS="--enable-static --disable-shared";
|
||||
fi
|
||||
|
||||
# OPTIMIZE FOR SPEED INSTEAD OF SIZE
|
||||
if [[ -z ${MOBILE_FFMPEG_OPTIMIZED_FOR_SPEED} ]]; then
|
||||
SIZE_OPTIONS="--enable-small";
|
||||
else
|
||||
SIZE_OPTIONS="";
|
||||
fi
|
||||
|
||||
# CFLAGS PARTS
|
||||
ARCH_CFLAGS=$(get_arch_specific_cflags);
|
||||
APP_CFLAGS=$(get_app_specific_cflags ${LIB_NAME});
|
||||
@@ -384,9 +348,9 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--enable-asm \
|
||||
--enable-inline-asm \
|
||||
--enable-optimizations \
|
||||
--enable-small \
|
||||
--enable-swscale \
|
||||
${BUILD_LIBRARY_OPTIONS} \
|
||||
${SIZE_OPTIONS} \
|
||||
--disable-openssl \
|
||||
--disable-xmm-clobber-test \
|
||||
--disable-debug \
|
||||
@@ -400,6 +364,7 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--disable-txtpages \
|
||||
--disable-sndio \
|
||||
--disable-schannel \
|
||||
--disable-sdl2 \
|
||||
--disable-securetransport \
|
||||
--disable-xlib \
|
||||
--disable-cuda \
|
||||
@@ -407,6 +372,7 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--disable-nvenc \
|
||||
--disable-vaapi \
|
||||
--disable-vdpau \
|
||||
--disable-videotoolbox \
|
||||
--disable-appkit \
|
||||
--disable-alsa \
|
||||
--disable-cuda \
|
||||
@@ -414,6 +380,7 @@ make distclean 2>/dev/null 1>/dev/null
|
||||
--disable-nvenc \
|
||||
--disable-vaapi \
|
||||
--disable-vdpau \
|
||||
--disable-videotoolbox \
|
||||
${CONFIGURE_POSTFIX} 1>>${BASEDIR}/build.log 2>&1
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
|
||||
@@ -62,11 +62,6 @@ fi
|
||||
--disable-docs \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
# DISABLE IOS TESTS with system() calls - system() is deprecated for IOS
|
||||
# 1. test-bz106632.c
|
||||
rm -f ${BASEDIR}/src/${LIB_NAME}/test/test-bz106632.c
|
||||
cp ${BASEDIR}/src/${LIB_NAME}/test/test-bz106618.c ${BASEDIR}/src/${LIB_NAME}/test/test-bz106632.c
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# CREATE PACKAGE CONFIG MANUALLY
|
||||
|
||||
@@ -64,7 +64,6 @@ cmake -Wno-dev \
|
||||
-DCMAKE_AS="$AS" \
|
||||
-DENABLE_PIC=1 \
|
||||
-DENABLE_STATIC=1 \
|
||||
-DENABLE_SHARED=0 \
|
||||
-DWITH_JPEG8=1 \
|
||||
-DWITH_SIMD=1 \
|
||||
-DWITH_TURBOJPEG=0 \
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${IOS_MIN_VERSION} ]]; then
|
||||
echo -e "(*) IOS_MIN_VERSION not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${TARGET_SDK} ]]; then
|
||||
echo -e "(*) TARGET_SDK not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${SDK_PATH} ]]; then
|
||||
echo -e "(*) SDK_PATH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/ios-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="leptonica"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS="$(get_cflags ${LIB_NAME})"
|
||||
export CXXFLAGS="$(get_cxxflags ${LIB_NAME})"
|
||||
export CPPFLAGS="-I${BASEDIR}/prebuilt/ios-$(get_target_host)/giflib/include"
|
||||
export LDFLAGS="$(get_ldflags ${LIB_NAME}) -L${BASEDIR}/prebuilt/ios-$(get_target_host)/giflib/lib -lgif"
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
export LIBPNG_CFLAGS="$(pkg-config --cflags libpng)"
|
||||
export LIBPNG_LIBS="$(pkg-config --libs --static libpng)"
|
||||
|
||||
export LIBWEBP_CFLAGS="$(pkg-config --cflags libwebp)"
|
||||
export LIBWEBP_LIBS="$(pkg-config --libs --static libwebp)"
|
||||
|
||||
export LIBTIFF_CFLAGS="$(pkg-config --cflags libtiff-4)"
|
||||
export LIBTIFF_LIBS="$(pkg-config --libs --static libtiff-4)"
|
||||
|
||||
export ZLIB_CFLAGS="$(pkg-config --cflags zlib)"
|
||||
export ZLIB_LIBS="$(pkg-config --libs --static zlib)"
|
||||
|
||||
export JPEG_CFLAGS="$(pkg-config --cflags libjpeg)"
|
||||
export JPEG_LIBS="$(pkg-config --libs --static libjpeg)"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ${RECONF_leptonica} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-zlib \
|
||||
--with-libpng \
|
||||
--with-jpeg \
|
||||
--with-giflib \
|
||||
--with-libtiff \
|
||||
--with-libwebp \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--disable-programs \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp lept.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
@@ -1,68 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${IOS_MIN_VERSION} ]]; then
|
||||
echo -e "(*) IOS_MIN_VERSION not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${TARGET_SDK} ]]; then
|
||||
echo -e "(*) TARGET_SDK not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${SDK_PATH} ]]; then
|
||||
echo -e "(*) SDK_PATH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/ios-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="libsndfile"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
if [[ ! -f ${BASEDIR}/src/${LIB_NAME}/configure ]] || [[ ${RECONF_libsndfile} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${SDK_PATH} \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--disable-sqlite \
|
||||
--disable-alsa \
|
||||
--disable-full-suite \
|
||||
--disable-external-libs \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp ./*.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
@@ -48,7 +48,7 @@ if [[ ${RECONF_libvorbis} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
./configure \
|
||||
PKG_CONFIG= ./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${SDK_PATH} \
|
||||
|
||||
+11
-29
@@ -47,12 +47,6 @@ fi
|
||||
mkdir build;
|
||||
cd build
|
||||
|
||||
# OVERRIDING INCLUDE PATH ORDER
|
||||
CFLAGS="-I${BASEDIR}/prebuilt/ios-$(get_target_host)/giflib/include \
|
||||
-I${BASEDIR}/prebuilt/ios-$(get_target_host)/jpeg/include \
|
||||
-I${BASEDIR}/prebuilt/ios-$(get_target_host)/libpng/include \
|
||||
-I${BASEDIR}/prebuilt/ios-$(get_target_host)/tiff/include $CFLAGS"
|
||||
|
||||
cmake -Wno-dev \
|
||||
-DCMAKE_VERBOSE_MAKEFILE=0 \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
@@ -67,34 +61,22 @@ cmake -Wno-dev \
|
||||
-DCMAKE_LINKER="$LD" \
|
||||
-DCMAKE_AR="$AR" \
|
||||
-DCMAKE_AS="$AS" \
|
||||
-DGIF_INCLUDE_DIR=${BASEDIR}/prebuilt/ios-$(get_target_host)/giflib/include \
|
||||
-DJPEG_INCLUDE_DIR=${BASEDIR}/prebuilt/ios-$(get_target_host)/jpeg/include \
|
||||
-DJPEG_LIBRARY=${BASEDIR}/prebuilt/ios-$(get_target_host)/jpeg/lib \
|
||||
-DPNG_PNG_INCLUDE_DIR=${BASEDIR}/prebuilt/ios-$(get_target_host)/libpng/include \
|
||||
-DPNG_LIBRARY=${BASEDIR}/prebuilt/ios-$(get_target_host)/libpng/lib \
|
||||
-DTIFF_INCLUDE_DIR=${BASEDIR}/prebuilt/ios-$(get_target_host)/tiff/include \
|
||||
-DTIFF_LIBRARY=${BASEDIR}/prebuilt/ios-$(get_target_host)/tiff/lib \
|
||||
-DZLIB_INCLUDE_DIR=${SDK_PATH}/usr/include \
|
||||
-DZLIB_LIBRARY=${SDK_PATH}/usr/lib \
|
||||
-DGLUT_INCLUDE_DIR= \
|
||||
-DGLUT_cocoa_LIBRARY= \
|
||||
-DGLUT_glut_LIBRARY= \
|
||||
-DOPENGL_INCLUDE_DIR= \
|
||||
-DSDLMAIN_LIBRARY= \
|
||||
-DSDL_INCLUDE_DIR= \
|
||||
-DWEBP_BUILD_CWEBP=0 \
|
||||
-DWEBP_BUILD_DWEBP=0 \
|
||||
-DWEBP_BUILD_EXTRAS=0 \
|
||||
-DWEBP_BUILD_GIF2WEBP=0 \
|
||||
-DWEBP_BUILD_IMG2WEBP=0 \
|
||||
-DWEBP_BUILD_WEBPMUX=0 \
|
||||
-DWEBP_BUILD_WEBPINFO=0 \
|
||||
-DGIF_INCLUDE_DIR="${BASEDIR}/prebuilt/ios-$(get_target_host)/giflib/include" \
|
||||
-DGIF_LIBRARY="${BASEDIR}/prebuilt/ios-$(get_target_host)/giflib/lib" \
|
||||
-DJPEG_INCLUDE_DIR="${BASEDIR}/prebuilt/ios-$(get_target_host)/jpeg/include" \
|
||||
-DJPEG_LIBRARY="${BASEDIR}/prebuilt/ios-$(get_target_host)/jpeg/lib" \
|
||||
-DPNG_PNG_INCLUDE_DIR="${BASEDIR}/prebuilt/ios-$(get_target_host)/libpng/include" \
|
||||
-DPNG_LIBRARY="${BASEDIR}/prebuilt/ios-$(get_target_host)/libpng/lib" \
|
||||
-DTIFF_INCLUDE_DIR="${BASEDIR}/prebuilt/ios-$(get_target_host)/tiff/include" \
|
||||
-DTIFF_LIBRARY="${BASEDIR}/prebuilt/ios-$(get_target_host)/tiff/lib" \
|
||||
-DZLIB_INCLUDE_DIR="${SDK_PATH}/usr/include" \
|
||||
-DZLIB_LIBRARY="${SDK_PATH}/usr/lib" \
|
||||
-DCMAKE_SYSTEM_PROCESSOR=$(get_target_arch) \
|
||||
-DBUILD_SHARED_LIBS=0 .. || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# CREATE PACKAGE CONFIG MANUALLY
|
||||
create_libwebp_package_config "1.0.1"
|
||||
create_libwebp_package_config "1.0.0"
|
||||
|
||||
make install || exit 1
|
||||
|
||||
@@ -39,7 +39,7 @@ COMMON_LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
|
||||
export CFLAGS="${COMMON_CFLAGS} -I${BASEDIR}/prebuilt/ios-$(get_target_host)/ffmpeg/include"
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS="${COMMON_LDFLAGS} -L${BASEDIR}/prebuilt/ios-$(get_target_host)/ffmpeg/lib -framework Foundation -framework CoreVideo -lavdevice"
|
||||
export LDFLAGS="${COMMON_LDFLAGS} -L${BASEDIR}/prebuilt/ios-$(get_target_host)/ffmpeg/lib -framework Foundation -lavdevice"
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
# BUILD SHARED (DEFAULT) OR STATIC LIBRARIES
|
||||
@@ -60,11 +60,6 @@ if [[ ${RECONF_mobile_ffmpeg} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
VIDEOTOOLBOX_SUPPORT_FLAG=""
|
||||
if [[ ${46} -eq 1 ]]; then
|
||||
VIDEOTOOLBOX_SUPPORT_FLAG="--enable-videotoolbox"
|
||||
fi
|
||||
|
||||
# REMOVING OPTIONS FROM CONFIGURE TO FIX THE FOLLOWING ERROR
|
||||
# ld: -flat_namespace and -bitcode_bundle (Xcode setting ENABLE_BITCODE=YES) cannot be used together
|
||||
${SED_INLINE} 's/$wl-flat_namespace //g' configure
|
||||
@@ -76,7 +71,6 @@ ${SED_INLINE} 's/${wl}suppress//g' configure
|
||||
--with-pic \
|
||||
--with-sysroot=${SDK_PATH} \
|
||||
${BUILD_LIBRARY_OPTIONS} \
|
||||
${VIDEOTOOLBOX_SUPPORT_FLAG} \
|
||||
--disable-fast-install \
|
||||
--disable-maintainer-mode \
|
||||
--host=${TARGET_HOST} 1>>${BASEDIR}/build.log 2>&1
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${IOS_MIN_VERSION} ]]; then
|
||||
echo -e "(*) IOS_MIN_VERSION not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${TARGET_SDK} ]]; then
|
||||
echo -e "(*) TARGET_SDK not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${SDK_PATH} ]]; then
|
||||
echo -e "(*) SDK_PATH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/ios-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="sdl"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ${RECONF_sdl} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
export ac_cv_header_libunwind_h=no
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${SDK_PATH} \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp ./*.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
@@ -1,74 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${IOS_MIN_VERSION} ]]; then
|
||||
echo -e "(*) IOS_MIN_VERSION not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${TARGET_SDK} ]]; then
|
||||
echo -e "(*) TARGET_SDK not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${SDK_PATH} ]]; then
|
||||
echo -e "(*) SDK_PATH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/ios-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="tesseract"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ! -f ${BASEDIR}/src/${LIB_NAME}/configure ]] || [[ ${RECONF_tesseract} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
export LEPTONICA_CFLAGS="-I${BASEDIR}/prebuilt/ios-$(get_target_host)/leptonica/include/leptonica"
|
||||
export LEPTONICA_LIBS="-L${BASEDIR}/prebuilt/ios-$(get_target_host)/leptonica/lib -llept"
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${SDK_PATH} \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--disable-debug \
|
||||
--disable-graphics \
|
||||
--disable-cube \
|
||||
--disable-tessdata-prefix \
|
||||
--disable-largefile \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
${SED_INLINE} 's/$wl-bind_at_load//g' libtool
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# CREATE PACKAGE CONFIG MANUALLY
|
||||
create_tesseract_package_config "3.05.02"
|
||||
|
||||
make install || exit 1
|
||||
@@ -1,68 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z ${ARCH} ]]; then
|
||||
echo -e "(*) ARCH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${IOS_MIN_VERSION} ]]; then
|
||||
echo -e "(*) IOS_MIN_VERSION not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${TARGET_SDK} ]]; then
|
||||
echo -e "(*) TARGET_SDK not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${SDK_PATH} ]]; then
|
||||
echo -e "(*) SDK_PATH not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z ${BASEDIR} ]]; then
|
||||
echo -e "(*) BASEDIR not defined\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ENABLE COMMON FUNCTIONS
|
||||
. ${BASEDIR}/build/ios-common.sh
|
||||
|
||||
# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
|
||||
LIB_NAME="twolame"
|
||||
set_toolchain_clang_paths ${LIB_NAME}
|
||||
|
||||
# PREPARING FLAGS
|
||||
TARGET_HOST=$(get_target_host)
|
||||
export CFLAGS=$(get_cflags ${LIB_NAME})
|
||||
export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
|
||||
export LDFLAGS=$(get_ldflags ${LIB_NAME})
|
||||
export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
|
||||
|
||||
cd ${BASEDIR}/src/${LIB_NAME} || exit 1
|
||||
|
||||
make distclean 2>/dev/null 1>/dev/null
|
||||
|
||||
# RECONFIGURING IF REQUESTED
|
||||
if [[ ${RECONF_twolame} -eq 1 ]]; then
|
||||
autoreconf_library ${LIB_NAME}
|
||||
fi
|
||||
|
||||
export SNDFILE_CFLAGS="$(pkg-config --cflags sndfile)"
|
||||
export SNDFILE_LIBS="$(pkg-config --libs --static sndfile)"
|
||||
|
||||
./configure \
|
||||
--prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
|
||||
--with-pic \
|
||||
--with-sysroot=${SDK_PATH} \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-fast-install \
|
||||
--host=${TARGET_HOST} || exit 1
|
||||
|
||||
make ${MOBILE_FFMPEG_DEBUG} -j$(get_cpu_count) || exit 1
|
||||
|
||||
# MANUALLY COPY PKG-CONFIG FILES
|
||||
cp ./*.pc ${INSTALL_PKG_CONFIG_DIR}
|
||||
|
||||
make install || exit 1
|
||||
+1
-34
@@ -38,8 +38,6 @@ check_if_dependency_rebuilt() {
|
||||
;;
|
||||
giflib)
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
gmp)
|
||||
set_dependency_rebuilt_flag "gnutls"
|
||||
@@ -48,11 +46,6 @@ check_if_dependency_rebuilt() {
|
||||
jpeg)
|
||||
set_dependency_rebuilt_flag "tiff"
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
leptonica)
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
libiconv)
|
||||
set_dependency_rebuilt_flag "fontconfig"
|
||||
@@ -69,11 +62,6 @@ check_if_dependency_rebuilt() {
|
||||
set_dependency_rebuilt_flag "freetype"
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "libass"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
libsndfile)
|
||||
set_dependency_rebuilt_flag "twolame"
|
||||
;;
|
||||
libuuid)
|
||||
set_dependency_rebuilt_flag "fontconfig"
|
||||
@@ -82,17 +70,11 @@ check_if_dependency_rebuilt() {
|
||||
libvorbis)
|
||||
set_dependency_rebuilt_flag "libtheora"
|
||||
;;
|
||||
libwebp)
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
nettle)
|
||||
set_dependency_rebuilt_flag "gnutls"
|
||||
;;
|
||||
tiff)
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@@ -118,7 +100,7 @@ fi
|
||||
# FILTERING WHICH EXTERNAL LIBRARIES WILL BE BUILT
|
||||
# NOTE THAT BUILT-IN LIBRARIES ARE FORWARDED TO FFMPEG SCRIPT WITHOUT ANY PROCESSING
|
||||
enabled_library_list=()
|
||||
for library in {1..41}
|
||||
for library in {1..36}
|
||||
do
|
||||
if [[ ${!library} -eq 1 ]]; then
|
||||
ENABLED_LIBRARY=$(get_library_name $((library - 1)))
|
||||
@@ -157,11 +139,6 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
leptonica)
|
||||
if [[ ! -z $OK_giflib ]] && [[ ! -z $OK_jpeg ]] && [[ ! -z $OK_libpng ]] && [[ ! -z $OK_tiff ]] && [[ ! -z $OK_libwebp ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
libass)
|
||||
if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_libiconv ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
|
||||
run=1
|
||||
@@ -192,21 +169,11 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
tesseract)
|
||||
if [[ ! -z $OK_leptonica ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
tiff)
|
||||
if [[ ! -z $OK_jpeg ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
twolame)
|
||||
if [[ ! -z $OK_libsndfile ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
run=1
|
||||
;;
|
||||
|
||||
+2
-35
@@ -43,8 +43,6 @@ check_if_dependency_rebuilt() {
|
||||
;;
|
||||
giflib)
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
gmp)
|
||||
set_dependency_rebuilt_flag "gnutls"
|
||||
@@ -53,11 +51,6 @@ check_if_dependency_rebuilt() {
|
||||
jpeg)
|
||||
set_dependency_rebuilt_flag "tiff"
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
leptonica)
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
libiconv)
|
||||
set_dependency_rebuilt_flag "fontconfig"
|
||||
@@ -74,11 +67,6 @@ check_if_dependency_rebuilt() {
|
||||
set_dependency_rebuilt_flag "freetype"
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "libass"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
libsndfile)
|
||||
set_dependency_rebuilt_flag "twolame"
|
||||
;;
|
||||
libuuid)
|
||||
set_dependency_rebuilt_flag "fontconfig"
|
||||
@@ -87,17 +75,11 @@ check_if_dependency_rebuilt() {
|
||||
libvorbis)
|
||||
set_dependency_rebuilt_flag "libtheora"
|
||||
;;
|
||||
libwebp)
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
nettle)
|
||||
set_dependency_rebuilt_flag "gnutls"
|
||||
;;
|
||||
tiff)
|
||||
set_dependency_rebuilt_flag "libwebp"
|
||||
set_dependency_rebuilt_flag "leptonica"
|
||||
set_dependency_rebuilt_flag "tesseract"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@@ -123,7 +105,7 @@ fi
|
||||
# FILTERING WHICH EXTERNAL LIBRARIES WILL BE BUILT
|
||||
# NOTE THAT BUILT-IN LIBRARIES ARE FORWARDED TO FFMPEG SCRIPT WITHOUT ANY PROCESSING
|
||||
enabled_library_list=()
|
||||
for library in {1..41}
|
||||
for library in {1..36}
|
||||
do
|
||||
if [[ ${!library} -eq 1 ]]; then
|
||||
ENABLED_LIBRARY=$(get_library_name $((library - 1)))
|
||||
@@ -159,11 +141,6 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
leptonica)
|
||||
if [[ ! -z $OK_giflib ]] && [[ ! -z $OK_jpeg ]] && [[ ! -z $OK_libpng ]] && [[ ! -z $OK_tiff ]] && [[ ! -z $OK_libwebp ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
libass)
|
||||
if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_libiconv ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
|
||||
run=1
|
||||
@@ -194,21 +171,11 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
tesseract)
|
||||
if [[ ! -z $OK_leptonica ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
tiff)
|
||||
if [[ ! -z $OK_jpeg ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
twolame)
|
||||
if [[ ! -z $OK_libsndfile ]]; then
|
||||
run=1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
run=1
|
||||
;;
|
||||
@@ -282,7 +249,7 @@ fi
|
||||
if [[ ${SKIP_mobile_ffmpeg} -ne 1 ]]; then
|
||||
|
||||
# BUILDING MOBILE FFMPEG
|
||||
. ${BASEDIR}/build/ios-mobile-ffmpeg.sh "$@" || exit 1
|
||||
. ${BASEDIR}/build/ios-mobile-ffmpeg.sh || exit 1
|
||||
else
|
||||
echo -e "\nmobile-ffmpeg: skipped"
|
||||
fi
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<tr style="height: 56px;">
|
||||
<td id="projectalign" style="padding-left: 0.5em;">
|
||||
<div id="projectname">MobileFFmpeg Android API
|
||||
 <span id="projectnumber">3.1</span>
|
||||
 <span id="projectnumber">2.2</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -69,33 +69,32 @@ $(function() {
|
||||
<div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
|
||||
<div class="levels">[detail level <span onclick="javascript:toggleLevel(1);">1</span><span onclick="javascript:toggleLevel(2);">2</span>]</div><table class="directory">
|
||||
<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d6/d2c/struct_audio_channel_map.html" target="_self">AudioChannelMap</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d5/d8e/struct_benchmark_time_stamps.html" target="_self">BenchmarkTimeStamps</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_2_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d2/dc3/struct_callback_data.html" target="_self">CallbackData</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_3_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d9/de7/struct_filter_graph.html" target="_self">FilterGraph</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_4_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="df/d37/struct_h_w_accel.html" target="_self">HWAccel</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_5_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="de/dc7/struct_h_w_device.html" target="_self">HWDevice</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_6_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d8/d99/struct_input_file.html" target="_self">InputFile</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_7_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d7/d0c/struct_input_filter.html" target="_self">InputFilter</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_8_" class="even"><td class="entry"><span style="width:0px;display:inline-block;"> </span><span id="arr_8_" class="arrow" onclick="toggleFolder('8_')">▼</span><span class="icona"><span class="icon">C</span></span><a class="el" href="d3/d6e/struct_input_stream.html" target="_self">InputStream</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_8_0_"><td class="entry"><span style="width:32px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d4/dfd/struct_input_stream_1_1sub2video.html" target="_self">sub2video</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_9_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d3/d1d/struct_option.html" target="_self">Option</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_10_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="dc/d1e/struct_option_def.html" target="_self">OptionDef</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_11_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d6/d69/struct_option_group.html" target="_self">OptionGroup</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_12_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/dd7/struct_option_group_def.html" target="_self">OptionGroupDef</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_13_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d7/d4f/struct_option_group_list.html" target="_self">OptionGroupList</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_14_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/db5/struct_option_parse_context.html" target="_self">OptionParseContext</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_15_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="df/d77/struct_options_context.html" target="_self">OptionsContext</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_16_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="de/df2/struct_output_file.html" target="_self">OutputFile</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_17_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d0/d0f/struct_output_filter.html" target="_self">OutputFilter</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_18_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/dde/struct_output_stream.html" target="_self">OutputStream</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_19_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="dd/da5/struct_specifier_opt.html" target="_self">SpecifierOpt</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_20_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/d60/struct_stream_map.html" target="_self">StreamMap</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d2/dc3/struct_callback_data.html" target="_self">CallbackData</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_2_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d9/de7/struct_filter_graph.html" target="_self">FilterGraph</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_3_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="df/d37/struct_h_w_accel.html" target="_self">HWAccel</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_4_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="de/dc7/struct_h_w_device.html" target="_self">HWDevice</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_5_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d8/d99/struct_input_file.html" target="_self">InputFile</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_6_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d7/d0c/struct_input_filter.html" target="_self">InputFilter</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_7_"><td class="entry"><span style="width:0px;display:inline-block;"> </span><span id="arr_7_" class="arrow" onclick="toggleFolder('7_')">▼</span><span class="icona"><span class="icon">C</span></span><a class="el" href="d3/d6e/struct_input_stream.html" target="_self">InputStream</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_7_0_" class="even"><td class="entry"><span style="width:32px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d4/dfd/struct_input_stream_1_1sub2video.html" target="_self">sub2video</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_8_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d3/d1d/struct_option.html" target="_self">Option</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_9_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="dc/d1e/struct_option_def.html" target="_self">OptionDef</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_10_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d6/d69/struct_option_group.html" target="_self">OptionGroup</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_11_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/dd7/struct_option_group_def.html" target="_self">OptionGroupDef</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_12_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d7/d4f/struct_option_group_list.html" target="_self">OptionGroupList</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_13_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/db5/struct_option_parse_context.html" target="_self">OptionParseContext</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_14_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="df/d77/struct_options_context.html" target="_self">OptionsContext</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_15_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="de/df2/struct_output_file.html" target="_self">OutputFile</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_16_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="d0/d0f/struct_output_filter.html" target="_self">OutputFilter</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_17_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/dde/struct_output_stream.html" target="_self">OutputStream</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_18_"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="dd/da5/struct_specifier_opt.html" target="_self">SpecifierOpt</a></td><td class="desc"></td></tr>
|
||||
<tr id="row_19_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><span class="icona"><span class="icon">C</span></span><a class="el" href="db/d60/struct_stream_map.html" target="_self">StreamMap</a></td><td class="desc"></td></tr>
|
||||
</table>
|
||||
</div><!-- directory -->
|
||||
</div><!-- contents -->
|
||||
<!-- start footer part -->
|
||||
<hr class="footer"/><address class="footer"><small>
|
||||
Generated on Mon Dec 10 2018 00:13:02 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
Generated on Thu Nov 8 2018 23:19:14 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/>
|
||||
</a> 1.8.14
|
||||
</small></address>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<tr style="height: 56px;">
|
||||
<td id="projectalign" style="padding-left: 0.5em;">
|
||||
<div id="projectname">MobileFFmpeg Android API
|
||||
 <span id="projectnumber">3.1</span>
|
||||
 <span id="projectnumber">2.2</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -66,33 +66,31 @@ $(function() {
|
||||
<div class="title">Data Structure Index</div> </div>
|
||||
</div><!--header-->
|
||||
<div class="contents">
|
||||
<div class="qindex"><a class="qindex" href="#letter_a">a</a> | <a class="qindex" href="#letter_b">b</a> | <a class="qindex" href="#letter_c">c</a> | <a class="qindex" href="#letter_f">f</a> | <a class="qindex" href="#letter_h">h</a> | <a class="qindex" href="#letter_i">i</a> | <a class="qindex" href="#letter_o">o</a> | <a class="qindex" href="#letter_s">s</a></div>
|
||||
<div class="qindex"><a class="qindex" href="#letter_a">a</a> | <a class="qindex" href="#letter_c">c</a> | <a class="qindex" href="#letter_f">f</a> | <a class="qindex" href="#letter_h">h</a> | <a class="qindex" href="#letter_i">i</a> | <a class="qindex" href="#letter_o">o</a> | <a class="qindex" href="#letter_s">s</a></div>
|
||||
<table class="classindex">
|
||||
<tr><td rowspan="2" valign="bottom"><a name="letter_a"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  a  </div></td></tr></table>
|
||||
</td><td rowspan="2" valign="bottom"><a name="letter_f"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  f  </div></td></tr></table>
|
||||
</td><td valign="top"><a class="el" href="d7/d0c/struct_input_filter.html">InputFilter</a>   </td><td valign="top"><a class="el" href="d7/d4f/struct_option_group_list.html">OptionGroupList</a>   </td><td valign="top"><a class="el" href="db/d60/struct_stream_map.html">StreamMap</a>   </td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d3/d6e/struct_input_stream.html">InputStream</a>   </td><td valign="top"><a class="el" href="db/db5/struct_option_parse_context.html">OptionParseContext</a>   </td><td valign="top"><a class="el" href="d4/dfd/struct_input_stream_1_1sub2video.html">InputStream::sub2video</a>   </td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d6/d2c/struct_audio_channel_map.html">AudioChannelMap</a>   </td><td valign="top"><a class="el" href="d9/de7/struct_filter_graph.html">FilterGraph</a>   </td><td rowspan="2" valign="bottom"><a name="letter_o"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  o  </div></td></tr></table>
|
||||
</td><td valign="top"><a class="el" href="df/d77/struct_options_context.html">OptionsContext</a>   </td><td></td></tr>
|
||||
<tr><td rowspan="2" valign="bottom"><a name="letter_b"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  b  </div></td></tr></table>
|
||||
</td><td rowspan="2" valign="bottom"><a name="letter_h"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  h  </div></td></tr></table>
|
||||
</td><td valign="top"><a class="el" href="de/df2/struct_output_file.html">OutputFile</a>   </td><td></td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d3/d1d/struct_option.html">Option</a>   </td><td valign="top"><a class="el" href="d0/d0f/struct_output_filter.html">OutputFilter</a>   </td><td></td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d5/d8e/struct_benchmark_time_stamps.html">BenchmarkTimeStamps</a>   </td><td valign="top"><a class="el" href="df/d37/struct_h_w_accel.html">HWAccel</a>   </td><td valign="top"><a class="el" href="dc/d1e/struct_option_def.html">OptionDef</a>   </td><td valign="top"><a class="el" href="db/dde/struct_output_stream.html">OutputStream</a>   </td><td></td></tr>
|
||||
</td><td valign="top"><a class="el" href="d7/d0c/struct_input_filter.html">InputFilter</a>   </td><td valign="top"><a class="el" href="db/dd7/struct_option_group_def.html">OptionGroupDef</a>   </td><td rowspan="2" valign="bottom"><a name="letter_s"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  s  </div></td></tr></table>
|
||||
</td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d3/d6e/struct_input_stream.html">InputStream</a>   </td><td valign="top"><a class="el" href="d7/d4f/struct_option_group_list.html">OptionGroupList</a>   </td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d6/d2c/struct_audio_channel_map.html">AudioChannelMap</a>   </td><td valign="top"><a class="el" href="df/d37/struct_h_w_accel.html">HWAccel</a>   </td><td rowspan="2" valign="bottom"><a name="letter_o"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  o  </div></td></tr></table>
|
||||
</td><td valign="top"><a class="el" href="db/db5/struct_option_parse_context.html">OptionParseContext</a>   </td><td valign="top"><a class="el" href="dd/da5/struct_specifier_opt.html">SpecifierOpt</a>   </td></tr>
|
||||
<tr><td rowspan="2" valign="bottom"><a name="letter_c"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  c  </div></td></tr></table>
|
||||
</td><td valign="top"><a class="el" href="de/dc7/struct_h_w_device.html">HWDevice</a>   </td><td valign="top"><a class="el" href="d6/d69/struct_option_group.html">OptionGroup</a>   </td><td rowspan="2" valign="bottom"><a name="letter_s"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  s  </div></td></tr></table>
|
||||
</td><td></td></tr>
|
||||
</td><td valign="top"><a class="el" href="de/dc7/struct_h_w_device.html">HWDevice</a>   </td><td valign="top"><a class="el" href="df/d77/struct_options_context.html">OptionsContext</a>   </td><td valign="top"><a class="el" href="db/d60/struct_stream_map.html">StreamMap</a>   </td></tr>
|
||||
<tr><td rowspan="2" valign="bottom"><a name="letter_i"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  i  </div></td></tr></table>
|
||||
</td><td valign="top"><a class="el" href="db/dd7/struct_option_group_def.html">OptionGroupDef</a>   </td><td></td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d2/dc3/struct_callback_data.html">CallbackData</a>   </td><td></td><td valign="top"><a class="el" href="dd/da5/struct_specifier_opt.html">SpecifierOpt</a>   </td><td></td></tr>
|
||||
<tr><td></td><td valign="top"><a class="el" href="d8/d99/struct_input_file.html">InputFile</a>   </td><td></td><td></td><td></td></tr>
|
||||
</td><td valign="top"><a class="el" href="d3/d1d/struct_option.html">Option</a>   </td><td valign="top"><a class="el" href="de/df2/struct_output_file.html">OutputFile</a>   </td><td valign="top"><a class="el" href="d4/dfd/struct_input_stream_1_1sub2video.html">InputStream::sub2video</a>   </td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d2/dc3/struct_callback_data.html">CallbackData</a>   </td><td valign="top"><a class="el" href="dc/d1e/struct_option_def.html">OptionDef</a>   </td><td valign="top"><a class="el" href="d0/d0f/struct_output_filter.html">OutputFilter</a>   </td><td></td></tr>
|
||||
<tr><td rowspan="2" valign="bottom"><a name="letter_f"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">  f  </div></td></tr></table>
|
||||
</td><td valign="top"><a class="el" href="d8/d99/struct_input_file.html">InputFile</a>   </td><td valign="top"><a class="el" href="d6/d69/struct_option_group.html">OptionGroup</a>   </td><td valign="top"><a class="el" href="db/dde/struct_output_stream.html">OutputStream</a>   </td><td></td></tr>
|
||||
<tr><td></td><td></td><td></td><td></td></tr>
|
||||
<tr><td valign="top"><a class="el" href="d9/de7/struct_filter_graph.html">FilterGraph</a>   </td><td></td><td></td><td></td><td></td></tr>
|
||||
<tr><td></td><td></td><td></td><td></td><td></td></tr>
|
||||
</table>
|
||||
<div class="qindex"><a class="qindex" href="#letter_a">a</a> | <a class="qindex" href="#letter_b">b</a> | <a class="qindex" href="#letter_c">c</a> | <a class="qindex" href="#letter_f">f</a> | <a class="qindex" href="#letter_h">h</a> | <a class="qindex" href="#letter_i">i</a> | <a class="qindex" href="#letter_o">o</a> | <a class="qindex" href="#letter_s">s</a></div>
|
||||
<div class="qindex"><a class="qindex" href="#letter_a">a</a> | <a class="qindex" href="#letter_c">c</a> | <a class="qindex" href="#letter_f">f</a> | <a class="qindex" href="#letter_h">h</a> | <a class="qindex" href="#letter_i">i</a> | <a class="qindex" href="#letter_o">o</a> | <a class="qindex" href="#letter_s">s</a></div>
|
||||
</div><!-- contents -->
|
||||
<!-- start footer part -->
|
||||
<hr class="footer"/><address class="footer"><small>
|
||||
Generated on Mon Dec 10 2018 00:13:02 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
Generated on Thu Nov 8 2018 23:19:14 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/>
|
||||
</a> 1.8.14
|
||||
</small></address>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<tr style="height: 56px;">
|
||||
<td id="projectalign" style="padding-left: 0.5em;">
|
||||
<div id="projectname">MobileFFmpeg Android API
|
||||
 <span id="projectnumber">3.1</span>
|
||||
 <span id="projectnumber">2.2</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -352,7 +352,7 @@ Data Fields</h2></td></tr>
|
||||
</div><!-- contents -->
|
||||
<!-- start footer part -->
|
||||
<hr class="footer"/><address class="footer"><small>
|
||||
Generated on Mon Dec 10 2018 00:13:02 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
Generated on Thu Nov 8 2018 23:19:14 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="../../doxygen.png" alt="doxygen"/>
|
||||
</a> 1.8.14
|
||||
</small></address>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<tr style="height: 56px;">
|
||||
<td id="projectalign" style="padding-left: 0.5em;">
|
||||
<div id="projectname">MobileFFmpeg Android API
|
||||
 <span id="projectnumber">3.1</span>
|
||||
 <span id="projectnumber">2.2</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -483,7 +483,7 @@ Variables</h2></td></tr>
|
||||
</div><!-- contents -->
|
||||
<!-- start footer part -->
|
||||
<hr class="footer"/><address class="footer"><small>
|
||||
Generated on Mon Dec 10 2018 00:13:02 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
Generated on Thu Nov 8 2018 23:19:14 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="../../doxygen.png" alt="doxygen"/>
|
||||
</a> 1.8.14
|
||||
</small></address>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<tr style="height: 56px;">
|
||||
<td id="projectalign" style="padding-left: 0.5em;">
|
||||
<div id="projectname">MobileFFmpeg Android API
|
||||
 <span id="projectnumber">3.1</span>
|
||||
 <span id="projectnumber">2.2</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -103,7 +103,7 @@ $(function() {
|
||||
</div><!-- fragment --></div><!-- contents -->
|
||||
<!-- start footer part -->
|
||||
<hr class="footer"/><address class="footer"><small>
|
||||
Generated on Mon Dec 10 2018 00:13:01 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
Generated on Thu Nov 8 2018 23:19:14 for MobileFFmpeg Android API by  <a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="../../doxygen.png" alt="doxygen"/>
|
||||
</a> 1.8.14
|
||||
</small></address>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user