Remove player listener on the application thread of the player

PiperOrigin-RevId: 497183220
This commit is contained in:
bachinger 2022-12-22 17:36:53 +00:00 committed by Marc Baechinger
parent 69583d0ac1
commit fc22f89fde
2 changed files with 10 additions and 3 deletions

View File

@ -60,6 +60,8 @@ Release notes
* Cast extension * Cast extension
* Bump Cast SDK version to 21.2.0. * Bump Cast SDK version to 21.2.0.
* IMA extension * IMA extension
* Remove player listener of the `ImaServerSideAdInsertionMediaSource` on
the application thread to avoid threading issues.
* Bump IMA SDK version to 3.29.0. * Bump IMA SDK version to 3.29.0.
### 1.0.0-beta03 (2022-11-22) ### 1.0.0-beta03 (2022-11-22)

View File

@ -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;
@ -495,7 +496,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);
@ -572,8 +574,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;
} }
} }