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 7c65b5c0..1df6dc66 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.PKRequestConfig; import com.kaltura.playkit.PKRequestParams; import com.kaltura.playkit.PlayKitManager; import com.kaltura.playkit.Player; @@ -167,7 +168,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; @@ -228,7 +228,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); @@ -574,7 +574,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 PKRequestConfig(true)); //player.getSettings().setPlayerBuffers(new LoadControlBuffers()); player.getSettings().enableDecoderFallback(true); //player.setPlaybackRate(1.5f); @@ -1060,7 +1060,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); @@ -1068,10 +1067,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"); @@ -1148,10 +1144,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 @@ -1171,14 +1164,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. @@ -1210,13 +1199,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. @@ -1225,9 +1210,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. @@ -1261,25 +1244,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 @@ -1336,9 +1309,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()]; @@ -1380,7 +1353,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"; @@ -1391,7 +1367,7 @@ private TrackItem[] obtainRelevantTrackInfo(int trackType, List