mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 16:40:32 +00:00
Merge pull request #7555 from litetex/remove-mediaparser
Remove/Revert MediaParser support (Android 11+) due to bugs
This commit is contained in:
commit
f6cad2d9cf
@ -1,18 +1,14 @@
|
|||||||
package org.schabi.newpipe.player.helper;
|
package org.schabi.newpipe.player.helper;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Build;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import com.google.android.exoplayer2.source.MediaParserExtractorAdapter;
|
|
||||||
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
|
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
|
||||||
import com.google.android.exoplayer2.source.SingleSampleMediaSource;
|
import com.google.android.exoplayer2.source.SingleSampleMediaSource;
|
||||||
import com.google.android.exoplayer2.source.chunk.MediaParserChunkExtractor;
|
|
||||||
import com.google.android.exoplayer2.source.dash.DashMediaSource;
|
import com.google.android.exoplayer2.source.dash.DashMediaSource;
|
||||||
import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource;
|
import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource;
|
||||||
import com.google.android.exoplayer2.source.hls.HlsMediaSource;
|
import com.google.android.exoplayer2.source.hls.HlsMediaSource;
|
||||||
import com.google.android.exoplayer2.source.hls.MediaParserHlsMediaChunkExtractor;
|
|
||||||
import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource;
|
import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource;
|
||||||
import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
|
import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
|
||||||
import com.google.android.exoplayer2.upstream.DataSource;
|
import com.google.android.exoplayer2.upstream.DataSource;
|
||||||
@ -46,17 +42,10 @@ public class PlayerDataSource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public HlsMediaSource.Factory getLiveHlsMediaSourceFactory() {
|
public HlsMediaSource.Factory getLiveHlsMediaSourceFactory() {
|
||||||
final HlsMediaSource.Factory factory =
|
return new HlsMediaSource.Factory(cachelessDataSourceFactory)
|
||||||
new HlsMediaSource.Factory(cachelessDataSourceFactory)
|
.setAllowChunklessPreparation(true)
|
||||||
.setAllowChunklessPreparation(true)
|
.setLoadErrorHandlingPolicy(
|
||||||
.setLoadErrorHandlingPolicy(
|
new DefaultLoadErrorHandlingPolicy(MANIFEST_MINIMUM_RETRY));
|
||||||
new DefaultLoadErrorHandlingPolicy(MANIFEST_MINIMUM_RETRY));
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
|
||||||
factory.setExtractorFactory(MediaParserHlsMediaChunkExtractor.FACTORY);
|
|
||||||
}
|
|
||||||
|
|
||||||
return factory;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DashMediaSource.Factory getLiveDashMediaSourceFactory() {
|
public DashMediaSource.Factory getLiveDashMediaSourceFactory() {
|
||||||
@ -71,26 +60,11 @@ public class PlayerDataSource {
|
|||||||
private DefaultDashChunkSource.Factory getDefaultDashChunkSourceFactory(
|
private DefaultDashChunkSource.Factory getDefaultDashChunkSourceFactory(
|
||||||
final DataSource.Factory dataSourceFactory
|
final DataSource.Factory dataSourceFactory
|
||||||
) {
|
) {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
|
||||||
return new DefaultDashChunkSource.Factory(
|
|
||||||
MediaParserChunkExtractor.FACTORY,
|
|
||||||
dataSourceFactory,
|
|
||||||
1
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new DefaultDashChunkSource.Factory(dataSourceFactory);
|
return new DefaultDashChunkSource.Factory(dataSourceFactory);
|
||||||
}
|
}
|
||||||
|
|
||||||
public HlsMediaSource.Factory getHlsMediaSourceFactory() {
|
public HlsMediaSource.Factory getHlsMediaSourceFactory() {
|
||||||
final HlsMediaSource.Factory factory = new HlsMediaSource.Factory(cacheDataSourceFactory);
|
return new HlsMediaSource.Factory(cacheDataSourceFactory);
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
|
|
||||||
return factory;
|
|
||||||
}
|
|
||||||
|
|
||||||
// *** >= Android 11 / R / API 30 ***
|
|
||||||
return factory.setExtractorFactory(MediaParserHlsMediaChunkExtractor.FACTORY);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DashMediaSource.Factory getDashMediaSourceFactory() {
|
public DashMediaSource.Factory getDashMediaSourceFactory() {
|
||||||
@ -101,18 +75,9 @@ public class PlayerDataSource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ProgressiveMediaSource.Factory getExtractorMediaSourceFactory() {
|
public ProgressiveMediaSource.Factory getExtractorMediaSourceFactory() {
|
||||||
final ProgressiveMediaSource.Factory factory;
|
return new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
.setLoadErrorHandlingPolicy(
|
||||||
factory = new ProgressiveMediaSource.Factory(
|
new DefaultLoadErrorHandlingPolicy(EXTRACTOR_MINIMUM_RETRY));
|
||||||
cacheDataSourceFactory,
|
|
||||||
MediaParserExtractorAdapter.FACTORY
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
factory = new ProgressiveMediaSource.Factory(cacheDataSourceFactory);
|
|
||||||
}
|
|
||||||
|
|
||||||
return factory.setLoadErrorHandlingPolicy(
|
|
||||||
new DefaultLoadErrorHandlingPolicy(EXTRACTOR_MINIMUM_RETRY));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public SingleSampleMediaSource.Factory getSampleMediaSourceFactory() {
|
public SingleSampleMediaSource.Factory getSampleMediaSourceFactory() {
|
||||||
|
Loading…
Reference in New Issue
Block a user