diff --git a/app/src/main/java/com/dueeeke/dkplayer/activity/extend/SwitchPlayerActivity.java b/app/src/main/java/com/dueeeke/dkplayer/activity/extend/SwitchPlayerActivity.java index 8b659e35..a7b3db38 100644 --- a/app/src/main/java/com/dueeeke/dkplayer/activity/extend/SwitchPlayerActivity.java +++ b/app/src/main/java/com/dueeeke/dkplayer/activity/extend/SwitchPlayerActivity.java @@ -25,8 +25,8 @@ public class SwitchPlayerActivity extends AppCompatActivity implements View.OnCl private IjkVideoView ijkVideoView; private StandardVideoController mController; - private static final String URL = "http://gslb.miaopai.com/stream/FQXM04zrW1dcXGiPdJ6Q3KAq2Fpv4TLV.mp4"; -// private static final String URL = "http://vfile.hshan.com/2018/1524/9156/4430/152491564430.ssm/152491564430.m3u8"; +// private static final String URL = "http://gslb.miaopai.com/stream/FQXM04zrW1dcXGiPdJ6Q3KAq2Fpv4TLV.mp4"; + private static final String URL = "http://vfile.hshan.com/2018/1524/9156/4430/152491564430.ssm/152491564430.m3u8"; // private static final String URL = "rtmp://live.hkstv.hk.lxdns.com/live/hks"; @Override diff --git a/app/src/main/java/com/dueeeke/dkplayer/player/ExoMediaPlayer.java b/app/src/main/java/com/dueeeke/dkplayer/player/ExoMediaPlayer.java index b58c761b..c98e3cf9 100644 --- a/app/src/main/java/com/dueeeke/dkplayer/player/ExoMediaPlayer.java +++ b/app/src/main/java/com/dueeeke/dkplayer/player/ExoMediaPlayer.java @@ -2,26 +2,22 @@ import android.content.Context; import android.net.Uri; -import android.os.Handler; -import android.os.Looper; import android.support.annotation.NonNull; import android.view.Surface; import android.view.SurfaceHolder; +import com.dueeeke.dkplayer.util.Repeater; import com.dueeeke.videoplayer.player.AbstractPlayer; -import com.dueeeke.videoplayer.util.L; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.DefaultLoadControl; -import com.google.android.exoplayer2.DefaultRenderersFactory; import com.google.android.exoplayer2.ExoPlaybackException; +import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.Timeline; +import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.dash.DashMediaSource; import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource; import com.google.android.exoplayer2.source.hls.HlsMediaSource; @@ -30,7 +26,6 @@ import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelection; -import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; @@ -40,41 +35,29 @@ import tv.danmaku.ijk.media.player.IMediaPlayer; -public class ExoMediaPlayer extends AbstractPlayer implements Player.EventListener, - VideoRendererEventListener { +public class ExoMediaPlayer extends AbstractPlayer implements VideoRendererEventListener { private static final int BUFFER_REPEAT_DELAY = 1_000; - private Context mAppContext; private SimpleExoPlayer mInternalPlayer; private MediaSource mMediaSource; private String mDataSource; private Surface mSurface; - private Handler mainHandler; private PlaybackParameters mSpeedPlaybackParameters; private int lastReportedPlaybackState; private boolean lastReportedPlayWhenReady; private boolean mIsPrepareing = true; private boolean mIsBuffering = false; + private DataSource.Factory mediaDataSourceFactory; @NonNull private Repeater bufferRepeater = new Repeater(); - private static final int TYPE_RTMP = 4; - public ExoMediaPlayer(Context context) { mAppContext = context.getApplicationContext(); - Looper eventLooper = Looper.myLooper() != null ? Looper.myLooper() : Looper.getMainLooper(); - mainHandler = new Handler(eventLooper); lastReportedPlaybackState = Player.STATE_IDLE; bufferRepeater.setRepeaterDelay(BUFFER_REPEAT_DELAY); bufferRepeater.setRepeatListener(new BufferRepeatListener()); - } - - @Override - public void start() { - if (mInternalPlayer == null) - return; - mInternalPlayer.setPlayWhenReady(true); + mediaDataSourceFactory = getDataSourceFactory(true); } @Override @@ -82,78 +65,61 @@ public void initPlayer() { TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory(new DefaultBandwidthMeter()); DefaultTrackSelector trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory); - -// mEventLogger = new EventLogger(mTrackSelector); - -// boolean preferExtensionDecoders = true; -// boolean useExtensionRenderers = true;//是否开启扩展 - @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode = DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER; - - DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(mAppContext, null, extensionRendererMode); - DefaultLoadControl loadControl = new DefaultLoadControl(); - mInternalPlayer = new SimpleExoPlayer(renderersFactory, trackSelector, loadControl); - mInternalPlayer.addListener(this); - mInternalPlayer.setVideoDebugListener(this); + mInternalPlayer = ExoPlayerFactory.newSimpleInstance(mAppContext, trackSelector); + mInternalPlayer.addListener(mDefaultEventListener); + mInternalPlayer.addVideoDebugListener(this); } @Override public void setDataSource(String path) { - mDataSource = Uri.parse(path).toString(); + mDataSource = path; mMediaSource = getMediaSource(); } private MediaSource getMediaSource() { Uri contentUri = Uri.parse(mDataSource); - int contentType = inferContentType(mDataSource); + int contentType = Util.inferContentType(mDataSource); switch (contentType) { case C.TYPE_DASH: return new DashMediaSource.Factory( - new DefaultDashChunkSource.Factory(getDataSourceFactory(false)), + new DefaultDashChunkSource.Factory(mediaDataSourceFactory), getDataSourceFactory(false)) - .createMediaSource(contentUri, mainHandler, null); + .createMediaSource(contentUri); case C.TYPE_SS: return new SsMediaSource.Factory( - new DefaultSsChunkSource.Factory(getDataSourceFactory(false)), + new DefaultSsChunkSource.Factory(mediaDataSourceFactory), getDataSourceFactory(false)) - .createMediaSource(contentUri, mainHandler, null); + .createMediaSource(contentUri); case C.TYPE_HLS: - return new HlsMediaSource.Factory(getDataSourceFactory(false)) - .createMediaSource(contentUri, mainHandler, null); + return new HlsMediaSource.Factory(mediaDataSourceFactory) + .createMediaSource(contentUri); // case TYPE_RTMP: // RtmpDataSourceFactory rtmpDataSourceFactory = new RtmpDataSourceFactory(null); // return new ExtractorMediaSource.Factory(rtmpDataSourceFactory) // .createMediaSource(contentUri, mainHandler, null); default: case C.TYPE_OTHER: - return new ExtractorMediaSource.Factory(getDataSourceFactory(false)) - .createMediaSource(contentUri, mainHandler, null); + return new ExtractorMediaSource.Factory(mediaDataSourceFactory) + .createMediaSource(contentUri); } } - /** - * Makes a best guess to infer the type from a file name. - * - * @param fileName Name of the file. It can include the path of the file. - * @return The content type. - */ - @C.ContentType - private int inferContentType(String fileName) { - fileName = Util.toLowerInvariant(fileName); - if (fileName.startsWith("rtmp:")) { - return TYPE_RTMP; - } else { - return Util.inferContentType(fileName); - } - } - private DataSource.Factory getHttpDataSourceFactory(boolean preview) { + private DataSource.Factory getHttpDataSourceFactory(boolean useBandwidthMeter) { return new DefaultHttpDataSourceFactory(Util.getUserAgent(mAppContext, - mAppContext.getApplicationInfo().name), preview ? null : new DefaultBandwidthMeter()); + mAppContext.getApplicationInfo().name), useBandwidthMeter ? null : new DefaultBandwidthMeter()); + } + + private DataSource.Factory getDataSourceFactory(boolean useBandwidthMeter) { + return new DefaultDataSourceFactory(mAppContext, useBandwidthMeter ? null : new DefaultBandwidthMeter(), + getHttpDataSourceFactory(useBandwidthMeter)); } - private DataSource.Factory getDataSourceFactory(boolean preview) { - return new DefaultDataSourceFactory(mAppContext, preview ? null : new DefaultBandwidthMeter(), - getHttpDataSourceFactory(preview)); + @Override + public void start() { + if (mInternalPlayer == null) + return; + mInternalPlayer.setPlayWhenReady(true); } @Override @@ -215,7 +181,8 @@ public void seekTo(long time) { public void release() { if (mInternalPlayer != null) { mInternalPlayer.release(); - mInternalPlayer.removeListener(this); + mInternalPlayer.removeListener(mDefaultEventListener); + mInternalPlayer.removeVideoDebugListener(this); mInternalPlayer = null; } @@ -314,125 +281,84 @@ private int getBufferedPercentage() { return mInternalPlayer == null ? 0 : mInternalPlayer.getBufferedPercentage(); } - @Override - public void onTimelineChanged(Timeline timeline, Object manifest, int reason) { - - } - - @Override - public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) { - - } - - @Override - public void onLoadingChanged(boolean isLoading) { - - } + private Player.DefaultEventListener mDefaultEventListener = new Player.DefaultEventListener() { + @Override + public void onPlayerStateChanged(boolean playWhenReady, int playbackState) { + super.onPlayerStateChanged(playWhenReady, playbackState); + //重新播放状态顺序为：STATE_IDLE -》STATE_BUFFERING -》STATE_READY + //缓冲时顺序为：STATE_BUFFERING -》STATE_READY +// L.e("onPlayerStateChanged: playWhenReady = " + playWhenReady + ", playbackState = " + playbackState); + if (lastReportedPlayWhenReady != playWhenReady || lastReportedPlaybackState != playbackState) { + if (mIsBuffering) { + switch (playbackState) { + case Player.STATE_ENDED: + case Player.STATE_READY: + if (mPlayerEventListener != null) { + mPlayerEventListener.onInfo(IMediaPlayer.MEDIA_INFO_BUFFERING_END, mInternalPlayer.getBufferedPercentage()); + } + mIsBuffering = false; + break; + } + } - @Override - public void onPlayerStateChanged(boolean playWhenReady, int playbackState) { + if (mIsPrepareing) { + switch (playbackState) { + case Player.STATE_READY: + if (mPlayerEventListener != null) { + mPlayerEventListener.onPrepared(); + setBufferRepeaterStarted(true); + } + mIsPrepareing = false; + break; + } + } - //重新播放状态顺序为：STATE_IDLE -》STATE_BUFFERING -》STATE_READY - //缓冲时顺序为：STATE_BUFFERING -》STATE_READY - L.e("onPlayerStateChanged: playWhenReady = " + playWhenReady + ", playbackState = " + playbackState); - if (lastReportedPlayWhenReady != playWhenReady || lastReportedPlaybackState != playbackState) { - if (mIsBuffering) { switch (playbackState) { - case Player.STATE_ENDED: - case Player.STATE_READY: + case Player.STATE_BUFFERING: if (mPlayerEventListener != null) { - mPlayerEventListener.onInfo(IMediaPlayer.MEDIA_INFO_BUFFERING_END, mInternalPlayer.getBufferedPercentage()); + mPlayerEventListener.onInfo(IMediaPlayer.MEDIA_INFO_BUFFERING_START, mInternalPlayer.getBufferedPercentage()); } - mIsBuffering = false; + mIsBuffering = true; break; - } - } - - if (mIsPrepareing) { - switch (playbackState) { case Player.STATE_READY: + break; + case Player.STATE_ENDED: if (mPlayerEventListener != null) { - mPlayerEventListener.onPrepared(); - mPlayerEventListener.onInfo(IMediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START, 0); + mPlayerEventListener.onCompletion(); } - setBufferRepeaterStarted(true); - mIsPrepareing = false; + break; + default: break; } } - - switch (playbackState) { - case Player.STATE_BUFFERING: - if (mPlayerEventListener != null) { - mPlayerEventListener.onInfo(IMediaPlayer.MEDIA_INFO_BUFFERING_START, mInternalPlayer.getBufferedPercentage()); - } - mIsBuffering = true; - break; - case Player.STATE_READY: - break; - case Player.STATE_ENDED: - if (mPlayerEventListener != null) { - mPlayerEventListener.onCompletion(); - } - break; - default: - break; - } + lastReportedPlayWhenReady = playWhenReady; + lastReportedPlaybackState = playbackState; } - lastReportedPlayWhenReady = playWhenReady; - lastReportedPlaybackState = playbackState; - } - @Override - public void onRepeatModeChanged(int repeatMode) { - - } - - @Override - public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) { - - } - - @Override - public void onPlayerError(ExoPlaybackException error) { - if (mPlayerEventListener != null) { - mPlayerEventListener.onError(); + @Override + public void onPlayerError(ExoPlaybackException error) { + super.onPlayerError(error); + if (mPlayerEventListener != null) { + mPlayerEventListener.onError(); + } } - } - - @Override - public void onPositionDiscontinuity(int reason) { - - } - - @Override - public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) { - - } - - @Override - public void onSeekProcessed() { - - } + }; + //------------------ Start VideoRendererEventListener ---------------------// @Override public void onVideoEnabled(DecoderCounters counters) { - } @Override public void onVideoDecoderInitialized(String decoderName, long initializedTimestampMs, long initializationDurationMs) { - } @Override public void onVideoInputFormatChanged(Format format) { - } @Override public void onDroppedFrames(int count, long elapsedMs) { - } @Override @@ -447,11 +373,12 @@ public void onVideoSizeChanged(int width, int height, int unappliedRotationDegre @Override public void onRenderedFirstFrame(Surface surface) { - + if (mPlayerEventListener != null && mIsPrepareing) + mPlayerEventListener.onInfo(IMediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START, 0); } @Override public void onVideoDisabled(DecoderCounters counters) { - } + //------------------ End VideoRendererEventListener ---------------------// } diff --git a/app/src/main/java/com/dueeeke/dkplayer/player/SimpleExoPlayer.java b/app/src/main/java/com/dueeeke/dkplayer/player/SimpleExoPlayer.java deleted file mode 100644 index b7d43bf6..00000000 --- a/app/src/main/java/com/dueeeke/dkplayer/player/SimpleExoPlayer.java +++ /dev/null @@ -1,926 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.dueeeke.dkplayer.player; - -import android.graphics.SurfaceTexture; -import android.os.Handler; -import android.os.Looper; -import android.support.annotation.Nullable; -import android.util.Log; -import android.view.Surface; -import android.view.SurfaceHolder; -import android.view.SurfaceView; -import android.view.TextureView; - -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.ExoPlayer; -import com.google.android.exoplayer2.ExoPlayerFactory; -import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.LoadControl; -import com.google.android.exoplayer2.PlaybackParameters; -import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.PlayerMessage; -import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.RenderersFactory; -import com.google.android.exoplayer2.SeekParameters; -import com.google.android.exoplayer2.Timeline; -import com.google.android.exoplayer2.audio.AudioAttributes; -import com.google.android.exoplayer2.audio.AudioRendererEventListener; -import com.google.android.exoplayer2.decoder.DecoderCounters; -import com.google.android.exoplayer2.metadata.Metadata; -import com.google.android.exoplayer2.metadata.MetadataOutput; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.TrackGroupArray; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.text.TextOutput; -import com.google.android.exoplayer2.trackselection.TrackSelectionArray; -import com.google.android.exoplayer2.trackselection.TrackSelector; -import com.google.android.exoplayer2.util.Util; -import com.google.android.exoplayer2.video.VideoRendererEventListener; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArraySet; - - -public class SimpleExoPlayer implements ExoPlayer { - - - public interface VideoListener { - - - void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, - float pixelWidthHeightRatio); - - /** - * Called when a frame is rendered for the first time since setting the surface, and when a - * frame is rendered for the first time since a video track was selected. - */ - void onRenderedFirstFrame(); - - } - - private static final String TAG = "SimpleExoPlayer"; - - protected final Renderer[] renderers; - - private final ExoPlayer player; - private final ComponentListener componentListener; - private final CopyOnWriteArraySet videoListeners; - private final CopyOnWriteArraySet textOutputs; - private final CopyOnWriteArraySet metadataOutputs; - private final int videoRendererCount; - private final int audioRendererCount; - - private Format videoFormat; - private Format audioFormat; - - private Surface surface; - private boolean ownsSurface; - @C.VideoScalingMode - private int videoScalingMode; - private SurfaceHolder surfaceHolder; - private TextureView textureView; - private AudioRendererEventListener audioDebugListener; - private VideoRendererEventListener videoDebugListener; - private DecoderCounters videoDecoderCounters; - private DecoderCounters audioDecoderCounters; - private int audioSessionId; - private AudioAttributes audioAttributes; - private float audioVolume; - - public SimpleExoPlayer(RenderersFactory renderersFactory, TrackSelector trackSelector, - LoadControl loadControl) { - componentListener = new ComponentListener(); - videoListeners = new CopyOnWriteArraySet<>(); - textOutputs = new CopyOnWriteArraySet<>(); - metadataOutputs = new CopyOnWriteArraySet<>(); - Looper eventLooper = Looper.myLooper() != null ? Looper.myLooper() : Looper.getMainLooper(); - Handler eventHandler = new Handler(eventLooper); - renderers = renderersFactory.createRenderers(eventHandler, componentListener, componentListener, - componentListener, componentListener); - - // Obtain counts of video and audio renderers. - int videoRendererCount = 0; - int audioRendererCount = 0; - for (Renderer renderer : renderers) { - switch (renderer.getTrackType()) { - case C.TRACK_TYPE_VIDEO: - videoRendererCount++; - break; - case C.TRACK_TYPE_AUDIO: - audioRendererCount++; - break; - } - } - this.videoRendererCount = videoRendererCount; - this.audioRendererCount = audioRendererCount; - - // Set initial values. - audioVolume = 1; - audioSessionId = C.AUDIO_SESSION_ID_UNSET; - audioAttributes = AudioAttributes.DEFAULT; - videoScalingMode = C.VIDEO_SCALING_MODE_DEFAULT; - - // Build the player and associated objects. - player = createExoPlayerImpl(renderers, trackSelector, loadControl); - } - - - public void setVideoScalingMode(@C.VideoScalingMode int videoScalingMode) { - this.videoScalingMode = videoScalingMode; - ExoPlayerMessage[] messages = new ExoPlayerMessage[videoRendererCount]; - int count = 0; - for (Renderer renderer : renderers) { - if (renderer.getTrackType() == C.TRACK_TYPE_VIDEO) { - messages[count++] = new ExoPlayerMessage(renderer, C.MSG_SET_SCALING_MODE, - videoScalingMode); - } - } - player.sendMessages(messages); - } - - /** - * Returns the video scaling mode. - */ - public @C.VideoScalingMode - int getVideoScalingMode() { - return videoScalingMode; - } - - - public void clearVideoSurface() { - setVideoSurface(null); - } - - - public void setVideoSurface(Surface surface) { - removeSurfaceCallbacks(); - setVideoSurfaceInternal(surface, false); - } - - public void clearVideoSurface(Surface surface) { - if (surface != null && surface == this.surface) { - setVideoSurface(null); - } - } - - - public void setVideoSurfaceHolder(SurfaceHolder surfaceHolder) { - removeSurfaceCallbacks(); - this.surfaceHolder = surfaceHolder; - if (surfaceHolder == null) { - setVideoSurfaceInternal(null, false); - } else { - surfaceHolder.addCallback(componentListener); - Surface surface = surfaceHolder.getSurface(); - setVideoSurfaceInternal(surface != null && surface.isValid() ? surface : null, false); - } - } - - - public void clearVideoSurfaceHolder(SurfaceHolder surfaceHolder) { - if (surfaceHolder != null && surfaceHolder == this.surfaceHolder) { - setVideoSurfaceHolder(null); - } - } - - - public void setVideoSurfaceView(SurfaceView surfaceView) { - setVideoSurfaceHolder(surfaceView == null ? null : surfaceView.getHolder()); - } - - - public void clearVideoSurfaceView(SurfaceView surfaceView) { - clearVideoSurfaceHolder(surfaceView == null ? null : surfaceView.getHolder()); - } - - - public void setVideoTextureView(TextureView textureView) { - removeSurfaceCallbacks(); - this.textureView = textureView; - if (textureView == null) { - setVideoSurfaceInternal(null, true); - } else { - if (textureView.getSurfaceTextureListener() != null) { - Log.w(TAG, "Replacing existing SurfaceTextureListener."); - } - textureView.setSurfaceTextureListener(componentListener); - SurfaceTexture surfaceTexture = textureView.isAvailable() ? textureView.getSurfaceTexture() - : null; - setVideoSurfaceInternal(surfaceTexture == null ? null : new Surface(surfaceTexture), true); - } - } - - - public void clearVideoTextureView(TextureView textureView) { - if (textureView != null && textureView == this.textureView) { - setVideoTextureView(null); - } - } - - - @Deprecated - public void setAudioStreamType(@C.StreamType int streamType) { - @C.AudioUsage int usage = Util.getAudioUsageForStreamType(streamType); - @C.AudioContentType int contentType = Util.getAudioContentTypeForStreamType(streamType); - AudioAttributes audioAttributes = - new AudioAttributes.Builder().setUsage(usage).setContentType(contentType).build(); - setAudioAttributes(audioAttributes); - } - - - @Deprecated - public @C.StreamType - int getAudioStreamType() { - return Util.getStreamTypeForAudioUsage(audioAttributes.usage); - } - - - public void setAudioAttributes(AudioAttributes audioAttributes) { - this.audioAttributes = audioAttributes; - ExoPlayerMessage[] messages = new ExoPlayerMessage[audioRendererCount]; - int count = 0; - for (Renderer renderer : renderers) { - if (renderer.getTrackType() == C.TRACK_TYPE_AUDIO) { - messages[count++] = new ExoPlayerMessage(renderer, C.MSG_SET_AUDIO_ATTRIBUTES, - audioAttributes); - } - } - player.sendMessages(messages); - } - - /** - * Returns the attributes for audio playback. - */ - public AudioAttributes getAudioAttributes() { - return audioAttributes; - } - - /** - * Sets the audio volume, with 0 being silence and 1 being unity gain. - * - * @param audioVolume The audio volume. - */ - public void setVolume(float audioVolume) { - this.audioVolume = audioVolume; - ExoPlayerMessage[] messages = new ExoPlayerMessage[audioRendererCount]; - int count = 0; - for (Renderer renderer : renderers) { - if (renderer.getTrackType() == C.TRACK_TYPE_AUDIO) { - messages[count++] = new ExoPlayerMessage(renderer, C.MSG_SET_VOLUME, audioVolume); - } - } - player.sendMessages(messages); - } - - /** - * Returns the audio volume, with 0 being silence and 1 being unity gain. - */ - public float getVolume() { - return audioVolume; - } - - - /** - * Returns the video format currently being played, or null if no video is being played. - */ - public Format getVideoFormat() { - return videoFormat; - } - - /** - * Returns the audio format currently being played, or null if no audio is being played. - */ - public Format getAudioFormat() { - return audioFormat; - } - - - public int getAudioSessionId() { - return audioSessionId; - } - - public DecoderCounters getVideoDecoderCounters() { - return videoDecoderCounters; - } - - - public DecoderCounters getAudioDecoderCounters() { - return audioDecoderCounters; - } - - /** - * Adds a listener to receive video events. - * - * @param listener The listener to register. - */ - public void addVideoListener(VideoListener listener) { - videoListeners.add(listener); - } - - /** - * Removes a listener of video events. - * - * @param listener The listener to unregister. - */ - public void removeVideoListener(VideoListener listener) { - videoListeners.remove(listener); - } - - - @Deprecated - public void setVideoListener(VideoListener listener) { - videoListeners.clear(); - if (listener != null) { - addVideoListener(listener); - } - } - - - @Deprecated - public void clearVideoListener(VideoListener listener) { - removeVideoListener(listener); - } - - /** - * Registers an output to receive text events. - * - * @param listener The output to register. - */ - public void addTextOutput(TextOutput listener) { - textOutputs.add(listener); - } - - /** - * Removes a text output. - * - * @param listener The output to remove. - */ - public void removeTextOutput(TextOutput listener) { - textOutputs.remove(listener); - } - - - @Deprecated - public void setTextOutput(TextOutput output) { - textOutputs.clear(); - if (output != null) { - addTextOutput(output); - } - } - - - @Deprecated - public void clearTextOutput(TextOutput output) { - removeTextOutput(output); - } - - /** - * Registers an output to receive metadata events. - * - * @param listener The output to register. - */ - public void addMetadataOutput(MetadataOutput listener) { - metadataOutputs.add(listener); - } - - /** - * Removes a metadata output. - * - * @param listener The output to remove. - */ - public void removeMetadataOutput(MetadataOutput listener) { - metadataOutputs.remove(listener); - } - - - @Deprecated - public void setMetadataOutput(MetadataOutput output) { - metadataOutputs.clear(); - if (output != null) { - addMetadataOutput(output); - } - } - - - @Deprecated - public void clearMetadataOutput(MetadataOutput output) { - removeMetadataOutput(output); - } - - /** - * Sets a listener to receive debug events from the video renderer. - * - * @param listener The listener. - */ - public void setVideoDebugListener(VideoRendererEventListener listener) { - videoDebugListener = listener; - } - - /** - * Sets a listener to receive debug events from the audio renderer. - * - * @param listener The listener. - */ - public void setAudioDebugListener(AudioRendererEventListener listener) { - audioDebugListener = listener; - } - - // ExoPlayer implementation - - @Override - public Looper getPlaybackLooper() { - return player.getPlaybackLooper(); - } - - @Nullable - @Override - public VideoComponent getVideoComponent() { - return null; - } - - @Nullable - @Override - public TextComponent getTextComponent() { - return null; - } - - @Override - public void addListener(Player.EventListener listener) { - player.addListener(listener); - } - - @Override - public void removeListener(Player.EventListener listener) { - player.removeListener(listener); - } - - @Override - public int getPlaybackState() { - return player.getPlaybackState(); - } - - @Override - public void prepare(MediaSource mediaSource) { - player.prepare(mediaSource); - } - - @Override - public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) { - player.prepare(mediaSource, resetPosition, resetState); - } - - @Override - public PlayerMessage createMessage(PlayerMessage.Target target) { - return null; - } - - @Override - public void setPlayWhenReady(boolean playWhenReady) { - player.setPlayWhenReady(playWhenReady); - } - - @Override - public boolean getPlayWhenReady() { - return player.getPlayWhenReady(); - } - - @Override - public @RepeatMode - int getRepeatMode() { - return player.getRepeatMode(); - } - - @Override - public void setRepeatMode(@RepeatMode int repeatMode) { - player.setRepeatMode(repeatMode); - } - - @Override - public void setShuffleModeEnabled(boolean shuffleModeEnabled) { - player.setShuffleModeEnabled(shuffleModeEnabled); - } - - @Override - public boolean getShuffleModeEnabled() { - return player.getShuffleModeEnabled(); - } - - @Override - public boolean isLoading() { - return player.isLoading(); - } - - @Override - public void seekToDefaultPosition() { - player.seekToDefaultPosition(); - } - - @Override - public void seekToDefaultPosition(int windowIndex) { - player.seekToDefaultPosition(windowIndex); - } - - @Override - public void seekTo(long positionMs) { - player.seekTo(positionMs); - } - - @Override - public void seekTo(int windowIndex, long positionMs) { - player.seekTo(windowIndex, positionMs); - } - - @Override - public void setPlaybackParameters(PlaybackParameters playbackParameters) { - player.setPlaybackParameters(playbackParameters); - } - - @Override - public PlaybackParameters getPlaybackParameters() { - return player.getPlaybackParameters(); - } - - @Override - public void stop() { - player.stop(); - } - - @Override - public void stop(boolean reset) { - - } - - @Override - public void release() { - player.release(); - removeSurfaceCallbacks(); - if (surface != null) { - if (ownsSurface) { - surface.release(); - } - surface = null; - } - } - - @Override - public void sendMessages(ExoPlayerMessage... messages) { - player.sendMessages(messages); - } - - @Override - public void blockingSendMessages(ExoPlayerMessage... messages) { - player.blockingSendMessages(messages); - } - - @Override - public void setSeekParameters(@Nullable SeekParameters seekParameters) { - - } - - @Override - public int getRendererCount() { - return player.getRendererCount(); - } - - @Override - public int getRendererType(int index) { - return player.getRendererType(index); - } - - @Override - public TrackGroupArray getCurrentTrackGroups() { - return player.getCurrentTrackGroups(); - } - - @Override - public TrackSelectionArray getCurrentTrackSelections() { - return player.getCurrentTrackSelections(); - } - - @Override - public Timeline getCurrentTimeline() { - return player.getCurrentTimeline(); - } - - @Override - public Object getCurrentManifest() { - return player.getCurrentManifest(); - } - - @Override - public int getCurrentPeriodIndex() { - return player.getCurrentPeriodIndex(); - } - - @Override - public int getCurrentWindowIndex() { - return player.getCurrentWindowIndex(); - } - - @Override - public int getNextWindowIndex() { - return player.getNextWindowIndex(); - } - - @Override - public int getPreviousWindowIndex() { - return player.getPreviousWindowIndex(); - } - - @Override - public long getDuration() { - return player.getDuration(); - } - - @Override - public long getCurrentPosition() { - return player.getCurrentPosition(); - } - - @Override - public long getBufferedPosition() { - return player.getBufferedPosition(); - } - - @Override - public int getBufferedPercentage() { - return player.getBufferedPercentage(); - } - - @Override - public boolean isCurrentWindowDynamic() { - return player.isCurrentWindowDynamic(); - } - - @Override - public boolean isCurrentWindowSeekable() { - return player.isCurrentWindowSeekable(); - } - - @Override - public boolean isPlayingAd() { - return player.isPlayingAd(); - } - - @Override - public int getCurrentAdGroupIndex() { - return player.getCurrentAdGroupIndex(); - } - - @Override - public int getCurrentAdIndexInAdGroup() { - return player.getCurrentAdIndexInAdGroup(); - } - - @Override - public long getContentPosition() { - return player.getContentPosition(); - } - - // Internal methods. - - - protected ExoPlayer createExoPlayerImpl(Renderer[] renderers, TrackSelector trackSelector, - LoadControl loadControl) { - return ExoPlayerFactory.newInstance(renderers, trackSelector, loadControl); - } - - private void removeSurfaceCallbacks() { - if (textureView != null) { - if (textureView.getSurfaceTextureListener() != componentListener) { - Log.w(TAG, "SurfaceTextureListener already unset or replaced."); - } else { - textureView.setSurfaceTextureListener(null); - } - textureView = null; - } - if (surfaceHolder != null) { - surfaceHolder.removeCallback(componentListener); - surfaceHolder = null; - } - } - - private void setVideoSurfaceInternal(Surface surface, boolean ownsSurface) { - // Note: We don't turn this method into a no-op if the surface is being replaced with itself - // so as to ensure onRenderedFirstFrame callbacks are still called in this case. - ExoPlayerMessage[] messages = new ExoPlayerMessage[videoRendererCount]; - int count = 0; - for (Renderer renderer : renderers) { - if (renderer.getTrackType() == C.TRACK_TYPE_VIDEO) { - messages[count++] = new ExoPlayerMessage(renderer, C.MSG_SET_SURFACE, surface); - } - } - if (this.surface != null && this.surface != surface) { - // We're replacing a surface. Block to ensure that it's not accessed after the method returns. - player.blockingSendMessages(messages); - // If we created the previous surface, we are responsible for releasing it. - if (this.ownsSurface) { - this.surface.release(); - } - } else { - player.sendMessages(messages); - } - this.surface = surface; - this.ownsSurface = ownsSurface; - } - - private final class ComponentListener implements VideoRendererEventListener, - AudioRendererEventListener, TextOutput, MetadataOutput, SurfaceHolder.Callback, - TextureView.SurfaceTextureListener { - - // VideoRendererEventListener implementation - - @Override - public void onVideoEnabled(DecoderCounters counters) { - videoDecoderCounters = counters; - if (videoDebugListener != null) { - videoDebugListener.onVideoEnabled(counters); - } - } - - @Override - public void onVideoDecoderInitialized(String decoderName, long initializedTimestampMs, - long initializationDurationMs) { - if (videoDebugListener != null) { - videoDebugListener.onVideoDecoderInitialized(decoderName, initializedTimestampMs, - initializationDurationMs); - } - } - - @Override - public void onVideoInputFormatChanged(Format format) { - videoFormat = format; - if (videoDebugListener != null) { - videoDebugListener.onVideoInputFormatChanged(format); - } - } - - @Override - public void onDroppedFrames(int count, long elapsed) { - if (videoDebugListener != null) { - videoDebugListener.onDroppedFrames(count, elapsed); - } - } - - @Override - public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, - float pixelWidthHeightRatio) { - for (VideoListener videoListener : videoListeners) { - videoListener.onVideoSizeChanged(width, height, unappliedRotationDegrees, - pixelWidthHeightRatio); - } - if (videoDebugListener != null) { - videoDebugListener.onVideoSizeChanged(width, height, unappliedRotationDegrees, - pixelWidthHeightRatio); - } - } - - @Override - public void onRenderedFirstFrame(Surface surface) { - if (SimpleExoPlayer.this.surface == surface) { - for (VideoListener videoListener : videoListeners) { - videoListener.onRenderedFirstFrame(); - } - } - if (videoDebugListener != null) { - videoDebugListener.onRenderedFirstFrame(surface); - } - } - - @Override - public void onVideoDisabled(DecoderCounters counters) { - if (videoDebugListener != null) { - videoDebugListener.onVideoDisabled(counters); - } - videoFormat = null; - videoDecoderCounters = null; - } - - // AudioRendererEventListener implementation - - @Override - public void onAudioEnabled(DecoderCounters counters) { - audioDecoderCounters = counters; - if (audioDebugListener != null) { - audioDebugListener.onAudioEnabled(counters); - } - } - - @Override - public void onAudioSessionId(int sessionId) { - audioSessionId = sessionId; - if (audioDebugListener != null) { - audioDebugListener.onAudioSessionId(sessionId); - } - } - - @Override - public void onAudioDecoderInitialized(String decoderName, long initializedTimestampMs, - long initializationDurationMs) { - if (audioDebugListener != null) { - audioDebugListener.onAudioDecoderInitialized(decoderName, initializedTimestampMs, - initializationDurationMs); - } - } - - @Override - public void onAudioInputFormatChanged(Format format) { - audioFormat = format; - if (audioDebugListener != null) { - audioDebugListener.onAudioInputFormatChanged(format); - } - } - - @Override - public void onAudioSinkUnderrun(int bufferSize, long bufferSizeMs, - long elapsedSinceLastFeedMs) { - if (audioDebugListener != null) { - audioDebugListener.onAudioSinkUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs); - } - } - - @Override - public void onAudioDisabled(DecoderCounters counters) { - if (audioDebugListener != null) { - audioDebugListener.onAudioDisabled(counters); - } - audioFormat = null; - audioDecoderCounters = null; - audioSessionId = C.AUDIO_SESSION_ID_UNSET; - } - - // TextOutput implementation - - @Override - public void onCues(List cues) { - for (TextOutput textOutput : textOutputs) { - textOutput.onCues(cues); - } - } - - // MetadataOutput implementation - - @Override - public void onMetadata(Metadata metadata) { - for (MetadataOutput metadataOutput : metadataOutputs) { - metadataOutput.onMetadata(metadata); - } - } - - // SurfaceHolder.Callback implementation - - @Override - public void surfaceCreated(SurfaceHolder holder) { - setVideoSurfaceInternal(holder.getSurface(), false); - } - - @Override - public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - // Do nothing. - } - - @Override - public void surfaceDestroyed(SurfaceHolder holder) { - setVideoSurfaceInternal(null, false); - } - - // TextureView.SurfaceTextureListener implementation - - @Override - public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, int height) { - setVideoSurfaceInternal(new Surface(surfaceTexture), true); - } - - @Override - public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int width, int height) { - // Do nothing. - } - - @Override - public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) { - setVideoSurfaceInternal(null, true); - return true; - } - - @Override - public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) { - // Do nothing. - } - - } - -} diff --git a/app/src/main/java/com/dueeeke/dkplayer/player/Repeater.java b/app/src/main/java/com/dueeeke/dkplayer/util/Repeater.java similarity index 99% rename from app/src/main/java/com/dueeeke/dkplayer/player/Repeater.java rename to app/src/main/java/com/dueeeke/dkplayer/util/Repeater.java index d3696d9a..8c671c0b 100644 --- a/app/src/main/java/com/dueeeke/dkplayer/player/Repeater.java +++ b/app/src/main/java/com/dueeeke/dkplayer/util/Repeater.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.dueeeke.dkplayer.player; +package com.dueeeke.dkplayer.util; import android.os.Handler; import android.os.HandlerThread; diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/util/L.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/util/L.java index 1cf386c5..164bc023 100644 --- a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/util/L.java +++ b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/util/L.java @@ -11,12 +11,28 @@ public class L { private static final String TAG = "DKPlayer"; + private static boolean isDebug = false; + public static void d(String msg) { - Log.d(TAG, msg); + if (isDebug) { + Log.d(TAG, msg); + } } public static void e(String msg) { - Log.e(TAG, msg); + if (isDebug) { + Log.e(TAG, msg); + } + } + + public static void i(String msg) { + if (isDebug) { + Log.i(TAG, msg); + } + } + + public static void setDebug(boolean isDebug) { + L.isDebug = isDebug; } }