Commit 127bcd18 by Oliver Woodman

Bring internal/external branches closer.

- Unredact internal error ids.
- Move images.
parent bc303b73
...@@ -268,7 +268,7 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer { ...@@ -268,7 +268,7 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
@Override @Override
protected void seekTo(long positionUs) throws ExoPlaybackException { protected void seekTo(long positionUs) throws ExoPlaybackException {
super.seekTo(positionUs); super.seekTo(positionUs);
// TODO: Try and re-use the same AudioTrack instance once [redacted] is fixed. // TODO: Try and re-use the same AudioTrack instance once [Internal: b/7941810] is fixed.
audioTrack.reset(); audioTrack.reset();
currentPositionUs = Long.MIN_VALUE; currentPositionUs = Long.MIN_VALUE;
} }
......
...@@ -467,7 +467,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer { ...@@ -467,7 +467,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
waitingForFirstSyncFrame = true; waitingForFirstSyncFrame = true;
decodeOnlyPresentationTimestamps.clear(); decodeOnlyPresentationTimestamps.clear();
// Workaround for framework bugs. // Workaround for framework bugs.
// See [redacted], [redacted], [redacted]. // See [Internal: b/8347958], [Internal: b/8578467], [Internal: b/8543366].
if (Util.SDK_INT >= 18) { if (Util.SDK_INT >= 18) {
codec.flush(); codec.flush();
} else { } else {
......
...@@ -103,7 +103,7 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer { ...@@ -103,7 +103,7 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
} }
// TODO: Use MediaFormat constants if these get exposed through the API. See [redacted]. // TODO: Use MediaFormat constants if these get exposed through the API. See [Internal: b/14127601].
private static final String KEY_CROP_LEFT = "crop-left"; private static final String KEY_CROP_LEFT = "crop-left";
private static final String KEY_CROP_RIGHT = "crop-right"; private static final String KEY_CROP_RIGHT = "crop-right";
private static final String KEY_CROP_BOTTOM = "crop-bottom"; private static final String KEY_CROP_BOTTOM = "crop-bottom";
......
...@@ -583,7 +583,7 @@ public final class FragmentedMp4Extractor implements Extractor { ...@@ -583,7 +583,7 @@ public final class FragmentedMp4Extractor implements Extractor {
if (atomType == Atom.TYPE_mp4a || atomType == Atom.TYPE_enca) { if (atomType == Atom.TYPE_mp4a || atomType == Atom.TYPE_enca) {
if (childAtomType == Atom.TYPE_esds) { if (childAtomType == Atom.TYPE_esds) {
initializationData = parseEsdsFromParent(parent, childStartPosition); initializationData = parseEsdsFromParent(parent, childStartPosition);
// TODO: Do we really need to do this? See [redacted] // TODO: Do we really need to do this? See [Internal: b/10903778]
// Update sampleRate and channelCount from the AudioSpecificConfig initialization data. // Update sampleRate and channelCount from the AudioSpecificConfig initialization data.
Pair<Integer, Integer> audioSpecificConfig = Pair<Integer, Integer> audioSpecificConfig =
CodecSpecificDataUtil.parseAudioSpecificConfig(initializationData); CodecSpecificDataUtil.parseAudioSpecificConfig(initializationData);
......
...@@ -247,7 +247,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback { ...@@ -247,7 +247,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback {
@Override @Override
protected boolean isReady() { protected boolean isReady() {
// Don't block playback whilst subtitles are loading. // Don't block playback whilst subtitles are loading.
// Note: To change this behavior, it will be necessary to consider [redacted]. // Note: To change this behavior, it will be necessary to consider [Internal: b/12949941].
return true; return true;
} }
......
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