Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0a36111 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "VideoView2: switch to using getVideoSize"

parents 71fb1a8c 7d14cc7a

packages/MediaComponents/src/com/android/widget/VideoSurfaceView.java

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.widget.VideoView2.VIEW_TYPE_SURFACEVIEW; 
import android.content.Context;

import android.graphics.Rect;

import android.media.MediaPlayer2;

import android.media.VideoSize;

import android.util.AttributeSet;

import android.util.Log;

import android.view.SurfaceHolder;
@@ -149,8 +150,8 @@ class VideoSurfaceView extends SurfaceView implements VideoViewInterface, Surfac 
    // TODO: Investigate the way to move onMeasure() code into FrameLayout.

    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        int videoWidth = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoWidth();

        int videoHeight = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoHeight();

        int videoWidth = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoSize().getWidth();

        int videoHeight = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoSize().getHeight();

        if (DEBUG) {

            Log.d(TAG, "onMeasure(" + MeasureSpec.toString(widthMeasureSpec) + ", "

                    + MeasureSpec.toString(heightMeasureSpec) + ")");

packages/MediaComponents/src/com/android/widget/VideoTextureView.java

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.widget.VideoView2.VIEW_TYPE_TEXTUREVIEW; 
import android.content.Context;

import android.graphics.SurfaceTexture;

import android.media.MediaPlayer2;

import android.media.VideoSize;

import android.util.AttributeSet;

import android.util.Log;

import android.view.Surface;
@@ -160,8 +161,8 @@ class VideoTextureView extends TextureView 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        int videoWidth = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoWidth();

        int videoHeight = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoHeight();

        int videoWidth = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoSize().getWidth();

        int videoHeight = (mMediaPlayer == null) ? 0 : mMediaPlayer.getVideoSize().getHeight();

        if (DEBUG) {

            Log.d(TAG, "onMeasure(" + MeasureSpec.toString(widthMeasureSpec) + ", "

                    + MeasureSpec.toString(heightMeasureSpec) + ")");

packages/MediaComponents/src/com/android/widget/VideoView2Impl.java

+8 −6
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.media.PlaybackParams; 
import android.media.SessionToken2;

import android.media.SubtitleData;

import android.media.TimedText;

import android.media.VideoSize;

import android.media.session.MediaController;

import android.media.session.MediaController.PlaybackInfo;

import android.media.session.MediaSession;
@@ -1110,12 +1111,13 @@ public class VideoView2Impl extends BaseLayout 


                @Override

                public void onVideoSizeChanged(

                        MediaPlayer2 mp, DataSourceDesc dsd, int width, int height) {

                        MediaPlayer2 mp, DataSourceDesc dsd, VideoSize size) {

                    if (DEBUG) {

                        Log.d(TAG, "onVideoSizeChanged(): size: " + width + "/" + height);

                        Log.d(TAG, "onVideoSizeChanged(): size: " + size.getWidth() + "/"

                                + size.getHeight());

                    }

                    mVideoWidth = mp.getVideoWidth();

                    mVideoHeight = mp.getVideoHeight();

                    mVideoWidth = mp.getVideoSize().getWidth();

                    mVideoHeight = mp.getVideoSize().getHeight();

                    if (DEBUG) {

                        Log.d(TAG, "onVideoSizeChanged(): mVideoSize:" + mVideoWidth + "/"

                                + mVideoHeight);
@@ -1193,8 +1195,8 @@ public class VideoView2Impl extends BaseLayout 
                    if (mMediaControlView != null) {

                        mMediaControlView.setEnabled(true);

                    }

                    int videoWidth = mp.getVideoWidth();

                    int videoHeight = mp.getVideoHeight();

                    int videoWidth = mp.getVideoSize().getWidth();

                    int videoHeight = mp.getVideoSize().getHeight();



                    // mSeekWhenPrepared may be changed after seekTo() call

                    long seekToPosition = mSeekWhenPrepared;