izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Skip track info extraction if startup movie on Android

Browse Source 
#jira UE-70101
#ue4
#android
#rb Peter.Sauerbrei

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5092359 in //UE4/Release-4.22/... via CL 5092361
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5137875 by chris babcock in Dev-Networking branch]
This commit is contained in:
chris babcock
2019-02-22 05:16:03 -05:00
parent bc3d460af5
commit ef904b4f73
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Engine/Build/Android/Java/src/com/epicgames/ue4/MediaPlayer14.java
View File

@@ -30,6 +30,7 @@ public class MediaPlayer14
{
private boolean SwizzlePixels = true;
private boolean VulkanRenderer = false;
private boolean NeedTrackInfo = true;
private boolean Looping = false;
private boolean AudioEnabled = true;
private float AudioVolume = 1.0f;
@@ -82,10 +83,11 @@ public class MediaPlayer14
// ======================================================================================
public MediaPlayer14(boolean swizzlePixels, boolean vulkanRenderer)
public MediaPlayer14(boolean swizzlePixels, boolean vulkanRenderer, boolean needTrackInfo)
{
SwizzlePixels = swizzlePixels;
VulkanRenderer = vulkanRenderer;
NeedTrackInfo = needTrackInfo;
WaitOnBitmapRender = false;
AudioEnabled = true;
AudioVolume = 1.0f;
@@ -265,7 +267,7 @@ public class MediaPlayer14
setDataSource(UrlPath);
releaseOESTextureRenderer();
releaseBitmapRenderer();
if (android.os.Build.VERSION.SDK_INT >= 16)
if (NeedTrackInfo && android.os.Build.VERSION.SDK_INT >= 16)
{
MediaExtractor extractor = new MediaExtractor();
if (extractor != null)
@@ -384,7 +386,7 @@ public class MediaPlayer14
releaseOESTextureRenderer();
releaseBitmapRenderer();
if (android.os.Build.VERSION.SDK_INT >= 16)
if (NeedTrackInfo && android.os.Build.VERSION.SDK_INT >= 16)
{
MediaExtractor extractor = new MediaExtractor();
if (extractor != null)
@@ -432,7 +434,7 @@ public class MediaPlayer14
releaseOESTextureRenderer();
releaseBitmapRenderer();
if (android.os.Build.VERSION.SDK_INT >= 16)
if (NeedTrackInfo && android.os.Build.VERSION.SDK_INT >= 16)
{
MediaExtractor extractor = new MediaExtractor();
if (extractor != null)
@@ -474,7 +476,7 @@ public class MediaPlayer14
releaseOESTextureRenderer();
releaseBitmapRenderer();
if (android.os.Build.VERSION.SDK_INT >= 16)
if (NeedTrackInfo && android.os.Build.VERSION.SDK_INT >= 16)
{
MediaExtractor extractor = new MediaExtractor();
if (extractor != null)
@@ -1846,7 +1848,7 @@ public class MediaPlayer14
public AudioTrackInfo[] GetAudioTracks()
{
if (android.os.Build.VERSION.SDK_INT >= 16)
if (NeedTrackInfo && android.os.Build.VERSION.SDK_INT >= 16)
{
TrackInfo[] trackInfo = getTrackInfo();
int CountTracks = 0;
@@ -1922,7 +1924,7 @@ public class MediaPlayer14
public CaptionTrackInfo[] GetCaptionTracks()
{
if (android.os.Build.VERSION.SDK_INT >= 21)
if (NeedTrackInfo && android.os.Build.VERSION.SDK_INT >= 21)
{
TrackInfo[] trackInfo = getTrackInfo();
int CountTracks = 0;
@@ -1974,7 +1976,7 @@ public class MediaPlayer14
int Width = getVideoWidth();
int Height = getVideoHeight();
if (android.os.Build.VERSION.SDK_INT >= 16)
if (NeedTrackInfo && android.os.Build.VERSION.SDK_INT >= 16)
{
TrackInfo[] trackInfo = getTrackInfo();
int CountTracks = 0;