am 38e5d591: Merge "Add InfoListener to Widevine Test Application" into jb-mr1-dev

* commit '38e5d5912cb4b654577f63970b9bfbd49f22e83e':
  Add InfoListener to Widevine Test Application
This commit is contained in:
Fred Gylys-Colwell
2012-09-17 11:09:58 -07:00
committed by Android Git Automerger

View File

@@ -28,6 +28,7 @@ import android.media.MediaExtractor;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.MediaPlayer.OnErrorListener; import android.media.MediaPlayer.OnErrorListener;
import android.media.MediaPlayer.OnCompletionListener; import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnInfoListener;
import android.util.Log; import android.util.Log;
import java.io.IOException; import java.io.IOException;
@@ -160,6 +161,8 @@ public class VideoPlayerView extends Activity {
view = videoView; view = videoView;
} }
playerFrame.addView(view, new FrameLayout.LayoutParams( playerFrame.addView(view, new FrameLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT,
FrameLayout.LayoutParams.MATCH_PARENT)); FrameLayout.LayoutParams.MATCH_PARENT));
@@ -252,16 +255,62 @@ public class VideoPlayerView extends Activity {
break; break;
} }
drm.logBuffer.append(message + "\n"); drm.logBuffer.append(message + "\n");
updateLogs(); updateLogs();
bgImage.setVisibility(View.VISIBLE); bgImage.setVisibility(View.VISIBLE);
return false; return false;
} }
}); });
videoView.setOnCompletionListener(new OnCompletionListener() { videoView.setOnCompletionListener(new OnCompletionListener() {
public void onCompletion(MediaPlayer mp) { public void onCompletion(MediaPlayer mp) {
stopPlayback(); stopPlayback();
} }
}); });
videoView.setOnInfoListener(new OnInfoListener() {
public boolean onInfo(MediaPlayer mp, int what, int extra) {
String message = "Unknown info message";
switch (what) {
case MediaPlayer.MEDIA_INFO_UNKNOWN:
message = "Unknown info message 2";
break;
case MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START:
message = "Video rendering start";
break;
case MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING:
message = "Video track lagging";
break;
case MediaPlayer.MEDIA_INFO_BUFFERING_START:
message = "Buffering start";
break;
case MediaPlayer.MEDIA_INFO_BUFFERING_END:
message = "Buffering end";
break;
/*** TODO: Below needs to be added to MediaPlayer.java. Hard coded for now --Zan
case MediaPlayer.MEDIA_INFO_NETWORK_BANDWIDTH: ***/
case 703:
message = "Network bandwidth";
break;
case MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING:
message = "Bad interleaving";
break;
case MediaPlayer.MEDIA_INFO_NOT_SEEKABLE:
message = "Not seekable";
break;
case MediaPlayer.MEDIA_INFO_METADATA_UPDATE:
message = "Metadata update";
break;
}
drm.logBuffer.append(message + "\n");
updateLogs();
return true;
}
});
videoView.requestFocus(); videoView.requestFocus();
videoView.start(); videoView.start();