Commit 2611b495 by olly Committed by Ian Baker

Exclude TrackGroup fields/methods from the stable API

App code should get all of this information from TrackGroupInfo,
and should only need TrackGroup as a key to use for overrides.

PiperOrigin-RevId: 438840925
parent 6455f6e9
...@@ -38,7 +38,6 @@ import com.google.android.exoplayer2.drm.DrmSession; ...@@ -38,7 +38,6 @@ import com.google.android.exoplayer2.drm.DrmSession;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.source.LoadEventInfo; import com.google.android.exoplayer2.source.LoadEventInfo;
import com.google.android.exoplayer2.source.MediaLoadData; import com.google.android.exoplayer2.source.MediaLoadData;
import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector; import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
import com.google.android.exoplayer2.video.VideoSize; import com.google.android.exoplayer2.video.VideoSize;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
...@@ -285,11 +284,10 @@ public class EventLogger implements AnalyticsListener { ...@@ -285,11 +284,10 @@ public class EventLogger implements AnalyticsListener {
// Log metadata for at most one of the selected tracks. // Log metadata for at most one of the selected tracks.
boolean loggedMetadata = false; boolean loggedMetadata = false;
for (int groupIndex = 0; !loggedMetadata && groupIndex < trackGroupInfos.size(); groupIndex++) { for (int groupIndex = 0; !loggedMetadata && groupIndex < trackGroupInfos.size(); groupIndex++) {
TracksInfo.TrackGroupInfo trackGroupInfo = trackGroupInfos.get(groupIndex); TracksInfo.TrackGroupInfo trackGroup = trackGroupInfos.get(groupIndex);
TrackGroup trackGroup = trackGroupInfo.getTrackGroup();
for (int trackIndex = 0; !loggedMetadata && trackIndex < trackGroup.length; trackIndex++) { for (int trackIndex = 0; !loggedMetadata && trackIndex < trackGroup.length; trackIndex++) {
if (trackGroupInfo.isTrackSelected(trackIndex)) { if (trackGroup.isTrackSelected(trackIndex)) {
@Nullable Metadata metadata = trackGroup.getFormat(trackIndex).metadata; @Nullable Metadata metadata = trackGroup.getTrackFormat(trackIndex).metadata;
if (metadata != null && metadata.length() > 0) { if (metadata != null && metadata.length() > 0) {
logd(" Metadata ["); logd(" Metadata [");
printMetadata(metadata, " "); printMetadata(metadata, " ");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment