diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
index 9482014983..da53c2ba19 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
@@ -209,7 +209,13 @@ public final class DefaultCodec implements Codec {
   public void releaseOutputBuffer(boolean render) throws TransformationException {
     outputBuffer = null;
     try {
-      mediaCodec.releaseOutputBuffer(outputBufferIndex, render);
+      if (render) {
+        mediaCodec.releaseOutputBuffer(
+            outputBufferIndex,
+            /* renderTimestampNs= */ checkStateNotNull(outputBufferInfo).presentationTimeUs * 1000);
+      } else {
+        mediaCodec.releaseOutputBuffer(outputBufferIndex, /* render= */ false);
+      }
     } catch (RuntimeException e) {
       throw createTransformationException(e);
     }
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
index 1a6f7c619b..40e63b320d 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
@@ -325,8 +325,8 @@ import java.util.concurrent.atomic.AtomicInteger;
       glProgram.bindAttributesAndUniforms();
 
       focusAndDrawQuad(eglSurface, outputWidth, outputHeight);
-      long surfaceTextureTimestampNs = inputSurfaceTexture.getTimestamp();
-      EGLExt.eglPresentationTimeANDROID(eglDisplay, eglSurface, surfaceTextureTimestampNs);
+      long presentationTimeNs = inputSurfaceTexture.getTimestamp();
+      EGLExt.eglPresentationTimeANDROID(eglDisplay, eglSurface, presentationTimeNs);
       EGL14.eglSwapBuffers(eglDisplay, eglSurface);
 
       if (debugPreviewEglSurface != null) {