fix bug on Android R

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
@@ -20,7 +20,7 @@ allprojects {
 }
 
 ext {
-    compileSdkVersion = 28
+    compileSdkVersion = 30
     minSdkVersion = 18
     targetSdkVersion = 28
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

lib/src/main/java/com/otaliastudios/transcoder/engine/Engine.java

@@ -143,6 +143,13 @@ private boolean isCompleted(@NonNull TrackType type) {
                 && mTranscoders.require(type).get(current).isFinished();
     }
 
+    private boolean isLastPart(@NonNull TrackType type) {
+        if (mDataSources.require(type).isEmpty()) return true;
+        int current = mCurrentStep.require(type);
+        return current == mDataSources.require(type).size() - 1
+                && current == mTranscoders.require(type).size() - 1;
+    }
+
     private void openCurrentStep(@NonNull TrackType type, @NonNull TranscoderOptions options) {
         int current = mCurrentStep.require(type);
         TrackStatus status = mStatuses.require(type);
@@ -369,6 +376,12 @@ public void transcode(@NonNull TranscoderOptions options) throws InterruptedExce
                 videoCompleted = isCompleted(TrackType.VIDEO);
                 audioTranscoder = audioCompleted ? null : getCurrentTrackTranscoder(TrackType.AUDIO, options);
                 videoTranscoder = videoCompleted ? null : getCurrentTrackTranscoder(TrackType.VIDEO, options);
+                if (audioTranscoder != null) {
+                    audioTranscoder.setIsLastPart(isLastPart(TrackType.AUDIO));
+                }
+                if (videoTranscoder != null) {
+                    videoTranscoder.setIsLastPart(isLastPart(TrackType.VIDEO));
+                }
                 if (!audioCompleted) {
                     stepped |= audioTranscoder.transcode(forceAudioEos);
                 }

lib/src/main/java/com/otaliastudios/transcoder/transcode/BaseTrackTranscoder.java

@@ -3,6 +3,7 @@
 import android.media.MediaCodec;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
+import android.os.Build;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
@@ -42,6 +43,7 @@ public abstract class BaseTrackTranscoder implements TrackTranscoder {
     private boolean mIsDecoderEOS;
     private boolean mIsEncoderEOS;
     private boolean mIsExtractorEOS;
+    protected boolean isLastPart;
 
     @SuppressWarnings("WeakerAccess")
     protected BaseTrackTranscoder(@NonNull DataSource dataSource,
@@ -136,6 +138,11 @@ public final boolean isFinished() {
         return mIsEncoderEOS;
     }
 
+    @Override
+    public void setIsLastPart(boolean isLastPart) {
+        this.isLastPart = isLastPart;
+    }
+
     @Override
     public void release() {
         if (mDecoder != null) {
@@ -278,7 +285,12 @@ private int drainEncoder(long timeoutUs) {
 
         if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
             mIsEncoderEOS = true;
-            mBufferInfo.set(0, 0, 0, mBufferInfo.flags);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                mEncoder.releaseOutputBuffer(result, false);
+                return DRAIN_STATE_NONE;
+            } else {
+                mBufferInfo.set(0, 0, 0, mBufferInfo.flags);
+            }
         }
         if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
             // SPS or PPS, which should be passed by MediaFormat.

lib/src/main/java/com/otaliastudios/transcoder/transcode/NoOpTrackTranscoder.java

@@ -41,4 +41,9 @@ public boolean isFinished() {
     @Override
     public void release() {
     }
+
+    @Override
+    public void setIsLastPart(boolean isLastPart) {
+
+    }
 }

lib/src/main/java/com/otaliastudios/transcoder/transcode/PassThroughTrackTranscoder.java

@@ -39,6 +39,7 @@ public class PassThroughTrackTranscoder implements TrackTranscoder {
     private final MediaFormat mOutputFormat;
     private boolean mOutputFormatSet = false;
     private TimeInterpolator mTimeInterpolator;
+    protected boolean isLastPart;
 
     public PassThroughTrackTranscoder(@NonNull DataSource dataSource,
                                       @NonNull DataSink dataSink,
@@ -69,8 +70,10 @@ public boolean transcode(boolean forceInputEos) {
         }
         if (mDataSource.isDrained() || forceInputEos) {
             mDataChunk.buffer.clear();
-            mBufferInfo.set(0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
-            mDataSink.writeTrack(mTrackType, mDataChunk.buffer, mBufferInfo);
+            if (isLastPart) {
+                mBufferInfo.set(0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+                mDataSink.writeTrack(mTrackType, mDataChunk.buffer, mBufferInfo);
+            }
             mIsEOS = true;
             return true;
         }
@@ -95,4 +98,9 @@ public boolean isFinished() {
     @Override
     public void release() {
     }
+
+    @Override
+    public void setIsLastPart(boolean isLastPart) {
+        this.isLastPart = isLastPart;
+    }
 }

lib/src/main/java/com/otaliastudios/transcoder/transcode/TrackTranscoder.java

@@ -37,4 +37,6 @@ public interface TrackTranscoder {
     boolean isFinished();
 
     void release();
+
+    void setIsLastPart(boolean isLastPart);
 }