sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge the handling of FileDataSourceException and DataSourceException.

Browse source 
FileDataSourceException subclasses DataSourceException and can be handled
in the same fashion.

PiperOrigin-RevId: 385983103
This commit is contained in:
claincly 2021-07-21 12:45:02 +01:00 committed by Ian Baker
parent e4c9078a0c
commit 6f504264e0
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View file

@ -49,7 +49,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelectorResult; import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.BandwidthMeter;
import com.google.android.exoplayer2.upstream.DataSourceException; import com.google.android.exoplayer2.upstream.DataSourceException;
import com.google.android.exoplayer2.upstream.FileDataSource;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.HandlerWrapper; import com.google.android.exoplayer2.util.HandlerWrapper;
@ -577,8 +576,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
} }
} catch (DrmSession.DrmSessionException e) { } catch (DrmSession.DrmSessionException e) {
handleIoException(e, e.errorCode); handleIoException(e, e.errorCode);
} catch (FileDataSource.FileDataSourceException e) {
handleIoException(e, e.reason);
} catch (ParserException e) { } catch (ParserException e) {
@ErrorCode int errorCode; @ErrorCode int errorCode;
if (e.dataType == C.DATA_TYPE_MEDIA) { if (e.dataType == C.DATA_TYPE_MEDIA) {