Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up VideoView, SurfaceView constructors

Browse Source 
Also cleans up VideoView fields. No functional changes.

Bug: 30600463
Change-Id: I42241e376006c328695d46d63f7fdeda409f1a67
This commit is contained in:
Alan Viverette
2016-08-04 09:54:14 -04:00
parent c9682ab5b5
commit 768ca7d19b
2 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/SurfaceView.java
View File

@@ -193,26 +193,20 @@ public class SurfaceView extends View {
private boolean mGlobalListenersAdded; private boolean mGlobalListenersAdded;
public SurfaceView(Context context) { public SurfaceView(Context context) {
super(context); this(context, null);
init();
} }
public SurfaceView(Context context, AttributeSet attrs) { public SurfaceView(Context context, AttributeSet attrs) {
super(context, attrs); this(context, attrs, 0);
init();
} }
public SurfaceView(Context context, AttributeSet attrs, int defStyleAttr) { public SurfaceView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); this(context, attrs, defStyleAttr, 0);
init();
} }
public SurfaceView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { public SurfaceView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() {
setWillNotDraw(true); setWillNotDraw(true);
} }

44
core/java/android/widget/VideoView.java
View File

@@ -70,10 +70,7 @@ import java.util.Vector;
*/ */
public class VideoView extends SurfaceView public class VideoView extends SurfaceView
implements MediaPlayerControl, SubtitleController.Anchor { implements MediaPlayerControl, SubtitleController.Anchor {
private String TAG = "VideoView"; private static final String TAG = "VideoView";
// settable by the client
private Uri mUri;
private Map<String, String> mHeaders;
// all possible internal states // all possible internal states
private static final int STATE_ERROR = -1; private static final int STATE_ERROR = -1;
@@ -84,6 +81,12 @@ public class VideoView extends SurfaceView
private static final int STATE_PAUSED = 4; private static final int STATE_PAUSED = 4;
private static final int STATE_PLAYBACK_COMPLETED = 5; private static final int STATE_PLAYBACK_COMPLETED = 5;
private final Vector<Pair<InputStream, MediaFormat>> mPendingSubtitleTracks = new Vector<>();
// settable by the client
private Uri mUri;
private Map<String, String> mHeaders;
// mCurrentState is a VideoView object's current state. // mCurrentState is a VideoView object's current state.
// mTargetState is the state that a method caller intends to reach. // mTargetState is the state that a method caller intends to reach.
// For instance, regardless the VideoView object's current state, // For instance, regardless the VideoView object's current state,
@@ -118,13 +121,11 @@ public class VideoView extends SurfaceView
private RenderingWidget.OnChangedListener mSubtitlesChangedListener; private RenderingWidget.OnChangedListener mSubtitlesChangedListener;
public VideoView(Context context) { public VideoView(Context context) {
super(context); this(context, null);
initVideoView();
} }
public VideoView(Context context, AttributeSet attrs) { public VideoView(Context context, AttributeSet attrs) {
this(context, attrs, 0); this(context, attrs, 0);
initVideoView();
} }
public VideoView(Context context, AttributeSet attrs, int defStyleAttr) { public VideoView(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -133,7 +134,19 @@ public class VideoView extends SurfaceView
public VideoView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { public VideoView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
initVideoView();
mVideoWidth = 0;
mVideoHeight = 0;
getHolder().addCallback(mSHCallback);
getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
setFocusable(true);
setFocusableInTouchMode(true);
requestFocus();
mCurrentState = STATE_IDLE;
mTargetState = STATE_IDLE;
} }
@Override @Override
@@ -209,19 +222,6 @@ public class VideoView extends SurfaceView
return getDefaultSize(desiredSize, measureSpec); return getDefaultSize(desiredSize, measureSpec);
} }
private void initVideoView() {
mVideoWidth = 0;
mVideoHeight = 0;
getHolder().addCallback(mSHCallback);
getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
setFocusable(true);
setFocusableInTouchMode(true);
requestFocus();
mPendingSubtitleTracks = new Vector<Pair<InputStream, MediaFormat>>();
mCurrentState = STATE_IDLE;
mTargetState = STATE_IDLE;
}
/** /**
* Sets video path. * Sets video path.
* *
@@ -294,8 +294,6 @@ public class VideoView extends SurfaceView
} }
} }
private Vector<Pair<InputStream, MediaFormat>> mPendingSubtitleTracks;
public void stopPlayback() { public void stopPlayback() {
if (mMediaPlayer != null) { if (mMediaPlayer != null) {
mMediaPlayer.stop(); mMediaPlayer.stop();