Make sure we report video size after Surface is set

Issue: #2077

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=139451511

extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java

@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.drm.DrmSession;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.ExoMediaCrypto;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
@@ -85,8 +86,8 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
 
   private boolean inputStreamEnded;
   private boolean outputStreamEnded;
-  private int previousWidth;
+  private int lastReportedWidth;
-  private int previousHeight;
+  private int lastReportedHeight;
 
   private long droppedFrameAccumulationStartTimeMs;
   private int droppedFrames;
@@ -146,8 +147,7 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
     this.drmSessionManager = drmSessionManager;
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
     joiningDeadlineMs = -1;
-    previousWidth = -1;
+    clearLastReportedVideoSize();
-    previousHeight = -1;
     formatHolder = new FormatHolder();
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
     outputMode = VpxDecoder.OUTPUT_MODE_NONE;
@@ -446,6 +446,7 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
     outputBuffer = null;
     format = null;
     waitingForKeys = false;
+    clearLastReportedVideoSize();
     try {
       releaseDecoder();
     } finally {
@@ -520,36 +521,30 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
   @Override
   public void handleMessage(int messageType, Object message) throws ExoPlaybackException {
     if (messageType == C.MSG_SET_SURFACE) {
-      setSurface((Surface) message);
+      setOutput((Surface) message, null);
     } else if (messageType == MSG_SET_OUTPUT_BUFFER_RENDERER) {
-      setOutputBufferRenderer((VpxOutputBufferRenderer) message);
+      setOutput(null, (VpxOutputBufferRenderer) message);
     } else {
       super.handleMessage(messageType, message);
     }
   }
 
-  private void setSurface(Surface surface) {
+  private void setOutput(Surface surface, VpxOutputBufferRenderer outputBufferRenderer) {
-    if (this.surface == surface) {
+    // At most one output may be non-null. Both may be null if the output is being cleared.
-      return;
+    Assertions.checkState(surface == null || outputBufferRenderer == null);
-    }
+    // Clear state so that we always call the event listener with the video size and when a frame
+    // is rendered, even if the output hasn't changed.
     renderedFirstFrame = false;
+    clearLastReportedVideoSize();
+    // We only need to update the decoder if the output has changed.
+    if (this.surface != surface || this.outputBufferRenderer != outputBufferRenderer) {
       this.surface = surface;
-    outputBufferRenderer = null;
-    outputMode = (surface != null) ? VpxDecoder.OUTPUT_MODE_RGB : VpxDecoder.OUTPUT_MODE_NONE;
-    updateDecoder();
-  }
-
-  private void setOutputBufferRenderer(VpxOutputBufferRenderer outputBufferRenderer) {
-    if (this.outputBufferRenderer == outputBufferRenderer) {
-      return;
-    }
-    renderedFirstFrame = false;
       this.outputBufferRenderer = outputBufferRenderer;
-    surface = null;
+      outputMode = outputBufferRenderer != null ? VpxDecoder.OUTPUT_MODE_YUV
-    outputMode = (outputBufferRenderer != null) ? VpxDecoder.OUTPUT_MODE_YUV
+          : surface != null ? VpxDecoder.OUTPUT_MODE_RGB : VpxDecoder.OUTPUT_MODE_NONE;
-        : VpxDecoder.OUTPUT_MODE_NONE;
       updateDecoder();
     }
+  }
 
   private void updateDecoder() {
     if (decoder != null) {
@@ -565,10 +560,15 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
     return surface != null || outputBufferRenderer != null;
   }
 
-  private void maybeNotifyVideoSizeChanged(final int width, final int height) {
+  private void clearLastReportedVideoSize() {
-    if (previousWidth != width || previousHeight != height) {
+    lastReportedWidth = Format.NO_VALUE;
-      previousWidth = width;
+    lastReportedHeight = Format.NO_VALUE;
-      previousHeight = height;
+  }
+
+  private void maybeNotifyVideoSizeChanged(int width, int height) {
+    if (lastReportedWidth != width || lastReportedHeight != height) {
+      lastReportedWidth = width;
+      lastReportedHeight = height;
       eventDispatcher.videoSizeChanged(width, height, 0, 1);
     }
   }

library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java

@@ -163,9 +163,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     currentHeight = Format.NO_VALUE;
     currentPixelWidthHeightRatio = Format.NO_VALUE;
     pendingPixelWidthHeightRatio = Format.NO_VALUE;
-    lastReportedWidth = Format.NO_VALUE;
+    clearLastReportedVideoSize();
-    lastReportedHeight = Format.NO_VALUE;
-    lastReportedPixelWidthHeightRatio = Format.NO_VALUE;
   }
 
   @Override
@@ -272,9 +270,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     currentHeight = Format.NO_VALUE;
     currentPixelWidthHeightRatio = Format.NO_VALUE;
     pendingPixelWidthHeightRatio = Format.NO_VALUE;
-    lastReportedWidth = Format.NO_VALUE;
+    clearLastReportedVideoSize();
-    lastReportedHeight = Format.NO_VALUE;
-    lastReportedPixelWidthHeightRatio = Format.NO_VALUE;
     frameReleaseTimeHelper.disable();
     try {
       super.onDisabled();
@@ -294,10 +290,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   }
 
   private void setSurface(Surface surface) throws ExoPlaybackException {
-    if (this.surface == surface) {
+    // Clear state so that we always call the event listener with the video size and when a frame
-      return;
+    // is rendered, even if the surface hasn't changed.
-    }
     renderedFirstFrame = false;
+    clearLastReportedVideoSize();
+    // We only need to actually release and reinitialize the codec if the surface has changed.
+    if (this.surface != surface) {
       this.surface = surface;
       int state = getState();
       if (state == STATE_ENABLED || state == STATE_STARTED) {
@@ -305,6 +303,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
         maybeInitCodec();
       }
     }
+  }
 
   @Override
   protected boolean shouldInitCodec() {
@@ -584,6 +583,13 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
     return (maxPixels * 3) / (2 * minCompressionRatio);
   }
 
+  private void clearLastReportedVideoSize() {
+    lastReportedWidth = Format.NO_VALUE;
+    lastReportedHeight = Format.NO_VALUE;
+    lastReportedPixelWidthHeightRatio = Format.NO_VALUE;
+    lastReportedUnappliedRotationDegrees = Format.NO_VALUE;
+  }
+
   private void maybeNotifyVideoSizeChanged() {
     if (lastReportedWidth != currentWidth || lastReportedHeight != currentHeight
         || lastReportedUnappliedRotationDegrees != currentUnappliedRotationDegrees

library/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java

@@ -69,7 +69,8 @@ public interface VideoRendererEventListener {
   void onDroppedFrames(int count, long elapsedMs);
 
   /**
-   * Called each time there's a change in the size of the video being rendered.
+   * Called before a frame is rendered for the first time since setting the surface, and each time
+   * there's a change in the size, rotation or pixel aspect ratio of the video being rendered.
    *
    * @param width The video width in pixels.
    * @param height The video height in pixels.