|
5 | 5 |
|
6 | 6 | import android.content.Context; |
7 | 7 | import android.net.Uri; |
8 | | -import android.os.Build; |
9 | 8 | import android.view.Surface; |
10 | 9 | import com.google.android.exoplayer2.C; |
11 | 10 | import com.google.android.exoplayer2.ExoPlaybackException; |
|
16 | 15 | import com.google.android.exoplayer2.SimpleExoPlayer; |
17 | 16 | import com.google.android.exoplayer2.audio.AudioAttributes; |
18 | 17 | import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; |
19 | | -import com.google.android.exoplayer2.source.ExtractorMediaSource; |
20 | 18 | import com.google.android.exoplayer2.source.MediaSource; |
| 19 | +import com.google.android.exoplayer2.source.ProgressiveMediaSource; |
21 | 20 | import com.google.android.exoplayer2.source.dash.DashMediaSource; |
22 | 21 | import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource; |
23 | 22 | import com.google.android.exoplayer2.source.hls.HlsMediaSource; |
@@ -137,8 +136,8 @@ private MediaSource buildMediaSource( |
137 | 136 | case C.TYPE_HLS: |
138 | 137 | return new HlsMediaSource.Factory(mediaDataSourceFactory).createMediaSource(uri); |
139 | 138 | case C.TYPE_OTHER: |
140 | | - return new ExtractorMediaSource.Factory(mediaDataSourceFactory) |
141 | | - .setExtractorsFactory(new DefaultExtractorsFactory()) |
| 139 | + return new ProgressiveMediaSource.Factory( |
| 140 | + mediaDataSourceFactory, new DefaultExtractorsFactory()) |
142 | 141 | .createMediaSource(uri); |
143 | 142 | default: |
144 | 143 | { |
@@ -208,14 +207,9 @@ void sendBufferingUpdate() { |
208 | 207 | eventSink.success(event); |
209 | 208 | } |
210 | 209 |
|
211 | | - @SuppressWarnings("deprecation") |
212 | 210 | private static void setAudioAttributes(SimpleExoPlayer exoPlayer) { |
213 | | - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { |
214 | | - exoPlayer.setAudioAttributes( |
215 | | - new AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_MOVIE).build()); |
216 | | - } else { |
217 | | - exoPlayer.setAudioStreamType(C.STREAM_TYPE_MUSIC); |
218 | | - } |
| 211 | + exoPlayer.setAudioAttributes( |
| 212 | + new AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_MOVIE).build()); |
219 | 213 | } |
220 | 214 |
|
221 | 215 | void play() { |
|
0 commit comments