mirror of
https://github.com/androidx/media.git
synced 2025-05-17 12:39:52 +08:00
Remove FLAG_SIDELOADED from FragmentedMp4Extractor
This isn't used any more, the last usage was removed in <unknown commit> PiperOrigin-RevId: 343266553
This commit is contained in:
parent
622a44dce0
commit
31166d41c4
@ -74,8 +74,7 @@ public class FragmentedMp4Extractor implements Extractor {
|
|||||||
/**
|
/**
|
||||||
* Flags controlling the behavior of the extractor. Possible flag values are {@link
|
* Flags controlling the behavior of the extractor. Possible flag values are {@link
|
||||||
* #FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME}, {@link #FLAG_WORKAROUND_IGNORE_TFDT_BOX},
|
* #FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME}, {@link #FLAG_WORKAROUND_IGNORE_TFDT_BOX},
|
||||||
* {@link #FLAG_ENABLE_EMSG_TRACK}, {@link #FLAG_SIDELOADED} and {@link
|
* {@link #FLAG_ENABLE_EMSG_TRACK} and {@link #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}.
|
||||||
* #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}.
|
|
||||||
*/
|
*/
|
||||||
@Documented
|
@Documented
|
||||||
@Retention(RetentionPolicy.SOURCE)
|
@Retention(RetentionPolicy.SOURCE)
|
||||||
@ -85,7 +84,6 @@ public class FragmentedMp4Extractor implements Extractor {
|
|||||||
FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME,
|
FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME,
|
||||||
FLAG_WORKAROUND_IGNORE_TFDT_BOX,
|
FLAG_WORKAROUND_IGNORE_TFDT_BOX,
|
||||||
FLAG_ENABLE_EMSG_TRACK,
|
FLAG_ENABLE_EMSG_TRACK,
|
||||||
FLAG_SIDELOADED,
|
|
||||||
FLAG_WORKAROUND_IGNORE_EDIT_LISTS
|
FLAG_WORKAROUND_IGNORE_EDIT_LISTS
|
||||||
})
|
})
|
||||||
public @interface Flags {}
|
public @interface Flags {}
|
||||||
@ -104,11 +102,7 @@ public class FragmentedMp4Extractor implements Extractor {
|
|||||||
* messages in the stream will be delivered as samples to this track.
|
* messages in the stream will be delivered as samples to this track.
|
||||||
*/
|
*/
|
||||||
public static final int FLAG_ENABLE_EMSG_TRACK = 1 << 2; // 4
|
public static final int FLAG_ENABLE_EMSG_TRACK = 1 << 2; // 4
|
||||||
/**
|
|
||||||
* Flag to indicate that the {@link Track} was sideloaded, instead of being declared by the MP4
|
|
||||||
* container.
|
|
||||||
*/
|
|
||||||
private static final int FLAG_SIDELOADED = 1 << 3; // 8
|
|
||||||
/** Flag to ignore any edit lists in the stream. */
|
/** Flag to ignore any edit lists in the stream. */
|
||||||
public static final int FLAG_WORKAROUND_IGNORE_EDIT_LISTS = 1 << 4; // 16
|
public static final int FLAG_WORKAROUND_IGNORE_EDIT_LISTS = 1 << 4; // 16
|
||||||
|
|
||||||
@ -254,7 +248,7 @@ public class FragmentedMp4Extractor implements Extractor {
|
|||||||
@Nullable Track sideloadedTrack,
|
@Nullable Track sideloadedTrack,
|
||||||
List<Format> closedCaptionFormats,
|
List<Format> closedCaptionFormats,
|
||||||
@Nullable TrackOutput additionalEmsgTrackOutput) {
|
@Nullable TrackOutput additionalEmsgTrackOutput) {
|
||||||
this.flags = flags | (sideloadedTrack != null ? FLAG_SIDELOADED : 0);
|
this.flags = flags;
|
||||||
this.timestampAdjuster = timestampAdjuster;
|
this.timestampAdjuster = timestampAdjuster;
|
||||||
this.sideloadedTrack = sideloadedTrack;
|
this.sideloadedTrack = sideloadedTrack;
|
||||||
this.closedCaptionFormats = Collections.unmodifiableList(closedCaptionFormats);
|
this.closedCaptionFormats = Collections.unmodifiableList(closedCaptionFormats);
|
||||||
@ -926,7 +920,7 @@ public class FragmentedMp4Extractor implements Extractor {
|
|||||||
SparseArray<TrackBundle> trackBundles, int trackId) {
|
SparseArray<TrackBundle> trackBundles, int trackId) {
|
||||||
if (trackBundles.size() == 1) {
|
if (trackBundles.size() == 1) {
|
||||||
// Ignore track id if there is only one track. This is either because we have a side-loaded
|
// Ignore track id if there is only one track. This is either because we have a side-loaded
|
||||||
// track (flag FLAG_SIDELOADED) or to cope with non-matching track indices (see
|
// track or to cope with non-matching track indices (see
|
||||||
// https://github.com/google/ExoPlayer/issues/4083).
|
// https://github.com/google/ExoPlayer/issues/4083).
|
||||||
return trackBundles.valueAt(/* index= */ 0);
|
return trackBundles.valueAt(/* index= */ 0);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user