From 3abe3887cc3f7c8c11d9c5243aa1264a823b348c Mon Sep 17 00:00:00 2001 From: volodymyr-bondarenko85 <131799099+volodymyr-bondarenko85@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:47:32 +0200 Subject: [PATCH] fix: BPK session close fix (#817) * BPK session close fix (Depends on kaltura/playkit-android-broadpeak-smartlib#38) * Log cleanup --- .../exoplayer2/audio/KMediaCodecAudioRenderer.java | 6 +++--- .../src/main/java/com/kaltura/playkit/PlayerEvent.java | 8 ++++++++ .../java/com/kaltura/playkit/player/PlayerController.java | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/playkit/src/main/java/com/kaltura/android/exoplayer2/audio/KMediaCodecAudioRenderer.java b/playkit/src/main/java/com/kaltura/android/exoplayer2/audio/KMediaCodecAudioRenderer.java index 10bb43a58..26aaf2570 100644 --- a/playkit/src/main/java/com/kaltura/android/exoplayer2/audio/KMediaCodecAudioRenderer.java +++ b/playkit/src/main/java/com/kaltura/android/exoplayer2/audio/KMediaCodecAudioRenderer.java @@ -180,9 +180,9 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, @ } if (!speedAdjustedAfterPositionReset || getContinuousSpeedAdjustment()) { - log.d("KMediaCodecAudioRenderer", "currentSpeed=" + getPlaybackParameters().speed + - ", bufferPresentationTimeUs=" + bufferPresentationTimeUs + - ", positionUs=" + positionUs); +// log.d("KMediaCodecAudioRenderer", "currentSpeed=" + getPlaybackParameters().speed + +// ", bufferPresentationTimeUs=" + bufferPresentationTimeUs + +// ", positionUs=" + positionUs); if (bufferPresentationTimeUs - positionUs > getMaxAVGap() && getPlaybackParameters().speed < getMaxSpeedFactor()) { float newSpeed = getPlaybackParameters().speed + getSpeedStep(); diff --git a/playkit/src/main/java/com/kaltura/playkit/PlayerEvent.java b/playkit/src/main/java/com/kaltura/playkit/PlayerEvent.java index ddc5cb52c..2135f9d78 100644 --- a/playkit/src/main/java/com/kaltura/playkit/PlayerEvent.java +++ b/playkit/src/main/java/com/kaltura/playkit/PlayerEvent.java @@ -80,6 +80,14 @@ public Generic(Type type) { } } + public static class Stopped extends PlayerEvent { + public final String mediaSourceUrl; + public Stopped(Type type, String mediaSourceUrl) { + super(type); + this.mediaSourceUrl = mediaSourceUrl; + } + } + public static class StateChanged extends PlayerEvent { public final PlayerState newState; public final PlayerState oldState; diff --git a/playkit/src/main/java/com/kaltura/playkit/player/PlayerController.java b/playkit/src/main/java/com/kaltura/playkit/player/PlayerController.java index fa7a3b3a4..5655ea173 100644 --- a/playkit/src/main/java/com/kaltura/playkit/player/PlayerController.java +++ b/playkit/src/main/java/com/kaltura/playkit/player/PlayerController.java @@ -335,7 +335,8 @@ public void destroy() { public void stop() { log.v("stop"); if (eventListener != null && !isPlayerStopped) { - PlayerEvent event = new PlayerEvent.Generic(PlayerEvent.Type.STOPPED); + PlayerEvent event = new PlayerEvent.Stopped(PlayerEvent.Type.STOPPED, + getMediaSource() != null ? getMediaSource().getUrl() : null); cancelUpdateProgress(); log.d("stop() isForceSinglePlayerEngine = " + playerSettings.isForceSinglePlayerEngine());