Skip to content

SDK / exoplayer

Go to a project
Commit 1bf1790e by aquilescanta Committed by AquilesCanta
Options

Extract factory method for FragmentedMp4Extractor in DefaultHlsExtractorFactory 

PiperOrigin-RevId: 243582468
parent 2e3eac25
Inline Side-by-side
Showing with 21 additions and 12 deletions
library/dash/src/main/proguard-rules.txt 0 → 120000
../../proguard-rules.txt
\ No newline at end of file
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.source.hls; package com.google.android.exoplayer2.source.hls;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
...@@ -157,12 +158,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -157,12 +158,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
if (!(extractorByFileExtension instanceof FragmentedMp4Extractor)) { if (!(extractorByFileExtension instanceof FragmentedMp4Extractor)) {
FragmentedMp4Extractor fragmentedMp4Extractor = FragmentedMp4Extractor fragmentedMp4Extractor =
new FragmentedMp4Extractor( createFragmentedMp4Extractor(timestampAdjuster, drmInitData, muxedCaptionFormats);
/* flags= */ 0,
timestampAdjuster,
/* sideloadedTrack= */ null,
drmInitData,
muxedCaptionFormats != null ? muxedCaptionFormats : Collections.emptyList());
if (sniffQuietly(fragmentedMp4Extractor, extractorInput)) { if (sniffQuietly(fragmentedMp4Extractor, extractorInput)) {
return buildResult(fragmentedMp4Extractor); return buildResult(fragmentedMp4Extractor);
} }
...@@ -212,12 +208,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -212,12 +208,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
|| lastPathSegment.startsWith(M4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 4) || lastPathSegment.startsWith(M4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 4)
|| lastPathSegment.startsWith(MP4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5) || lastPathSegment.startsWith(MP4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)
|| lastPathSegment.startsWith(CMF_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)) { || lastPathSegment.startsWith(CMF_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 5)) {
return new FragmentedMp4Extractor( return createFragmentedMp4Extractor(timestampAdjuster, drmInitData, muxedCaptionFormats);
/* flags= */ 0,
timestampAdjuster,
/* sideloadedTrack= */ null,
drmInitData,
muxedCaptionFormats != null ? muxedCaptionFormats : Collections.emptyList());
} else { } else {
// For any other file extension, we assume TS format. // For any other file extension, we assume TS format.
return createTsExtractor( return createTsExtractor(
...@@ -274,6 +265,18 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -274,6 +265,18 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
new DefaultTsPayloadReaderFactory(payloadReaderFactoryFlags, muxedCaptionFormats)); new DefaultTsPayloadReaderFactory(payloadReaderFactoryFlags, muxedCaptionFormats));
} }
private static FragmentedMp4Extractor createFragmentedMp4Extractor(
TimestampAdjuster timestampAdjuster,
DrmInitData drmInitData,
@Nullable List<Format> muxedCaptionFormats) {
return new FragmentedMp4Extractor(
/* flags= */ 0,
timestampAdjuster,
/* sideloadedTrack= */ null,
drmInitData,
muxedCaptionFormats != null ? muxedCaptionFormats : Collections.emptyList());
}
private static Result buildResultForSameExtractorType( private static Result buildResultForSameExtractorType(
Extractor previousExtractor, Format format, TimestampAdjuster timestampAdjuster) { Extractor previousExtractor, Format format, TimestampAdjuster timestampAdjuster) {
if (previousExtractor instanceof WebvttExtractor) { if (previousExtractor instanceof WebvttExtractor) {
......
library/hls/src/main/proguard-rules.txt 0 → 120000
../../proguard-rules.txt
\ No newline at end of file
library/smoothstreaming/src/main/proguard-rules.txt 0 → 120000
../../proguard-rules.txt
\ No newline at end of file
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