loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prepare for CryptoInfo support by removing cached size

Browse Source 
Currently, `size` is cached in `SampleMetadata` when samples are committed in `SampleQueue`, which worked because we didn't support reading files with `CryptoInfo`. This change prepares for future `CryptoInfo` support, as the size changes when reading samples with encrypted data. Caching the size at commit time could lead to incorrect buffer `size` calculations.

Existing tests verify the correctness of the `getSampleSize()` API.

PiperOrigin-RevId: 700714178
This commit is contained in:
rohks 2024-11-27 08:44:44 -08:00 committed by Copybara-Service
parent bff5523bb6
commit 52e45e0864
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/MediaExtractorCompat.java
View File

@ -138,8 +138,8 @@ public final class MediaExtractorCompat {
private final SparseArray<MediaExtractorSampleQueue> sampleQueues; private final SparseArray<MediaExtractorSampleQueue> sampleQueues;
private final SampleMetadataQueue sampleMetadataQueue; private final SampleMetadataQueue sampleMetadataQueue;
private final FormatHolder formatHolder; private final FormatHolder formatHolder;
private final DecoderInputBuffer sampleHolder; private final DecoderInputBuffer sampleHolderWithBufferReplacementDisabled;
private final DecoderInputBuffer noDataBuffer; private final DecoderInputBuffer sampleHolderWithBufferReplacementEnabled;
private final Set<Integer> selectedTrackIndices; private final Set<Integer> selectedTrackIndices;
private boolean hasBeenPrepared; private boolean hasBeenPrepared;
@ -188,8 +188,9 @@ public final class MediaExtractorCompat {
sampleQueues = new SparseArray<>(); sampleQueues = new SparseArray<>();
sampleMetadataQueue = new SampleMetadataQueue(); sampleMetadataQueue = new SampleMetadataQueue();
formatHolder = new FormatHolder(); formatHolder = new FormatHolder();
sampleHolder = new DecoderInputBuffer(DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_DISABLED); sampleHolderWithBufferReplacementDisabled = DecoderInputBuffer.newNoDataInstance();
noDataBuffer = DecoderInputBuffer.newNoDataInstance(); sampleHolderWithBufferReplacementEnabled =
new DecoderInputBuffer(DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_DIRECT);
selectedTrackIndices = new HashSet<>(); selectedTrackIndices = new HashSet<>();
} }
@ -428,7 +429,8 @@ public final class MediaExtractorCompat {
/** Returns the track {@link MediaFormat} at the specified {@code trackIndex}. */ /** Returns the track {@link MediaFormat} at the specified {@code trackIndex}. */
public MediaFormat getTrackFormat(int trackIndex) { public MediaFormat getTrackFormat(int trackIndex) {
MediaExtractorTrack track = tracks.get(trackIndex); MediaExtractorTrack track = tracks.get(trackIndex);
MediaFormat mediaFormat = track.createDownstreamMediaFormat(formatHolder, noDataBuffer); MediaFormat mediaFormat =
track.createDownstreamMediaFormat(formatHolder, sampleHolderWithBufferReplacementDisabled);
long trackDurationUs = track.sampleQueue.trackDurationUs; long trackDurationUs = track.sampleQueue.trackDurationUs;
if (trackDurationUs != C.TIME_UNSET) { if (trackDurationUs != C.TIME_UNSET) {
mediaFormat.setLong(MediaFormat.KEY_DURATION, trackDurationUs); mediaFormat.setLong(MediaFormat.KEY_DURATION, trackDurationUs);
@ -542,11 +544,11 @@ public final class MediaExtractorCompat {
// The platform media extractor implementation ignores the buffer's input position and limit. // The platform media extractor implementation ignores the buffer's input position and limit.
buffer.position(offset); buffer.position(offset);
buffer.limit(buffer.capacity()); buffer.limit(buffer.capacity());
sampleHolder.data = buffer; sampleHolderWithBufferReplacementDisabled.data = buffer;
peekNextSelectedTrackSample(sampleHolder); peekNextSelectedTrackSample(sampleHolderWithBufferReplacementDisabled);
buffer.flip(); buffer.flip();
buffer.position(offset); buffer.position(offset);
sampleHolder.data = null; sampleHolderWithBufferReplacementDisabled.data = null;
return buffer.remaining(); return buffer.remaining();
} }
@ -566,7 +568,11 @@ public final class MediaExtractorCompat {
if (!advanceToSampleOrEndOfInput()) { if (!advanceToSampleOrEndOfInput()) {
return -1; return -1;
} }
return sampleMetadataQueue.peekFirst().size; peekNextSelectedTrackSample(sampleHolderWithBufferReplacementEnabled);
ByteBuffer buffer = checkNotNull(sampleHolderWithBufferReplacementEnabled.data);
int sampleSize = buffer.position();
buffer.position(0);
return sampleSize;
} }
/** /**
@ -611,7 +617,8 @@ public final class MediaExtractorCompat {
@Nullable @Nullable
public DrmInitData getDrmInitData() { public DrmInitData getDrmInitData() {
for (int i = 0; i < tracks.size(); i++) { for (int i = 0; i < tracks.size(); i++) {
Format format = tracks.get(i).getFormat(formatHolder, noDataBuffer); Format format =
tracks.get(i).getFormat(formatHolder, sampleHolderWithBufferReplacementDisabled);
if (format.drmInitData == null) { if (format.drmInitData == null) {
continue; continue;
} }
@ -676,7 +683,8 @@ public final class MediaExtractorCompat {
currentExtractor.getUnderlyingImplementation().getClass().getSimpleName()); currentExtractor.getUnderlyingImplementation().getClass().getSimpleName());
} }
if (!tracks.isEmpty()) { if (!tracks.isEmpty()) {
Format format = tracks.get(0).getFormat(formatHolder, noDataBuffer); Format format =
tracks.get(0).getFormat(formatHolder, sampleHolderWithBufferReplacementDisabled);
if (format.containerMimeType != null) { if (format.containerMimeType != null) {
bundle.putString(MediaExtractor.MetricsConstants.MIME_TYPE, format.containerMimeType); bundle.putString(MediaExtractor.MetricsConstants.MIME_TYPE, format.containerMimeType);
} }
@ -1056,7 +1064,7 @@ public final class MediaExtractorCompat {
super.sampleMetadata(timeUs, flags, size, offset, cryptoData); super.sampleMetadata(timeUs, flags, size, offset, cryptoData);
// Add the sample metadata if the sample was committed // Add the sample metadata if the sample was committed
if (this.getWriteIndex() == writeIndexBeforeCommitting + 1) { if (this.getWriteIndex() == writeIndexBeforeCommitting + 1) {
queueSampleMetadata(timeUs, flags, size); queueSampleMetadata(timeUs, flags);
} }
} }
@ -1067,7 +1075,7 @@ public final class MediaExtractorCompat {
trackId, mainTrackIndex, compatibilityTrackIndex); trackId, mainTrackIndex, compatibilityTrackIndex);
} }
private void queueSampleMetadata(long timeUs, @C.BufferFlags int flags, int size) { private void queueSampleMetadata(long timeUs, @C.BufferFlags int flags) {
int mediaExtractorFlags = 0; int mediaExtractorFlags = 0;
mediaExtractorFlags |= mediaExtractorFlags |=
(flags & C.BUFFER_FLAG_ENCRYPTED) != 0 ? MediaExtractor.SAMPLE_FLAG_ENCRYPTED : 0; (flags & C.BUFFER_FLAG_ENCRYPTED) != 0 ? MediaExtractor.SAMPLE_FLAG_ENCRYPTED : 0;
@ -1076,9 +1084,9 @@ public final class MediaExtractorCompat {
if (compatibilityTrackIndex != C.INDEX_UNSET) { if (compatibilityTrackIndex != C.INDEX_UNSET) {
sampleMetadataQueue.addLast( sampleMetadataQueue.addLast(
timeUs, /* flags= */ mediaExtractorFlags, size, compatibilityTrackIndex); timeUs, /* flags= */ mediaExtractorFlags, compatibilityTrackIndex);
} }
sampleMetadataQueue.addLast(timeUs, /* flags= */ mediaExtractorFlags, size, mainTrackIndex); sampleMetadataQueue.addLast(timeUs, /* flags= */ mediaExtractorFlags, mainTrackIndex);
} }
} }
@ -1103,11 +1111,10 @@ public final class MediaExtractorCompat {
* *
* @param timeUs The media timestamp associated with the sample, in microseconds. * @param timeUs The media timestamp associated with the sample, in microseconds.
* @param flags Flags associated with the sample. See {@code MediaExtractor.SAMPLE_FLAG_*}. * @param flags Flags associated with the sample. See {@code MediaExtractor.SAMPLE_FLAG_*}.
* @param size The size of the sample data, in bytes.
* @param trackIndex Track index of the sample. * @param trackIndex Track index of the sample.
*/ */
public void addLast(long timeUs, int flags, long size, int trackIndex) { public void addLast(long timeUs, int flags, int trackIndex) {
SampleMetadata metadata = obtainSampleMetadata(timeUs, flags, size, trackIndex); SampleMetadata metadata = obtainSampleMetadata(timeUs, flags, trackIndex);
sampleMetadataQueue.addLast(metadata); sampleMetadataQueue.addLast(metadata);
} }
@ -1144,29 +1151,27 @@ public final class MediaExtractorCompat {
return sampleMetadataQueue.isEmpty(); return sampleMetadataQueue.isEmpty();
} }
private SampleMetadata obtainSampleMetadata(long timeUs, int flags, long size, int trackIndex) { private SampleMetadata obtainSampleMetadata(long timeUs, int flags, int trackIndex) {
SampleMetadata metadata = SampleMetadata metadata =
sampleMetadataPool.isEmpty() sampleMetadataPool.isEmpty()
? new SampleMetadata(timeUs, flags, size, trackIndex) ? new SampleMetadata(timeUs, flags, trackIndex)
: sampleMetadataPool.pop(); : sampleMetadataPool.pop();
metadata.set(timeUs, flags, size, trackIndex); metadata.set(timeUs, flags, trackIndex);
return metadata; return metadata;
} }
private static final class SampleMetadata { private static final class SampleMetadata {
public int flags; public int flags;
public long size;
public long timeUs; public long timeUs;
public int trackIndex; public int trackIndex;
public SampleMetadata(long timeUs, int flags, long size, int trackIndex) { public SampleMetadata(long timeUs, int flags, int trackIndex) {
set(timeUs, flags, size, trackIndex); set(timeUs, flags, trackIndex);
} }
public void set(long timeUs, int flags, long size, int trackIndex) { public void set(long timeUs, int flags, int trackIndex) {
this.timeUs = timeUs; this.timeUs = timeUs;
this.flags = flags; this.flags = flags;
this.size = size;
this.trackIndex = trackIndex; this.trackIndex = trackIndex;
} }
} }