Commit 965606f7 by bachinger Committed by Marc Baechinger

Remove player listener on the application thread of the player

PiperOrigin-RevId: 497183220
parent 010c6b96
...@@ -36,6 +36,7 @@ import android.content.Context; ...@@ -36,6 +36,7 @@ import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper;
import android.util.Pair; import android.util.Pair;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
...@@ -493,7 +494,8 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou ...@@ -493,7 +494,8 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou
this.applicationAdEventListener = applicationAdEventListener; this.applicationAdEventListener = applicationAdEventListener;
this.applicationAdErrorListener = applicationAdErrorListener; this.applicationAdErrorListener = applicationAdErrorListener;
componentListener = new ComponentListener(); componentListener = new ComponentListener();
mainHandler = Util.createHandlerForCurrentLooper(); Assertions.checkArgument(player.getApplicationLooper() == Looper.getMainLooper());
mainHandler = new Handler(Looper.getMainLooper());
Uri streamRequestUri = checkNotNull(mediaItem.localConfiguration).uri; Uri streamRequestUri = checkNotNull(mediaItem.localConfiguration).uri;
isLiveStream = ImaServerSideAdInsertionUriBuilder.isLiveStream(streamRequestUri); isLiveStream = ImaServerSideAdInsertionUriBuilder.isLiveStream(streamRequestUri);
adsId = ImaServerSideAdInsertionUriBuilder.getAdsId(streamRequestUri); adsId = ImaServerSideAdInsertionUriBuilder.getAdsId(streamRequestUri);
...@@ -570,8 +572,11 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou ...@@ -570,8 +572,11 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou
super.releaseSourceInternal(); super.releaseSourceInternal();
if (loader != null) { if (loader != null) {
loader.release(); loader.release();
player.removeListener(componentListener); mainHandler.post(
mainHandler.post(() -> setStreamManager(/* streamManager= */ null)); () -> {
player.removeListener(componentListener);
setStreamManager(/* streamManager= */ null);
});
loader = null; loader = null;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment