Merge pull request ypresto#7 from ypresto/update_gradle

Update gradle and build tools

Author: ypresto

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.1'
+        classpath 'com.android.tools.build:gradle:1.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Nov 07 16:11:43 JST 2014
+#Mon Mar 09 14:43:12 JST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

lib/build.gradle

@@ -11,16 +11,19 @@ apply plugin: 'com.android.library'
 apply plugin: 'bintray-release'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
+
     buildTypes {
         release {
-            runProguard false
+            zipAlignEnabled true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

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

@@ -15,6 +15,7 @@
  */
 package net.ypresto.androidtranscoder.engine;
 
+import android.annotation.SuppressLint;
 import android.media.MediaCodec;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
@@ -63,6 +64,7 @@ public void determineFormat() {
         mActualOutputFormat = mExtractor.getTrackFormat(mTrackIndex);
     }
 
+    @SuppressLint("Assert")
     @Override
     public boolean stepPipeline() {
         if (mIsEOS) return false;

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

@@ -21,6 +21,7 @@
 import android.media.MediaMuxer;
 import android.util.Log;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 
 // Refer: https://android.googlesource.com/platform/cts/+/lollipop-release/tests/tests/media/src/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
@@ -35,7 +36,6 @@ public class VideoTrackTranscoder implements TrackTranscoder {
     private final MediaFormat mOutputFormat;
     private final MediaMuxer mMuxer;
     private final MediaCodec.BufferInfo mBufferInfo = new MediaCodec.BufferInfo();
-    private boolean mWritingToMuxerStarted;
     private MediaCodec mDecoder;
     private MediaCodec mEncoder;
     private ByteBuffer[] mDecoderInputBuffers;
@@ -64,7 +64,11 @@ public VideoTrackTranscoder(MediaExtractor extractor,
     @Override
     public void setup() {
         mExtractor.selectTrack(mTrackIndex);
-        mEncoder = MediaCodec.createEncoderByType(mOutputFormat.getString(MediaFormat.KEY_MIME));
+        try {
+            mEncoder = MediaCodec.createEncoderByType(mOutputFormat.getString(MediaFormat.KEY_MIME));
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
         mEncoder.configure(mOutputFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
         mEncoderInputSurfaceWrapper = new InputSurface(mEncoder.createInputSurface());
         mEncoderInputSurfaceWrapper.makeCurrent();
@@ -80,7 +84,11 @@ public void setup() {
             inputFormat.setInteger("rotation-degrees", 0);
         }
         mDecoderOutputSurfaceWrapper = new OutputSurface();
-        mDecoder = MediaCodec.createDecoderByType(inputFormat.getString(MediaFormat.KEY_MIME));
+        try {
+            mDecoder = MediaCodec.createDecoderByType(inputFormat.getString(MediaFormat.KEY_MIME));
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
         mDecoder.configure(inputFormat, mDecoderOutputSurfaceWrapper.getSurface(), null, 0);
         mDecoder.start();
         mDecoderStarted = true;