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

Merge pull request #1871 from colinkho:cmc

Browse Source 
PiperOrigin-RevId: 707528211
This commit is contained in:
Copybara-Service 2024-12-18 06:32:41 -08:00
commit 2f507650cc
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/ContainerMediaChunk.java
View File

@ -29,6 +29,7 @@ import androidx.media3.extractor.DefaultExtractorInput;
import androidx.media3.extractor.Extractor; import androidx.media3.extractor.Extractor;
import androidx.media3.extractor.ExtractorInput; import androidx.media3.extractor.ExtractorInput;
import androidx.media3.extractor.TrackOutput; import androidx.media3.extractor.TrackOutput;
import com.google.errorprone.annotations.ForOverride;
import java.io.IOException; import java.io.IOException;
/** A {@link BaseMediaChunk} that uses an {@link Extractor} to decode sample data. */ /** A {@link BaseMediaChunk} that uses an {@link Extractor} to decode sample data. */
@ -135,6 +136,7 @@ public class ContainerMediaChunk extends BaseMediaChunk {
nextLoadPosition = input.getPosition() - dataSpec.position; nextLoadPosition = input.getPosition() - dataSpec.position;
} }
} finally { } finally {
onLoadEnded();
DataSourceUtil.closeQuietly(dataSource); DataSourceUtil.closeQuietly(dataSource);
} }
loadCompleted = !loadCanceled; loadCompleted = !loadCanceled;
@ -151,6 +153,23 @@ public class ContainerMediaChunk extends BaseMediaChunk {
return baseMediaChunkOutput; return baseMediaChunkOutput;
} }
/**
* Method that is called to signal that a {@link #load()} has concluded. This is called in both
* successful and error scenarios before the {@link DataSource} is closed.
*/
@ForOverride
protected void onLoadEnded() {}
/** Returns whether the current chunk's load has been canceled from {@link #cancelLoad()}. */
public final boolean isLoadCanceled() {
return loadCanceled;
}
/** Returns the next position to load in the chunk on a {@link #load()}. */
public final long getNextLoadPosition() {
return nextLoadPosition;
}
private void maybeWriteEmptySamples(BaseMediaChunkOutput output) { private void maybeWriteEmptySamples(BaseMediaChunkOutput output) {
if (!MimeTypes.isImage(trackFormat.containerMimeType)) { if (!MimeTypes.isImage(trackFormat.containerMimeType)) {
return; return;