diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java index ef4649f4d..562be590b 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java @@ -227,10 +227,15 @@ public class AndroidMediaPlayer extends AbstractMediaPlayer implements MediaPlay @Override public int getSelectedTrack(int type) { - try { - return mMediaPlayer.getSelectedTrack(type); - } catch (Exception e) { - return 0; + switch (type) { + case ITrackInfo.MEDIA_TRACK_TYPE_VIDEO: + return mMediaPlayer.getSelectedTrack(MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_VIDEO); + case ITrackInfo.MEDIA_TRACK_TYPE_AUDIO: + return mMediaPlayer.getSelectedTrack(MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_AUDIO); + case ITrackInfo.MEDIA_TRACK_TYPE_TEXT: + return mMediaPlayer.getSelectedTrack(MediaPlayer.TrackInfo.MEDIA_TRACK_TYPE_TIMEDTEXT); + default: + return -1; } } diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java index 68a8ffbfc..dc8bc8bd0 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java @@ -453,8 +453,8 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { } @Override - public int getSelectedTrack(int trackType) { - switch (trackType) { + public int getSelectedTrack(int type) { + switch (type) { case ITrackInfo.MEDIA_TRACK_TYPE_VIDEO: return (int) _getPropertyLong(FFP_PROP_INT64_SELECTED_VIDEO_STREAM, -1); case ITrackInfo.MEDIA_TRACK_TYPE_AUDIO: