From 2856feb22397d2e2e16a31a56068e723475c607c Mon Sep 17 00:00:00 2001 From: Gourav Saxena Date: Fri, 21 May 2021 14:17:12 +0530 Subject: [PATCH 1/2] - Modify channel and audio display label - Code refactor --- .../com/kaltura/playkitdemo/MainActivity.java | 68 ++++++------------- 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java b/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java index 68517a68..4005e0f1 100644 --- a/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java +++ b/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java @@ -45,6 +45,7 @@ import com.kaltura.playkit.PKMediaEntry; import com.kaltura.playkit.PKMediaSource; import com.kaltura.playkit.PKPluginConfigs; +import com.kaltura.playkit.PKRequestConfiguration; import com.kaltura.playkit.PKRequestParams; import com.kaltura.playkit.PlayKitManager; import com.kaltura.playkit.Player; @@ -164,7 +165,6 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte private Spinner videoSpinner, audioSpinner, textSpinner; private ViewGroup companionAdSlot; - private OrientationManager mOrientationManager; private boolean userIsInteracting; private PKTracks tracksInfo; private boolean isAdsEnabled = true; @@ -225,7 +225,7 @@ protected void onCreate(Bundle savedInstanceState) { } catch (GooglePlayServicesNotAvailableException e) { e.printStackTrace(); }*/ - mOrientationManager = new OrientationManager(this, SensorManager.SENSOR_DELAY_NORMAL, this); + OrientationManager mOrientationManager = new OrientationManager(this, SensorManager.SENSOR_DELAY_NORMAL, this); mOrientationManager.enable(); setContentView(R.layout.activity_main); @@ -562,7 +562,7 @@ private void onMediaLoaded(PKMediaEntry mediaEntry) { player.getSettings().setSecureSurface(false); player.getSettings().setAdAutoPlayOnResume(true); //player.getSettings().setPreferredVideoCodecSettings(new VideoCodecSettings(Collections.singletonList(PKVideoCodec.VP9), true, false)); - player.getSettings().setAllowCrossProtocolRedirect(true); + player.getSettings().setPKRequestConfig(new PKRequestConfiguration(true)); //player.getSettings().setPlayerBuffers(new LoadControlBuffers()); player.getSettings().enableDecoderFallback(true); //player.setPlaybackRate(1.5f); @@ -1048,7 +1048,6 @@ public void onDestroy() { private void addPlayerListeners(final ProgressBar appProgressBar) { - player.addListener(this, AdEvent.contentResumeRequested, event -> { log.d("CONTENT_RESUME_REQUESTED"); appProgressBar.setVisibility(View.INVISIBLE); @@ -1056,10 +1055,7 @@ private void addPlayerListeners(final ProgressBar appProgressBar) { controlsView.setPlayerState(PlayerState.READY); }); - player.addListener(this, AdEvent.daiSourceSelected, event -> { - log.d("DAI_SOURCE_SELECTED: " + event.sourceURL); - - }); + player.addListener(this, AdEvent.daiSourceSelected, event -> log.d("DAI_SOURCE_SELECTED: " + event.sourceURL)); player.addListener(this, AdEvent.contentPauseRequested, event -> { log.d("AD_CONTENT_PAUSE_REQUESTED"); @@ -1136,10 +1132,7 @@ private void addPlayerListeners(final ProgressBar appProgressBar) { nowPlaying = true; }); - player.addListener(this, PlayerEvent.surfaceAspectRationSizeModeChanged, event -> { - log.d("resizeMode updated" + event.resizeMode); - }); - + player.addListener(this, PlayerEvent.surfaceAspectRationSizeModeChanged, event -> log.d("resizeMode updated" + event.resizeMode)); /////// PLAYER EVENTS @@ -1159,14 +1152,10 @@ private void addPlayerListeners(final ProgressBar appProgressBar) { nowPlaying = false; }); - player.addListener(this, PlayerEvent.volumeChanged, event -> { - log.d("volumeChanged " + event.volume); - }); + player.addListener(this, PlayerEvent.volumeChanged, event -> log.d("volumeChanged " + event.volume)); - player.addListener(this, PlayerEvent.playbackRateChanged, event -> { - log.d("playbackRateChanged event rate = " + event.rate); - }); + player.addListener(this, PlayerEvent.playbackRateChanged, event -> log.d("playbackRateChanged event rate = " + event.rate)); player.addListener(this, PlayerEvent.tracksAvailable, event -> { //When the track data available, this event occurs. It brings the info object with it. @@ -1198,13 +1187,9 @@ private void addPlayerListeners(final ProgressBar appProgressBar) { }); - player.addListener(this, PlayerEvent.sourceSelected, event -> { - log.d("sourceSelected event source = " + event.source); - }); + player.addListener(this, PlayerEvent.sourceSelected, event -> log.d("sourceSelected event source = " + event.source)); - player.addListener(this, PlayerEvent.playbackRateChanged, event -> { - log.d("playbackRateChanged event rate = " + event.rate); - }); + player.addListener(this, PlayerEvent.playbackRateChanged, event -> log.d("playbackRateChanged event rate = " + event.rate)); player.addListener(this, PlayerEvent.error, event -> { //When the track data available, this event occurs. It brings the info object with it. @@ -1213,9 +1198,7 @@ private void addPlayerListeners(final ProgressBar appProgressBar) { } }); - player.addListener(this, PlayerEvent.ended, event -> { - appProgressBar.setVisibility(View.INVISIBLE); - }); + player.addListener(this, PlayerEvent.ended, event -> appProgressBar.setVisibility(View.INVISIBLE)); player.addListener(this, PlayerEvent.playheadUpdated, event -> { //When the track data available, this event occurs. It brings the info object with it. @@ -1249,25 +1232,15 @@ public void onEvent(PlayerEvent.StateChanged event) { /////Phoenix events - player.addListener(this, PhoenixAnalyticsEvent.bookmarkError, event -> { - log.d("bookmarkErrorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage); - }); + player.addListener(this, PhoenixAnalyticsEvent.bookmarkError, event -> log.d("bookmarkErrorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage)); - player.addListener(this, PhoenixAnalyticsEvent.concurrencyError, event -> { - log.d("ConcurrencyErrorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage); - }); + player.addListener(this, PhoenixAnalyticsEvent.concurrencyError, event -> log.d("ConcurrencyErrorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage)); - player.addListener(this, PhoenixAnalyticsEvent.error, event -> { - log.d("Phoenox Analytics errorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage); - }); + player.addListener(this, PhoenixAnalyticsEvent.error, event -> log.d("Phoenox Analytics errorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage)); - player.addListener(this, PhoenixAnalyticsEvent.error, event -> { - log.d("Phoenox Analytics errorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage); - }); + player.addListener(this, PhoenixAnalyticsEvent.error, event -> log.d("Phoenox Analytics errorEvent errorCode = " + event.errorCode + " message = " + event.errorMessage)); - player.addListener(this, OttEvent.ottEvent, event -> { - log.d("Concurrency event = " + event.type); - }); + player.addListener(this, OttEvent.ottEvent, event -> log.d("Concurrency event = " + event.type)); } @Override @@ -1324,9 +1297,9 @@ private void populateSpinnersWithTrackInfo(PKTracks tracksInfo) { * For example if user want to display in UI bitrate of the available tracks, * he can do it, by obtaining the tackType of video, and getting the getBitrate() from videoTrackInfo. * - * @param trackType - tyoe of the track you are interested in. - * @param trackInfos - all availables tracks. - * @return + * @param trackType - type of the track you are interested in. + * @param trackInfos - all available tracks. + * @return Tracks Items array */ private TrackItem[] obtainRelevantTrackInfo(int trackType, List trackInfos) { TrackItem[] trackItems = new TrackItem[trackInfos.size()]; @@ -1368,7 +1341,10 @@ private TrackItem[] obtainRelevantTrackInfo(int trackType, List 0) ? "" + audioTrackInfo.getBitrate() : ""; if (TextUtils.isEmpty(bitrate) && addChannel) { bitrate = buildAudioChannelString(audioTrackInfo.getChannelCount()); + } else if (addChannel){ + bitrate = buildAudioChannelString(audioTrackInfo.getChannelCount()) + " " + bitrate; } + if (audioTrackInfo.isAdaptive()) { if (!TextUtils.isEmpty(bitrate)) { bitrate += " Adaptive"; @@ -1379,7 +1355,7 @@ private TrackItem[] obtainRelevantTrackInfo(int trackType, List Date: Thu, 10 Jun 2021 15:17:41 +0530 Subject: [PATCH 2/2] - Updated setPKRequestConfig settings API --- .../src/main/java/com/kaltura/playkitdemo/MainActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java b/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java index 4005e0f1..84ea4626 100644 --- a/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java +++ b/FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java @@ -45,7 +45,7 @@ import com.kaltura.playkit.PKMediaEntry; import com.kaltura.playkit.PKMediaSource; import com.kaltura.playkit.PKPluginConfigs; -import com.kaltura.playkit.PKRequestConfiguration; +import com.kaltura.playkit.PKRequestConfig; import com.kaltura.playkit.PKRequestParams; import com.kaltura.playkit.PlayKitManager; import com.kaltura.playkit.Player; @@ -562,7 +562,7 @@ private void onMediaLoaded(PKMediaEntry mediaEntry) { player.getSettings().setSecureSurface(false); player.getSettings().setAdAutoPlayOnResume(true); //player.getSettings().setPreferredVideoCodecSettings(new VideoCodecSettings(Collections.singletonList(PKVideoCodec.VP9), true, false)); - player.getSettings().setPKRequestConfig(new PKRequestConfiguration(true)); + player.getSettings().setPKRequestConfig(new PKRequestConfig(true)); //player.getSettings().setPlayerBuffers(new LoadControlBuffers()); player.getSettings().enableDecoderFallback(true); //player.setPlaybackRate(1.5f);