Skip to content
Snippets Groups Projects
Commit 079d2024 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Fix activity resolving for the MediaPlayer

Fixes #2274
parent 33116907
No related branches found
No related tags found
1 merge request!1210Fix activity resolving for the MediaPlayer
Pipeline #176234 canceled with stage
in 18 seconds
......@@ -190,7 +190,7 @@ class VideoHelper implements IVLCVout.OnNewVideoLayoutListener {
void updateVideoSurfaces() {
if (mMediaPlayer == null || mMediaPlayer.isReleased() || !mMediaPlayer.getVLCVout().areViewsAttached()) return;
final boolean isPrimary = mDisplayManager == null || mDisplayManager.isPrimary();
final Activity activity = isPrimary && mVideoSurfaceFrame.getContext() instanceof Activity ? (Activity) mVideoSurfaceFrame.getContext() : null;
final Activity activity = !isPrimary ? null : AndroidUtil.resolveActivity(mVideoSurfaceFrame.getContext());
int sw;
int sh;
......
......@@ -20,6 +20,9 @@
package org.videolan.libvlc.util;
import android.app.Activity;
import android.content.Context;
import android.content.ContextWrapper;
import android.net.Uri;
import android.os.Build;
......@@ -60,4 +63,11 @@ public class AndroidUtil {
public static Uri FileToUri(File file) {
return Uri.fromFile(file);
}
public static Activity resolveActivity(Context context) {
if (context instanceof Activity) return (Activity) context;
if (context instanceof ContextWrapper) return resolveActivity(((ContextWrapper)context).getBaseContext());
return null;
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment