Some fixes
This commit is contained in:
parent
4fd8d42d85
commit
e475348d39
|
@ -100,7 +100,9 @@ import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
|
|||
import com.google.android.exoplayer2.ui.DefaultTimeBar;
|
||||
import com.google.android.exoplayer2.ui.PlayerControlView;
|
||||
import com.google.android.exoplayer2.upstream.DataSource;
|
||||
import com.google.android.exoplayer2.upstream.DataSpec;
|
||||
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
|
||||
import com.google.android.exoplayer2.upstream.FileDataSource;
|
||||
import com.google.android.exoplayer2.util.MimeTypes;
|
||||
import com.google.android.exoplayer2.util.Util;
|
||||
import com.google.android.exoplayer2.video.VideoListener;
|
||||
|
@ -251,6 +253,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
|
|||
|
||||
@Override
|
||||
public void onStreamProgress(Torrent torrent, StreamStatus status) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -1339,9 +1342,22 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
|
|||
ProgressiveMediaSource videoSource = null;
|
||||
HlsMediaSource hlsMediaSource = null;
|
||||
SingleSampleMediaSource subtitleSource = null;
|
||||
if (video_cache == 0) {
|
||||
DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
|
||||
Util.getUserAgent(PeertubeActivity.this, null), null);
|
||||
DataSource.Factory dataSourceFactory = null;
|
||||
if (localTorrentUrl != null) {
|
||||
DataSpec dataSpec = new DataSpec(Uri.fromFile(new java.io.File(localTorrentUrl)));
|
||||
FileDataSource fileDataSource = new FileDataSource();
|
||||
try {
|
||||
fileDataSource.open(dataSpec);
|
||||
} catch (FileDataSource.FileDataSourceException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
dataSourceFactory = () -> fileDataSource;
|
||||
}
|
||||
if (video_cache == 0 || dataSourceFactory != null) {
|
||||
if (dataSourceFactory == null) {
|
||||
dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
|
||||
Util.getUserAgent(PeertubeActivity.this, null), null);
|
||||
}
|
||||
|
||||
if (subtitles != null) {
|
||||
MediaItem.Subtitle mediaSubtitle = new MediaItem.Subtitle(subtitles, MimeTypes.TEXT_VTT, lang);
|
||||
|
|
Loading…
Reference in New Issue