loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-04 22:20:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use outputStreamEnded for MetadataRenderer#isEnded

Browse Source 
Issue: #8710
PiperOrigin-RevId: 366051836
This commit is contained in:
ibaker 2021-03-31 17:35:17 +01:00 committed by marcbaechinger
parent 6d0a04dd87
commit e8742b33dd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -77,6 +77,9 @@
spec ([#8704](https://github.com/google/ExoPlayer/issues/8704)). spec ([#8704](https://github.com/google/ExoPlayer/issues/8704)).
* Support TTML `textEmphasis` attributes, used for Japanese boutens. * Support TTML `textEmphasis` attributes, used for Japanese boutens.
* Support TTML `shear` attributes. * Support TTML `shear` attributes.
* Metadata:
* Ensure that timed metadata near the end of a period is not dropped
([#8710](https://github.com/google/ExoPlayer/issues/8710)).
* MediaSession extension: Remove dependency to core module and rely on common * MediaSession extension: Remove dependency to core module and rely on common
only. The `TimelineQueueEditor` uses a new `MediaDescriptionConverter` for only. The `TimelineQueueEditor` uses a new `MediaDescriptionConverter` for
this purpose and does not rely on the `ConcatenatingMediaSource` anymore. this purpose and does not rely on the `ConcatenatingMediaSource` anymore.

7
library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
View File

@ -58,6 +58,7 @@ public final class MetadataRenderer extends BaseRenderer implements Callback {
private int pendingMetadataCount; private int pendingMetadataCount;
@Nullable private MetadataDecoder decoder; @Nullable private MetadataDecoder decoder;
private boolean inputStreamEnded; private boolean inputStreamEnded;
private boolean outputStreamEnded;
private long subsampleOffsetUs; private long subsampleOffsetUs;
/** /**
@ -118,6 +119,7 @@ public final class MetadataRenderer extends BaseRenderer implements Callback {
protected void onPositionReset(long positionUs, boolean joining) { protected void onPositionReset(long positionUs, boolean joining) {
flushPendingMetadata(); flushPendingMetadata();
inputStreamEnded = false; inputStreamEnded = false;
outputStreamEnded = false;
} }
@Override @Override
@ -158,6 +160,9 @@ public final class MetadataRenderer extends BaseRenderer implements Callback {
pendingMetadataIndex = (pendingMetadataIndex + 1) % MAX_PENDING_METADATA_COUNT; pendingMetadataIndex = (pendingMetadataIndex + 1) % MAX_PENDING_METADATA_COUNT;
pendingMetadataCount--; pendingMetadataCount--;
} }
if (inputStreamEnded && pendingMetadataCount == 0) {
outputStreamEnded = true;
}
} }
/** /**
@ -198,7 +203,7 @@ public final class MetadataRenderer extends BaseRenderer implements Callback {
@Override @Override
public boolean isEnded() { public boolean isEnded() {
return inputStreamEnded; return outputStreamEnded;
} }
@Override @Override