Skip to content

FEC-11261 Modify channel and audio display label #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GouravSna wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

FEC-11261 Modify channel and audio display label #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2856feb
- Modify channel and audio display label
GouravSna May 21, 2021
4bb7b9c
- Updated setPKRequestConfig settings API
GouravSna Jun 10, 2021
fff3962
Merge branch 'develop' into FEC-11261
GouravSna Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 22 additions & 46 deletions FullDemo/playkitdemo/src/main/java/com/kaltura/playkitdemo/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -1060,18 +1060,14 @@ public void onDestroy() {

private void addPlayerListeners(final ProgressBar appProgressBar) {


player.addListener(this, AdEvent.contentResumeRequested, event -> {
log.d("CONTENT_RESUME_REQUESTED");
appProgressBar.setVisibility(View.INVISIBLE);
controlsView.setSeekBarStateForAd(false);
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");
Expand Down Expand Up @@ -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

Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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<? extends BaseTrack> trackInfos) {
TrackItem[] trackItems = new TrackItem[trackInfos.size()];
Expand Down Expand Up @@ -1380,7 +1353,10 @@ private TrackItem[] obtainRelevantTrackInfo(int trackType, List<? extends BaseTr
String bitrate = (audioTrackInfo.getBitrate() > 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";
Expand All @@ -1391,7 +1367,7 @@ private TrackItem[] obtainRelevantTrackInfo(int trackType, List<? extends BaseTr
label = "";
}
}
trackItems[i] = new TrackItem(label + " " + bitrate, audioTrackInfo.getUniqueId());
trackItems[i] = new TrackItem(bitrate + " " + label, audioTrackInfo.getUniqueId());
}
break;
case Consts.TRACK_TYPE_TEXT:
Expand Down