From 9f91e91240aadf25d829685ecafc552b0d4529dc Mon Sep 17 00:00:00 2001 From: Yuriy Liskov Date: Fri, 16 May 2025 05:34:19 +0300 Subject: [PATCH] video card: playback preview: upd 3 --- MediaServiceCore | 2 +- SharedModules | 2 +- .../controllers/VideoLoaderController.java | 4 ++++ .../controllers/VideoStateController.java | 10 +++++++-- .../complexcardview/ComplexImageView.java | 2 +- .../widgets/embedplayer/EmbedPlayerView.java | 22 +++++++++++++++---- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/MediaServiceCore b/MediaServiceCore index 9c4ff21c8..e884fe747 160000 --- a/MediaServiceCore +++ b/MediaServiceCore @@ -1 +1 @@ -Subproject commit 9c4ff21c8f775629cac12cc2a28bd53ece6b8dc4 +Subproject commit e884fe74748e78251b3cec84e126b79786c81300 diff --git a/SharedModules b/SharedModules index 8779095e1..ceddf20cf 160000 --- a/SharedModules +++ b/SharedModules @@ -1 +1 @@ -Subproject commit 8779095e1e46b2d6af1f3442230917d0c0a2026d +Subproject commit ceddf20cfe0b3298bacece0fa974d59b0e3de6c3 diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoLoaderController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoLoaderController.java index 96999108c..a1368fa19 100644 --- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoLoaderController.java +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoLoaderController.java @@ -654,6 +654,10 @@ public class VideoLoaderController extends BasePlayerController implements OnDat return; } + if (video.embedPlayer) { + playbackMode = PlayerConstants.PLAYBACK_MODE_CLOSE; + } + switch (playbackMode) { case PlayerConstants.PLAYBACK_MODE_REVERSE_LIST: if (video.hasPlaylist() || video.belongsToChannelUploads() || video.belongsToChannel()) { diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java index d7dcbac7f..8c86cdff9 100644 --- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java @@ -385,7 +385,8 @@ public class VideoStateController extends BasePlayerController { } public void saveState() { - if (getVideo() != null && getVideo().embedPlayer) { + // Skip mini player, but don't save for the previews (mute enabled) + if (isEmbedMuted()) { return; } @@ -405,7 +406,8 @@ public class VideoStateController extends BasePlayerController { } private void persistState() { - if (getVideo() != null && getVideo().embedPlayer) { + // Skip mini player, but don't save for the previews (mute enabled) + if (isEmbedMuted()) { return; } @@ -652,4 +654,8 @@ public class VideoStateController extends BasePlayerController { } } } + + private boolean isEmbedMuted() { + return getVideo() != null && getPlayer() != null && getVideo().embedPlayer && Helpers.floatEquals(getPlayer().getVolume(), 0); + } } diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/complexcardview/ComplexImageView.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/complexcardview/ComplexImageView.java index e87840a59..2f2182ba8 100644 --- a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/complexcardview/ComplexImageView.java +++ b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/complexcardview/ComplexImageView.java @@ -163,7 +163,7 @@ public class ComplexImageView extends RelativeLayout { mPreviewContainer.setVisibility(View.VISIBLE); } - mPreviewPlayer.openVideo(getVideo().copy()); + mPreviewPlayer.openVideo(getVideo()); } public void stopPlayback() { diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/embedplayer/EmbedPlayerView.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/embedplayer/EmbedPlayerView.java index e66ba1a0a..b1affcb98 100644 --- a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/embedplayer/EmbedPlayerView.java +++ b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/embedplayer/EmbedPlayerView.java @@ -255,7 +255,7 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView { @Override public void finishReally() { - + finish(); } @Override @@ -403,7 +403,11 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView { @Override public boolean containsMedia() { - return false; + if (mExoPlayerController == null) { + return false; + } + + return mExoPlayerController.containsMedia(); } @Override @@ -424,12 +428,18 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView { @Override public void setPitch(float pitch) { - + if (mExoPlayerController != null) { + mExoPlayerController.setPitch(pitch); + } } @Override public float getPitch() { - return 0; + if (mExoPlayerController == null) { + return 1f; + } + + return mExoPlayerController.getPitch(); } @Override @@ -549,6 +559,10 @@ public class EmbedPlayerView extends PlayerView implements PlaybackView { mExoPlayerController.release(); mPlayer = null; setPlayer(null); + hideView(); + if (mVideo != null) { + mVideo.embedPlayer = false; + } } }