From 1ebd28851e560c460755faf69102016265c5a391 Mon Sep 17 00:00:00 2001 From: Gulzar Date: Fri, 29 Jul 2022 07:15:16 +0530 Subject: [PATCH 1/2] added zoom and pan changes --- .../app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt | 3 ++- .../hms/app2/ui/meeting/commons/VideoGridBaseFragment.kt | 5 +++-- app/src/main/res/layout/video_card.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt b/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt index 2917f1263..f978d1530 100644 --- a/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt +++ b/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt @@ -161,7 +161,8 @@ class ActiveSpeakerFragment : VideoGridBaseFragment() { bindSurfaceView( binding.screenShare, screen, - RendererCommon.ScalingType.SCALE_ASPECT_FIT + RendererCommon.ScalingType.SCALE_ASPECT_FIT, + true ) } bindVideo(binding.screenShare, screen) diff --git a/app/src/main/java/live/hms/app2/ui/meeting/commons/VideoGridBaseFragment.kt b/app/src/main/java/live/hms/app2/ui/meeting/commons/VideoGridBaseFragment.kt index 0d9473bba..84e5c6a55 100644 --- a/app/src/main/java/live/hms/app2/ui/meeting/commons/VideoGridBaseFragment.kt +++ b/app/src/main/java/live/hms/app2/ui/meeting/commons/VideoGridBaseFragment.kt @@ -160,7 +160,8 @@ abstract class VideoGridBaseFragment : Fragment() { protected fun bindSurfaceView( binding: VideoCardBinding, item: MeetingTrack, - scalingType: RendererCommon.ScalingType = RendererCommon.ScalingType.SCALE_ASPECT_BALANCED + scalingType: RendererCommon.ScalingType = RendererCommon.ScalingType.SCALE_ASPECT_BALANCED, + enableZoom : Boolean = false ) { Log.d(TAG,"bindSurfaceView for :: ${item.peer.name}") val earlyExit = item.video == null @@ -171,7 +172,7 @@ abstract class VideoGridBaseFragment : Fragment() { binding.surfaceView.let { view -> view.setScalingType(scalingType) view.setEnableHardwareScaler(true) - + view.enableZoomAndPan(enableZoom) SurfaceViewRendererUtil.bind(view, item).let { success -> if (success) { binding.surfaceView.visibility = if (item.video?.isDegraded == true ) View.INVISIBLE else View.VISIBLE diff --git a/app/src/main/res/layout/video_card.xml b/app/src/main/res/layout/video_card.xml index 7759fc55e..b26c0b9ab 100644 --- a/app/src/main/res/layout/video_card.xml +++ b/app/src/main/res/layout/video_card.xml @@ -22,7 +22,7 @@ android:layout_centerInParent="true" android:layout_height="wrap_content"> - Date: Fri, 29 Jul 2022 11:53:34 +0530 Subject: [PATCH 2/2] Update ActiveSpeakerFragment.kt --- .../hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt b/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt index f978d1530..2594f7df8 100644 --- a/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt +++ b/app/src/main/java/live/hms/app2/ui/meeting/activespeaker/ActiveSpeakerFragment.kt @@ -66,7 +66,7 @@ class ActiveSpeakerFragment : VideoGridBaseFragment() { meetingViewModel?.updateTrackStatus(statsString) } binding.screenShare.raisedHand.alpha = visibilityOpacity(CustomPeerMetadata.fromJson(it.peer.metadata)?.isHandRaised == true) - bindSurfaceView(binding.screenShare, it, RendererCommon.ScalingType.SCALE_ASPECT_FIT) + bindSurfaceView(binding.screenShare, it, RendererCommon.ScalingType.SCALE_ASPECT_FIT, true) } super.onResume() }