Merge pull request #1 from AlexTrotsenko/2020_04_noaudiostreamfix

Merge with latest master (as of 07.04.2020)

Author: coryjthompson

CHANGELOG.md

@@ -0,0 +1,17 @@
+## 0.3.0
+- Fix cancel() sometimes not working. (Thanks @strayerM and @PinkFloyded)
+- Geolocation support on API>=19. (Thanks @hkurokawa)
+
+## 0.2.0
+- Experimental audio transcoding support. (Thanks @aaron112)
+- Fix transcode does not run on Huawei Ascend P7. (Thanks @spiritedRunning)
+- Fix race condition caused by not closing output before callback. (Thanks @ryanwilliams83)
+
+## 0.1.10
+- `Future` support. (Thanks @MaiKambayashi)
+
+## 0.1.X
+- Stability updates. (Thanks @ozyozyo)
+
+## 0.1.0
+- First release.

README.md

@@ -67,7 +67,7 @@ repositories {
 ```
 
 ```groovy
-compile 'net.ypresto.androidtranscoder:android-transcoder:0.1.10'
+compile 'net.ypresto.androidtranscoder:android-transcoder:0.2.0'
 ```
 
 ## Note (PLEASE READ FIRST)
@@ -78,6 +78,20 @@ Use [qtfaststart-java](https://github.com/ypresto/qtfaststart-java) to place moo
 - Android does not gurantees that all devices have bug-free codecs/accelerators for your codec parameters (especially, resolution). Refer [supported media formats](http://developer.android.com/guide/appendix/media-formats.html) for parameters guaranteed by [CTS](https://source.android.com/compatibility/cts-intro.html).
 - This library does not support video files recorded by other device like digital cameras, iOS (mov files, including non-baseline profile h.264), etc.
 
+
+## More information about internals
+
+There is a blog post about this library written in Japanese.
+http://qiita.com/yuya_presto/items/d48e29c89109b746d000
+
+While it is Japanese, diagrams would be useful for understanding internals of this library.
+
+## References for Android Low-Level Media APIs
+
+- http://bigflake.com/mediacodec/
+- https://github.com/google/grafika
+- https://android.googlesource.com/platform/frameworks/av/+/lollipop-release/media/libstagefright
+
 ## License
 
 ```
@@ -95,9 +109,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ```
-
-## References for Android Low-Level Media APIs
-
-- http://bigflake.com/mediacodec/
-- https://github.com/google/grafika
-- https://android.googlesource.com/platform/frameworks/av/+/lollipop-release/media/libstagefright

build.gradle

@@ -3,9 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,5 +19,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }

example/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "net.ypresto.androidtranscoder.example"
@@ -21,4 +21,5 @@ android {
 
 dependencies {
     compile project(':lib')
+    compile 'com.android.support:support-core-utils:24.2.0'
 }

example/src/main/AndroidManifest.xml

@@ -1,21 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.ypresto.androidtranscoder.example" >
+    package="net.ypresto.androidtranscoder.example">
+
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="18" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".TranscoderActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="net.ypresto.androidtranscoder.example.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>

example/src/main/java/net/ypresto/androidtranscoder/example/TranscoderActivity.java

@@ -7,6 +7,7 @@
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.os.SystemClock;
+import android.support.v4.content.FileProvider;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -26,6 +27,7 @@
 
 public class TranscoderActivity extends Activity {
     private static final String TAG = "TranscoderActivity";
+    private static final String FILE_PROVIDER_AUTHORITY = "net.ypresto.androidtranscoder.example.fileprovider";
     private static final int REQUEST_CODE_PICK = 1;
     private static final int PROGRESS_BAR_MAX = 1000;
     private Future<Void> mFuture;
@@ -55,7 +57,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 final File file;
                 if (resultCode == RESULT_OK) {
                     try {
-                        file = File.createTempFile("transcode_test", ".mp4", getExternalFilesDir(null));
+                        File outputDir = new File(getExternalFilesDir(null), "outputs");
+                        //noinspection ResultOfMethodCallIgnored
+                        outputDir.mkdir();
+                        file = File.createTempFile("transcode_test", ".mp4", outputDir);
                     } catch (IOException e) {
                         Log.e(TAG, "Failed to create temporary file.", e);
                         Toast.makeText(this, "Failed to create temporary file.", Toast.LENGTH_LONG).show();
@@ -89,7 +94,10 @@ public void onTranscodeProgress(double progress) {
                         public void onTranscodeCompleted() {
                             Log.d(TAG, "transcoding took " + (SystemClock.uptimeMillis() - startTime) + "ms");
                             onTranscodeFinished(true, "transcoded file placed on " + file, parcelFileDescriptor);
-                            startActivity(new Intent(Intent.ACTION_VIEW).setDataAndType(Uri.fromFile(file), "video/mp4"));
+                            Uri uri = FileProvider.getUriForFile(TranscoderActivity.this, FILE_PROVIDER_AUTHORITY, file);
+                            startActivity(new Intent(Intent.ACTION_VIEW)
+                                    .setDataAndType(uri, "video/mp4")
+                                    .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION));
                         }
 
                         @Override

example/src/main/res/xml/file_paths.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path
+        name="output_videos"
+        path="Android/data/net.ypresto.androidtranscoder.example/files/outputs" />
+</paths>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Mar 09 14:43:12 JST 2015
+#Thu Jun 08 12:40:11 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

lib/build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'bintray-release'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         minSdkVersion 18
@@ -32,7 +32,7 @@ android {
 publish {
     groupId = 'net.ypresto.androidtranscoder'
     artifactId = 'android-transcoder'
-    version = '0.1.10-SNAPSHOT'
+    version = '0.3.0'
     licences = ['Apache-2.0']
     website = 'https://github.com/ypresto/android-transcoder'
     autoPublish = false

lib/src/androidTest/java/net/ypresto/androidtranscoder/utils/ISO6709LocationParserTest.java

@@ -0,0 +1,35 @@
+package net.ypresto.androidtranscoder.utils;
+
+import junit.framework.TestCase;
+
+public class ISO6709LocationParserTest extends TestCase {
+    public void testParse() {
+        ISO6709LocationParser parser = new ISO6709LocationParser();
+        assertEquals(new float[]{35.658632f, 139.745411f}, parser.parse("+35.658632+139.745411/"));
+        assertEquals(new float[]{40.75f, -074.00f}, parser.parse("+40.75-074.00/"));
+        // with Altitude
+        assertEquals(new float[]{-90f, +0f}, parser.parse("-90+000+2800/"));
+        assertEquals(new float[]{27.5916f, 086.5640f}, parser.parse("+27.5916+086.5640+8850/"));
+        // ranged data
+        assertEquals(new float[]{35.331f, 134.224f}, parser.parse("+35.331+134.224/+35.336+134.228/"));
+        assertEquals(new float[]{35.331f, 134.224f}, parser.parse("+35.331+134.224/+35.336+134.228/+35.333+134.229/+35.333+134.227/"));
+    }
+
+    public void testParseFailure() {
+        ISO6709LocationParser parser = new ISO6709LocationParser();
+        assertNull(parser.parse(null));
+        assertNull(parser.parse(""));
+        assertNull(parser.parse("35 deg 65' 86.32\" N, 139 deg 74' 54.11\" E"));
+        assertNull(parser.parse("+35.658632"));
+        assertNull(parser.parse("+35.658632-"));
+        assertNull(parser.parse("40.75-074.00"));
+        assertNull(parser.parse("+40.75-074.00.00"));
+    }
+
+    private static void assertEquals(float[] expected, float[] actual) {
+        assertEquals(expected.length, actual.length);
+        for (int i = 0; i < expected.length; i++) {
+            assertTrue(Float.compare(expected[i], actual[i]) == 0);
+        }
+    }
+}

lib/src/main/java/net/ypresto/androidtranscoder/MediaTranscoder.java

@@ -123,20 +123,20 @@ public void onTranscodeProgress(double progress) {
 
             @Override
             public void onTranscodeCompleted() {
-                listener.onTranscodeCompleted();
                 closeStream();
+                listener.onTranscodeCompleted();
             }
 
             @Override
             public void onTranscodeCanceled() {
-                listener.onTranscodeCanceled();
                 closeStream();
+                listener.onTranscodeCanceled();
             }
 
             @Override
             public void onTranscodeFailed(Exception exception) {
-                listener.onTranscodeFailed(exception);
                 closeStream();
+                listener.onTranscodeFailed(exception);
             }
 
             private void closeStream() {

lib/src/main/java/net/ypresto/androidtranscoder/engine/AudioTrackTranscoder.java

@@ -79,7 +79,7 @@ public void setup() {
 
     @Override
     public MediaFormat getDeterminedFormat() {
-        return mInputFormat;
+        return mActualOutputFormat;
     }
 
     @Override

lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaFormatValidator.java

@@ -18,14 +18,8 @@
 import android.media.MediaFormat;
 
 import net.ypresto.androidtranscoder.format.MediaFormatExtraConstants;
-import net.ypresto.androidtranscoder.utils.AvcCsdUtils;
-import net.ypresto.androidtranscoder.utils.AvcSpsUtils;
-
-import java.nio.ByteBuffer;
 
 class MediaFormatValidator {
-    // Refer: http://en.wikipedia.org/wiki/H.264/MPEG-4_AVC#Profiles
-    private static final byte PROFILE_IDC_BASELINE = 66;
 
     public static void validateVideoOutputFormat(MediaFormat format) {
         String mime = format.getString(MediaFormat.KEY_MIME);
@@ -34,11 +28,6 @@ public static void validateVideoOutputFormat(MediaFormat format) {
         if (!MediaFormatExtraConstants.MIMETYPE_VIDEO_AVC.equals(mime)) {
             throw new InvalidOutputFormatException("Video codecs other than AVC is not supported, actual mime type: " + mime);
         }
-        ByteBuffer spsBuffer = AvcCsdUtils.getSpsBuffer(format);
-        byte profileIdc = AvcSpsUtils.getProfileIdc(spsBuffer);
-        if (profileIdc != PROFILE_IDC_BASELINE) {
-            throw new InvalidOutputFormatException("Non-baseline AVC video profile is not supported by Android OS, actual profile_idc: " + profileIdc);
-        }
     }
 
     public static void validateAudioOutputFormat(MediaFormat format) {

lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaTranscoderEngine.java

@@ -19,9 +19,12 @@
 import android.media.MediaFormat;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaMuxer;
+import android.os.Build;
 import android.util.Log;
 
+import net.ypresto.androidtranscoder.BuildConfig;
 import net.ypresto.androidtranscoder.format.MediaFormatStrategy;
+import net.ypresto.androidtranscoder.utils.ISO6709LocationParser;
 import net.ypresto.androidtranscoder.utils.MediaExtractorUtils;
 
 import java.io.FileDescriptor;
@@ -137,9 +140,17 @@ private void setupMetadata() throws IOException {
             // skip
         }
 
-        // TODO: parse ISO 6709
-        // String locationString = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_LOCATION);
-        // mMuxer.setLocation(Integer.getInteger(rotationString, 0));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            String locationString = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_LOCATION);
+            if (locationString != null) {
+                float[] location = new ISO6709LocationParser().parse(locationString);
+                if (location != null) {
+                    mMuxer.setLocation(location[0], location[1]);
+                } else {
+                    Log.d(TAG, "Failed to parse the location metadata: " + locationString);
+                }
+            }
+        }
 
         try {
             mDurationUs = Long.parseLong(mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)) * 1000;
@@ -189,7 +200,7 @@ public void onDetermineOutputFormat() {
         mAudioTrackTranscoder.setup();
     }
 
-    private void runPipelines() {
+    private void runPipelines() throws InterruptedException {
         long loopCount = 0;
         if (mDurationUs <= 0) {
             double progress = PROGRESS_UNKNOWN;
@@ -208,11 +219,7 @@ private void runPipelines() {
                 if (mProgressCallback != null) mProgressCallback.onProgress(progress);
             }
             if (!stepped) {
-                try {
-                    Thread.sleep(SLEEP_TO_WAIT_TRACK_TRANSCODERS);
-                } catch (InterruptedException e) {
-                    // nothing to do
-                }
+                Thread.sleep(SLEEP_TO_WAIT_TRACK_TRANSCODERS);
             }
         }
     }

lib/src/main/java/net/ypresto/androidtranscoder/format/MediaFormatStrategyPresets.java

@@ -16,6 +16,9 @@
 package net.ypresto.androidtranscoder.format;
 
 public class MediaFormatStrategyPresets {
+    public static final int AUDIO_BITRATE_AS_IS = -1;
+    public static final int AUDIO_CHANNELS_AS_IS = -1;
+
     /**
      * @deprecated Use {@link #createExportPreset960x540Strategy()}.
      */
@@ -45,7 +48,7 @@ public static MediaFormatStrategy createAndroid720pStrategy(int bitrate) {
     /**
      * Preset based on Nexus 4 camera recording with 720p quality.
      * This preset is ensured to work on any Android >=4.3 devices by Android CTS (if codec is available).
-     * <p/>
+     * <br>
      * Note: audio transcoding is experimental feature.
      *
      * @param bitrate       Preferred bitrate for video encoding.