Merge pull request #2054 from pedroSG94/discard-frames-invalid-ts

Discard frames invalid ts

Author: pedroSG94

encoder/src/main/java/com/pedro/encoder/BaseEncoder.java

@@ -27,7 +27,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
-import com.pedro.common.ExtensionsKt;
 import com.pedro.common.TimeUtils;
 import com.pedro.encoder.audio.G711Codec;
 import com.pedro.encoder.utils.CodecUtil;
@@ -37,7 +36,6 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.PriorityBlockingQueue;
 
 /**
  * Created by pedro on 18/09/19.
@@ -132,12 +130,10 @@ private void initCodec() {
 
   protected abstract void stopImp();
 
-  protected void fixTimeStamp(MediaCodec.BufferInfo info) {
-    if (oldTimeStamp > info.presentationTimeUs) {
-      final long currentTs = TimeUtils.getCurrentTimeMicro() - presentTimeUs;
-      info.presentationTimeUs = Math.max(currentTs, oldTimeStamp + 1);
-    }
+  protected boolean checkValidTimeStamp(MediaCodec.BufferInfo info) {
+    boolean valid = oldTimeStamp <= info.presentationTimeUs;
     oldTimeStamp = info.presentationTimeUs;
+    return valid;
   }
 
   private void reloadCodec(IllegalStateException e) {
@@ -252,16 +248,15 @@ private void processInput(@NonNull ByteBuffer byteBuffer, @NonNull MediaCodec me
     }
   }
 
-  protected abstract void checkBuffer(@NonNull ByteBuffer byteBuffer,
+  protected abstract boolean checkBuffer(@NonNull ByteBuffer byteBuffer,
       @NonNull MediaCodec.BufferInfo bufferInfo);
 
   protected abstract void sendBuffer(@NonNull ByteBuffer byteBuffer,
       @NonNull MediaCodec.BufferInfo bufferInfo);
 
   private void processOutput(@NonNull ByteBuffer byteBuffer, @NonNull MediaCodec mediaCodec,
       int outBufferIndex, @NonNull MediaCodec.BufferInfo bufferInfo) throws IllegalStateException {
-    checkBuffer(byteBuffer, bufferInfo);
-    sendBuffer(byteBuffer, bufferInfo);
+    if (checkBuffer(byteBuffer, bufferInfo)) sendBuffer(byteBuffer, bufferInfo);
     mediaCodec.releaseOutputBuffer(outBufferIndex, false);
   }
 

encoder/src/main/java/com/pedro/encoder/audio/AudioEncoder.java

@@ -158,9 +158,9 @@ protected long calculatePts(Frame frame, long presentTimeUs) {
   }
 
   @Override
-  protected void checkBuffer(@NonNull ByteBuffer byteBuffer,
+  protected boolean checkBuffer(@NonNull ByteBuffer byteBuffer,
       @NonNull MediaCodec.BufferInfo bufferInfo) {
-    fixTimeStamp(bufferInfo);
+    return checkValidTimeStamp(bufferInfo);
   }
 
   @Override

encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java

@@ -30,9 +30,6 @@
 import androidx.annotation.RequiresApi;
 
 import com.pedro.common.TimeUtils;
-import com.pedro.common.av1.Av1Parser;
-import com.pedro.common.av1.Obu;
-import com.pedro.common.av1.ObuType;
 import com.pedro.encoder.BaseEncoder;
 import com.pedro.encoder.Frame;
 import com.pedro.encoder.TimestampMode;
@@ -43,7 +40,6 @@
 import com.pedro.encoder.utils.yuv.YUVUtil;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -440,12 +436,11 @@ public void formatChanged(@NonNull MediaCodec mediaCodec, @NonNull MediaFormat m
   }
 
   @Override
-  protected void checkBuffer(@NonNull ByteBuffer byteBuffer, @NonNull MediaCodec.BufferInfo bufferInfo) {
+  protected boolean checkBuffer(@NonNull ByteBuffer byteBuffer, @NonNull MediaCodec.BufferInfo bufferInfo) {
     if (forceKey && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
       forceKey = false;
       requestKeyframe();
     }
-    fixTimeStamp(bufferInfo);
     if (!spsPpsSetted && type.equals(CodecUtil.H264_MIME)) {
       Log.i(TAG, "formatChanged not called, doing manual sps/pps extraction...");
       Pair<ByteBuffer, ByteBuffer> buffers = VideoEncoderHelper.decodeSpsPpsFromBuffer(byteBuffer.duplicate(), bufferInfo.size);
@@ -498,6 +493,7 @@ protected void checkBuffer(@NonNull ByteBuffer byteBuffer, @NonNull MediaCodec.B
       if (firstTimestamp == 0) firstTimestamp = bufferInfo.presentationTimeUs;
       bufferInfo.presentationTimeUs -= firstTimestamp;
     }
+    return checkValidTimeStamp(bufferInfo);
   }
 
   @Override