Commit 00e903b3 by olly Committed by Oliver Woodman

Don't pass maxWidth/Height for non-video streams.

This is a no-op change for clarity only. maxWidth/maxHeight
don't mean anything for AAC/MP3, so it makes sense to pass
MediaFormat.NO_VALUE in all cases.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=111619832
parent 65199698
...@@ -355,11 +355,11 @@ public class HlsChunkSource { ...@@ -355,11 +355,11 @@ public class HlsChunkSource {
if (chunkUri.getLastPathSegment().endsWith(AAC_FILE_EXTENSION)) { if (chunkUri.getLastPathSegment().endsWith(AAC_FILE_EXTENSION)) {
Extractor extractor = new AdtsExtractor(startTimeUs); Extractor extractor = new AdtsExtractor(startTimeUs);
extractorWrapper = new HlsExtractorWrapper(trigger, format, startTimeUs, extractor, extractorWrapper = new HlsExtractorWrapper(trigger, format, startTimeUs, extractor,
switchingVariantSpliced, adaptiveMaxWidth, adaptiveMaxHeight); switchingVariantSpliced, MediaFormat.NO_VALUE, MediaFormat.NO_VALUE);
} else if (chunkUri.getLastPathSegment().endsWith(MP3_FILE_EXTENSION)) { } else if (chunkUri.getLastPathSegment().endsWith(MP3_FILE_EXTENSION)) {
Extractor extractor = new Mp3Extractor(startTimeUs); Extractor extractor = new Mp3Extractor(startTimeUs);
extractorWrapper = new HlsExtractorWrapper(trigger, format, startTimeUs, extractor, extractorWrapper = new HlsExtractorWrapper(trigger, format, startTimeUs, extractor,
switchingVariantSpliced, adaptiveMaxWidth, adaptiveMaxHeight); switchingVariantSpliced, MediaFormat.NO_VALUE, MediaFormat.NO_VALUE);
} else if (previousTsChunk == null } else if (previousTsChunk == null
|| previousTsChunk.discontinuitySequenceNumber != segment.discontinuitySequenceNumber || previousTsChunk.discontinuitySequenceNumber != segment.discontinuitySequenceNumber
|| !format.equals(previousTsChunk.format)) { || !format.equals(previousTsChunk.format)) {
......
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