Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2525 from dirkmueller/video_aspect 

Set video aspect on initial creation
This commit is contained in:
Martin Fietz 2018-01-08 22:59:01 +01:00 committed by GitHub
parent 0c662530b9 32215ffc28
commit b1c212c2fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
View File

@ -152,16 +152,9 @@ public class VideoplayerActivity extends MediaplayerActivity {
@Override @Override
protected void onAwaitingVideoSurface() { protected void onAwaitingVideoSurface() {
setupVideoAspectRatio();
if (videoSurfaceCreated && controller != null) { if (videoSurfaceCreated && controller != null) {
Log.d(TAG, "Videosurface already created, setting videosurface now"); Log.d(TAG, "Videosurface already created, setting videosurface now");
Pair<Integer, Integer> videoSize = controller.getVideoSize();
if (videoSize != null && videoSize.first > 0 && videoSize.second > 0) {
Log.d(TAG, "Width,height of video: " + videoSize.first + ", " + videoSize.second);
videoview.setVideoSize(videoSize.first, videoSize.second);
} else {
Log.e(TAG, "Could not determine video size");
}
controller.setVideoSurface(videoview.getHolder()); controller.setVideoSurface(videoview.getHolder());
} }
} }
@ -199,6 +192,18 @@ public class VideoplayerActivity extends MediaplayerActivity {
videoControlsHider.start(); videoControlsHider.start();
} }
private void setupVideoAspectRatio() {
if (videoSurfaceCreated && controller != null) {
Pair<Integer, Integer> videoSize = controller.getVideoSize();
if (videoSize != null && videoSize.first > 0 && videoSize.second > 0) {
Log.d(TAG, "Width,height of video: " + videoSize.first + ", " + videoSize.second);
videoview.setVideoSize(videoSize.first, videoSize.second);
} else {
Log.e(TAG, "Could not determine video size");
}
}
}
private void toggleVideoControlsVisibility() { private void toggleVideoControlsVisibility() {
if (videoControlsShowing) { if (videoControlsShowing) {
getSupportActionBar().hide(); getSupportActionBar().hide();
@ -247,7 +252,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
Log.e(TAG, "Couldn't attach surface to mediaplayer - reference to service was null"); Log.e(TAG, "Couldn't attach surface to mediaplayer - reference to service was null");
} }
} }
setupVideoAspectRatio();
} }
@Override @Override