提交 20d61af7 编写于 作者: G guoshuyu

update support exo_player2 = '2.13.2'

上级 d4323822
...@@ -74,6 +74,7 @@ dependencies { ...@@ -74,6 +74,7 @@ dependencies {
annotationProcessor viewDependencies.apt_butterKnife annotationProcessor viewDependencies.apt_butterKnife
implementation viewDependencies.butterKnife implementation viewDependencies.butterKnife
implementation androidDependencies.recyclerView implementation androidDependencies.recyclerView
implementation androidDependencies.core
implementation viewDependencies.DanmakuFlameMaster implementation viewDependencies.DanmakuFlameMaster
implementation viewDependencies.ndkbitmap_armv7a implementation viewDependencies.ndkbitmap_armv7a
implementation viewDependencies.ndkbitmap_armv5 implementation viewDependencies.ndkbitmap_armv5
......
...@@ -35,7 +35,7 @@ ext { ...@@ -35,7 +35,7 @@ ext {
gsyVideoVersion = '8.1.1' gsyVideoVersion = '8.1.1'
exo_player2 = '2.12.1' exo_player2 = '2.13.2'
permissionsdispatcher = '4.3.0' permissionsdispatcher = '4.3.0'
...@@ -48,6 +48,7 @@ ext { ...@@ -48,6 +48,7 @@ ext {
support_v4 : "androidx.legacy:legacy-support-v4:${otherVersion}", support_v4 : "androidx.legacy:legacy-support-v4:${otherVersion}",
design : "com.google.android.material:material:${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 = [ viewDependencies = [
......
...@@ -684,11 +684,6 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev ...@@ -684,11 +684,6 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev
audioSessionId = C.AUDIO_SESSION_ID_UNSET; audioSessionId = C.AUDIO_SESSION_ID_UNSET;
} }
@Override
public void onAudioSessionId(EventTime eventTime, int audioSessionId) {
this.audioSessionId = audioSessionId;
}
@Override @Override
public void onAudioUnderrun(EventTime eventTime, int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) { public void onAudioUnderrun(EventTime eventTime, int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
......
...@@ -128,7 +128,7 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, ...@@ -128,7 +128,7 @@ public final class EventLogger implements Player.EventListener, MetadataOutput,
} }
Log.d(TAG, "Tracks ["); Log.d(TAG, "Tracks [");
// Log tracks associated to renderers. // 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); TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
TrackSelection trackSelection = trackSelections.get(rendererIndex); TrackSelection trackSelection = trackSelections.get(rendererIndex);
if (rendererTrackGroups.length > 0) { if (rendererTrackGroups.length > 0) {
...@@ -140,11 +140,11 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, ...@@ -140,11 +140,11 @@ public final class EventLogger implements Player.EventListener, MetadataOutput,
Log.d(TAG, " Group:" + groupIndex + ", adaptive_supported=" + adaptiveSupport + " ["); Log.d(TAG, " Group:" + groupIndex + ", adaptive_supported=" + adaptiveSupport + " [");
for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) { for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) {
String status = getTrackStatusString(trackSelection, trackGroup, trackIndex); String status = getTrackStatusString(trackSelection, trackGroup, trackIndex);
String formatSupport = getFormatSupportString( /*String formatSupport = getFormatSupportString(
mappedTrackInfo.getTrackFormatSupport(rendererIndex, groupIndex, trackIndex)); mappedTrackInfo.getTrackFormatSupport(rendererIndex, groupIndex, trackIndex));
Log.d(TAG, " " + status + " Track:" + trackIndex + ", " Log.d(TAG, " " + status + " Track:" + trackIndex + ", "
+ Format.toLogString(trackGroup.getFormat(trackIndex)) + Format.toLogString(trackGroup.getFormat(trackIndex))
+ ", supported=" + formatSupport); + ", supported=" + formatSupport);*/
} }
Log.d(TAG, " ]"); Log.d(TAG, " ]");
} }
...@@ -164,7 +164,7 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, ...@@ -164,7 +164,7 @@ public final class EventLogger implements Player.EventListener, MetadataOutput,
} }
} }
// Log tracks not associated with a renderer. // Log tracks not associated with a renderer.
TrackGroupArray unassociatedTrackGroups = mappedTrackInfo.getUnassociatedTrackGroups(); TrackGroupArray unassociatedTrackGroups = mappedTrackInfo.getUnmappedTrackGroups();
if (unassociatedTrackGroups.length > 0) { if (unassociatedTrackGroups.length > 0) {
Log.d(TAG, " Renderer:None ["); Log.d(TAG, " Renderer:None [");
for (int groupIndex = 0; groupIndex < unassociatedTrackGroups.length; groupIndex++) { for (int groupIndex = 0; groupIndex < unassociatedTrackGroups.length; groupIndex++) {
...@@ -206,11 +206,6 @@ public final class EventLogger implements Player.EventListener, MetadataOutput, ...@@ -206,11 +206,6 @@ public final class EventLogger implements Player.EventListener, MetadataOutput,
Log.d(TAG, "audioEnabled [" + getSessionTimeString() + "]"); Log.d(TAG, "audioEnabled [" + getSessionTimeString() + "]");
} }
@Override
public void onAudioSessionId(int audioSessionId) {
Log.d(TAG, "audioSessionId [" + audioSessionId + "]");
}
@Override @Override
public void onAudioDecoderInitialized(String decoderName, long elapsedRealtimeMs, public void onAudioDecoderInitialized(String decoderName, long elapsedRealtimeMs,
long initializationDurationMs) { long initializationDurationMs) {
......
...@@ -36,7 +36,7 @@ dependencies { ...@@ -36,7 +36,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
// //
// api project(':gsyVideoPlayer-java') // api project(':gsyVideoPlayer-java')
// api project(':gsyVideoPlayer-exo_player2') api project(':gsyVideoPlayer-exo_player2')
// api project(':gsyVideoPlayer-armv5') // api project(':gsyVideoPlayer-armv5')
// api project(':gsyVideoPlayer-armv7a') // api project(':gsyVideoPlayer-armv7a')
// api project(':gsyVideoPlayer-armv64') // api project(':gsyVideoPlayer-armv64')
...@@ -49,7 +49,7 @@ dependencies { ...@@ -49,7 +49,7 @@ dependencies {
//api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion" //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
api "com.shuyu:gsyVideoPlayer-java:$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-armv5:$gsyVideoVersion"
api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"
api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册