diff --git a/app/build.gradle b/app/build.gradle index de9f6386b9313d1d20fa841b366475fa357a6dcd..e395cbcd5be111f392bdc4841f8eee451de69c49 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,6 +74,7 @@ dependencies { annotationProcessor viewDependencies.apt_butterKnife implementation viewDependencies.butterKnife implementation androidDependencies.recyclerView + implementation androidDependencies.core implementation viewDependencies.DanmakuFlameMaster implementation viewDependencies.ndkbitmap_armv7a implementation viewDependencies.ndkbitmap_armv5 diff --git a/dependencies.gradle b/dependencies.gradle index bcf647940cc92e5ab4fe91dbca489613074e0f26..cfd5951a442c2dafc1e63e0487a1dabbc917e781 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ ext { gsyVideoVersion = '8.1.1' - exo_player2 = '2.12.1' + exo_player2 = '2.13.2' permissionsdispatcher = '4.3.0' @@ -47,7 +47,8 @@ ext { appcompat_v7: "androidx.appcompat:appcompat:${supportLibraryVersion}", support_v4 : "androidx.legacy:legacy-support-v4:${otherVersion}", design : "com.google.android.material:material:${otherVersion}", - viewpager2 : "androidx.viewpager2:viewpager2:${otherVersion}", + viewpager2 : "androidx.viewpager2:viewpager2:${otherVersion}", + core : "androidx.core:core:1.1.0", ] viewDependencies = [ diff --git a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java index 2ec2a6518a08757ba1086693dac871fd6d49dcf9..3ab843fb77b7aab6b201a1c6ca72cf6db20ead7f 100644 --- a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java +++ b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java @@ -684,11 +684,6 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev audioSessionId = C.AUDIO_SESSION_ID_UNSET; } - @Override - public void onAudioSessionId(EventTime eventTime, int audioSessionId) { - this.audioSessionId = audioSessionId; - } - @Override public void onAudioUnderrun(EventTime eventTime, int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) { diff --git a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java index cac2e2e55f88acb0394de23e64896dfc50cae286..bfd1b096cdc32e68f8e659a1de5d784dd0a35599 100644 --- a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java +++ b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/demo/EventLogger.java @@ -128,7 +128,7 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, } Log.d(TAG, "Tracks ["); // Log tracks associated to renderers. - for (int rendererIndex = 0; rendererIndex < mappedTrackInfo.length; rendererIndex++) { + for (int rendererIndex = 0; rendererIndex < mappedTrackInfo.getRendererCount(); rendererIndex++) { TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(rendererIndex); TrackSelection trackSelection = trackSelections.get(rendererIndex); if (rendererTrackGroups.length > 0) { @@ -140,11 +140,11 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, Log.d(TAG, " Group:" + groupIndex + ", adaptive_supported=" + adaptiveSupport + " ["); for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) { String status = getTrackStatusString(trackSelection, trackGroup, trackIndex); - String formatSupport = getFormatSupportString( + /*String formatSupport = getFormatSupportString( mappedTrackInfo.getTrackFormatSupport(rendererIndex, groupIndex, trackIndex)); Log.d(TAG, " " + status + " Track:" + trackIndex + ", " + Format.toLogString(trackGroup.getFormat(trackIndex)) - + ", supported=" + formatSupport); + + ", supported=" + formatSupport);*/ } Log.d(TAG, " ]"); } @@ -164,7 +164,7 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, } } // Log tracks not associated with a renderer. - TrackGroupArray unassociatedTrackGroups = mappedTrackInfo.getUnassociatedTrackGroups(); + TrackGroupArray unassociatedTrackGroups = mappedTrackInfo.getUnmappedTrackGroups(); if (unassociatedTrackGroups.length > 0) { Log.d(TAG, " Renderer:None ["); for (int groupIndex = 0; groupIndex < unassociatedTrackGroups.length; groupIndex++) { @@ -206,11 +206,6 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, Log.d(TAG, "audioEnabled [" + getSessionTimeString() + "]"); } - @Override - public void onAudioSessionId(int audioSessionId) { - Log.d(TAG, "audioSessionId [" + audioSessionId + "]"); - } - @Override public void onAudioDecoderInitialized(String decoderName, long elapsedRealtimeMs, long initializationDurationMs) { diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index 4aea890ec5bc217e16a0fc8ef1644f3dbe8551cd..989e81e1d7c5dab562ca8531b035145980388b24 100644 --- a/gsyVideoPlayer/build.gradle +++ b/gsyVideoPlayer/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // // api project(':gsyVideoPlayer-java') -// api project(':gsyVideoPlayer-exo_player2') + api project(':gsyVideoPlayer-exo_player2') // api project(':gsyVideoPlayer-armv5') // api project(':gsyVideoPlayer-armv7a') // api project(':gsyVideoPlayer-armv64') @@ -49,7 +49,7 @@ dependencies { //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" - api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" + //api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion"