Fixed a broken rtsp test case
The original cts test case had an incorrect requirement that onVideoSizeChanged() callback must be received
before streaming or playback can be started. For http live streaming or RTSP streaming, the video size can
only be received sometimes after the video streaming has started. As a result, the failed test case never
triggered the streaming of the rtsp videos.
Change-Id: Icca4dd216b8b99993882a7bf11b80503909f47c3
related-to-bug: 5790219
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java
index 2b65421..369d32c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/PlayVideoActivity.java
@@ -69,8 +69,6 @@
private Handler mHandler = new Handler();
private int mVideoWidth;
private int mVideoHeight;
- private boolean mIsVideoSizeKnown = false;
- private boolean mIsVideoReadyToBePlayed = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -170,17 +168,14 @@
@Override
public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
- mVideoWidth = width;
- mVideoHeight = height;
- mIsVideoSizeKnown = true;
- if (mIsVideoReadyToBePlayed && mIsVideoSizeKnown) {
- startVideoPlayback();
+ if (width != 0 && height != 0) {
+ mVideoWidth = width;
+ mVideoHeight = height;
+ fillScreen();
}
}
private void startVideoPlayback() {
- mHolder.setFixedSize(mVideoWidth, mVideoHeight);
- fillScreen();
mPlayer.start();
// Enable Pass button after 60 seconds
@@ -189,13 +184,11 @@
@Override
public void onPrepared(MediaPlayer mp) {
- mIsVideoReadyToBePlayed = true;
- if (mIsVideoReadyToBePlayed && mIsVideoSizeKnown) {
- startVideoPlayback();
- }
+ startVideoPlayback();
}
private void fillScreen() {
+ mHolder.setFixedSize(mVideoWidth, mVideoHeight);
Rect rect = new Rect();
mVideoFrame.getDrawingRect(rect);
LayoutParams lp = mSurfaceView.getLayoutParams();