Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
am: 4710431
* commit '4710431dc4751e9674b9e2e620f425603cf24643':
clarify MediaCodec.setVideoScalingMode behavior
Change-Id: Ia32689d261315c1030ab66bb0870768aae2835cd
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index c73cad4..5b0845c 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -1290,10 +1290,10 @@
</tr>
<tr>
<td>-</td>
+ <td>(16+)</td>
+ <td>(16+)</td>
<td>16+</td>
- <td>16+</td>
- <td>16+</td>
- <td>16+</td>
+ <td>(16+)</td>
<td>(16+)</td>
<td>-</td>
<td class=fn>{@link #setVideoScalingMode setVideoScalingMode}</td>
@@ -2429,6 +2429,9 @@
* set of output buffers returned by {@link #getOutputBuffers} from
* this point on.
*
+ * <p>Additionally, this event signals that the video scaling mode
+ * may have been reset to the default.</p>
+ *
* @deprecated This return value can be ignored as {@link
* #getOutputBuffers} has been deprecated. Client should
* request a current buffer using on of the get-buffer or
@@ -2996,6 +2999,10 @@
/**
* If a surface has been specified in a previous call to {@link #configure}
* specifies the scaling mode to use. The default is "scale to fit".
+ * <p class=note>The scaling mode may be reset to the <strong>default</strong> each time an
+ * {@link #INFO_OUTPUT_BUFFERS_CHANGED} event is received from the codec; therefore, the client
+ * must call this method after every buffer change event (and before the first output buffer is
+ * released for rendering) to ensure consistent scaling mode.</p>
* @throws IllegalArgumentException if mode is not recognized.
* @throws IllegalStateException if in the Released state.
*/