完善异常处理

Author: jiajunhui

exoplayer/build.gradle

@@ -34,6 +34,6 @@ dependencies {
     api "com.google.android.exoplayer:exoplayer-dash:$exoplayersdkVersion"
     api "com.google.android.exoplayer:exoplayer-hls:$exoplayersdkVersion"
     api "com.google.android.exoplayer:exoplayer-smoothstreaming:$exoplayersdkVersion"
-    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
-//    api project(':playerbase')
+//    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
+    api project(':playerbase')
 }

exoplayer/src/main/java/com/kk/taurus/exoplayer/ExoMediaPlayer.java

@@ -517,11 +517,23 @@ public void onPlayerError(ExoPlaybackException error) {
                     submitErrorEvent(OnErrorEventListener.ERROR_EVENT_IO, bundle);
                     break;
                 case ExoPlaybackException.TYPE_RENDERER:
-                    submitErrorEvent(OnErrorEventListener.ERROR_EVENT_COMMON, bundle);
+                    submitErrorEvent(OnErrorEventListener.ERROR_EVENT_RENDER, bundle);
                     break;
                 case ExoPlaybackException.TYPE_UNEXPECTED:
                     submitErrorEvent(OnErrorEventListener.ERROR_EVENT_UNKNOWN, bundle);
                     break;
+                case ExoPlaybackException.TYPE_REMOTE:
+                    submitErrorEvent(OnErrorEventListener.ERROR_EVENT_REMOTE, bundle);
+                    break;
+                case ExoPlaybackException.TYPE_OUT_OF_MEMORY:
+                    submitErrorEvent(OnErrorEventListener.ERROR_EVENT_OUT_OF_MEMORY, bundle);
+                    break;
+                case ExoPlaybackException.TYPE_TIMEOUT:
+                    submitErrorEvent(OnErrorEventListener.ERROR_EVENT_TIMED_OUT, bundle);
+                    break;
+                default:
+                    submitErrorEvent(OnErrorEventListener.ERROR_EVENT_COMMON, bundle);
+                    break;
             }
         }
 

ijkplayer/build.gradle

@@ -31,6 +31,6 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     api "tv.danmaku.ijk.media:ijkplayer-java:$ijksdkVersion"
-    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
-//    api project(':playerbase')
+//    api "com.kk.taurus.playerbase:playerbase:$playerbaseVersion"
+    api project(':playerbase')
 }

ijkplayer/src/main/java/com/kk/taurus/ijkplayer/IjkPlayer.java

@@ -194,7 +194,7 @@ private void openVideo(DataSource dataSource) {
             e.printStackTrace();
             updateStatus(STATE_ERROR);
             mTargetState = STATE_ERROR;
-            submitErrorEvent(OnErrorEventListener.ERROR_EVENT_COMMON, null);
+            submitErrorEvent(OnErrorEventListener.ERROR_EVENT_IO, null);
         }
     }
 
@@ -368,7 +368,10 @@ public void setDisplay(SurfaceHolder surfaceHolder) {
                 submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_SURFACE_HOLDER_UPDATE, null);
             }
         }catch (Exception e){
-            e.printStackTrace();
+            Bundle bundle = BundlePool.obtain();
+            bundle.putString("errorMessage", e.getMessage());
+            bundle.putString("causeMessage", e.getCause()!=null?e.getCause().getMessage():"");
+            submitErrorEvent(OnErrorEventListener.ERROR_EVENT_RENDER, bundle);
         }
     }
 
@@ -380,7 +383,10 @@ public void setSurface(Surface surface) {
                 submitPlayerEvent(OnPlayerEventListener.PLAYER_EVENT_ON_SURFACE_UPDATE, null);
             }
         }catch (Exception e){
-            e.printStackTrace();
+            Bundle bundle = BundlePool.obtain();
+            bundle.putString("errorMessage", e.getMessage());
+            bundle.putString("causeMessage", e.getCause()!=null?e.getCause().getMessage():"");
+            submitErrorEvent(OnErrorEventListener.ERROR_EVENT_RENDER, bundle);
         }
     }
 

playerbase/src/main/java/com/kk/taurus/playerbase/event/OnErrorEventListener.java

@@ -27,6 +27,8 @@ public interface OnErrorEventListener {
     int ERROR_EVENT_DATA_PROVIDER_ERROR = -88000;
 
     //A error that causes a play to terminate
+    int ERROR_EVENT_RENDER = -88010;
+
     int ERROR_EVENT_COMMON = -88011;
 
     int ERROR_EVENT_UNKNOWN = -88012;
@@ -43,6 +45,10 @@ public interface OnErrorEventListener {
 
     int ERROR_EVENT_TIMED_OUT = -88018;
 
+    int ERROR_EVENT_OUT_OF_MEMORY = -88019;
+
+    int ERROR_EVENT_REMOTE = -88020;
+
     void onErrorEvent(int eventCode, Bundle bundle);
 
 }