>, DebugTextViewHelper.Provider {
-
- /**
- * Builds renderers for the player.
- */
- public interface RendererBuilder {
- /**
- * Builds renderers for playback.
- *
- * @param player The player for which renderers are being built. {@link NPExoPlayer#onRenderers}
- * should be invoked once the renderers have been built. If building fails,
- * {@link NPExoPlayer#onRenderersError} should be invoked.
- */
- void buildRenderers(NPExoPlayer player);
- /**
- * Cancels the current build operation, if there is one. Else does nothing.
- *
- * A canceled build operation must not invoke {@link NPExoPlayer#onRenderers} or
- * {@link NPExoPlayer#onRenderersError} on the player, which may have been released.
- */
- void cancel();
- }
-
- /**
- * A listener for core events.
- */
- public interface Listener {
- void onStateChanged(boolean playWhenReady, int playbackState);
- void onError(Exception e);
- void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
- float pixelWidthHeightRatio);
- }
-
- /**
- * A listener for internal errors.
- *
- * These errors are not visible to the user, and hence this listener is provided for
- * informational purposes only. Note however that an internal error may cause a fatal
- * error if the player fails to recover. If this happens, {@link Listener#onError(Exception)}
- * will be invoked.
- */
- public interface InternalErrorListener {
- void onRendererInitializationError(Exception e);
- void onAudioTrackInitializationError(AudioTrack.InitializationException e);
- void onAudioTrackWriteError(AudioTrack.WriteException e);
- void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
- void onDecoderInitializationError(DecoderInitializationException e);
- void onCryptoError(CryptoException e);
- void onLoadError(int sourceId, IOException e);
- void onDrmSessionManagerError(Exception e);
- }
-
- /**
- * A listener for debugging information.
- */
- public interface InfoListener {
- void onVideoFormatEnabled(Format format, int trigger, long mediaTimeMs);
- void onAudioFormatEnabled(Format format, int trigger, long mediaTimeMs);
- void onDroppedFrames(int count, long elapsed);
- void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate);
- void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
- long mediaStartTimeMs, long mediaEndTimeMs);
- void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
- long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs);
- void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
- long initializationDurationMs);
- void onAvailableRangeChanged(int sourceId, TimeRange availableRange);
- }
-
- /**
- * A listener for receiving notifications of timed text.
- */
- public interface CaptionListener {
- void onCues(List cues);
- }
-
- /**
- * A listener for receiving ID3 metadata parsed from the media stream.
- */
- public interface Id3MetadataListener {
- void onId3Metadata(Map metadata);
- }
-
- // Constants pulled into this class for convenience.
- public static final int STATE_IDLE = ExoPlayer.STATE_IDLE;
- public static final int STATE_PREPARING = ExoPlayer.STATE_PREPARING;
- public static final int STATE_BUFFERING = ExoPlayer.STATE_BUFFERING;
- public static final int STATE_READY = ExoPlayer.STATE_READY;
- public static final int STATE_ENDED = ExoPlayer.STATE_ENDED;
- public static final int TRACK_DISABLED = ExoPlayer.TRACK_DISABLED;
- public static final int TRACK_DEFAULT = ExoPlayer.TRACK_DEFAULT;
-
- public static final int RENDERER_COUNT = 4;
- public static final int TYPE_VIDEO = 0;
- public static final int TYPE_AUDIO = 1;
- public static final int TYPE_TEXT = 2;
- public static final int TYPE_METADATA = 3;
-
- private static final int RENDERER_BUILDING_STATE_IDLE = 1;
- private static final int RENDERER_BUILDING_STATE_BUILDING = 2;
- private static final int RENDERER_BUILDING_STATE_BUILT = 3;
-
- private final RendererBuilder rendererBuilder;
- private final ExoPlayer player;
- private final PlayerControl playerControl;
- private final Handler mainHandler;
- private final CopyOnWriteArrayList listeners;
-
- private int rendererBuildingState;
- private int lastReportedPlaybackState;
- private boolean lastReportedPlayWhenReady;
-
- private Surface surface;
- private TrackRenderer videoRenderer;
- private CodecCounters codecCounters;
- private Format videoFormat;
- private int videoTrackToRestore;
-
- private BandwidthMeter bandwidthMeter;
- private boolean backgrounded;
-
- private CaptionListener captionListener;
- private Id3MetadataListener id3MetadataListener;
- private InternalErrorListener internalErrorListener;
- private InfoListener infoListener;
-
- public NPExoPlayer(RendererBuilder rendererBuilder) {
- this.rendererBuilder = rendererBuilder;
- player = ExoPlayer.Factory.newInstance(RENDERER_COUNT, 1000, 5000);
- player.addListener(this);
- playerControl = new PlayerControl(player);
- mainHandler = new Handler();
- listeners = new CopyOnWriteArrayList<>();
- lastReportedPlaybackState = STATE_IDLE;
- rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
- // Disable text initially.
- player.setSelectedTrack(TYPE_TEXT, TRACK_DISABLED);
- }
-
- public PlayerControl getPlayerControl() {
- return playerControl;
- }
-
- public void addListener(Listener listener) {
- listeners.add(listener);
- }
-
- public void removeListener(Listener listener) {
- listeners.remove(listener);
- }
-
- public void setInternalErrorListener(InternalErrorListener listener) {
- internalErrorListener = listener;
- }
-
- public void setInfoListener(InfoListener listener) {
- infoListener = listener;
- }
-
- public void setCaptionListener(CaptionListener listener) {
- captionListener = listener;
- }
-
- public void setMetadataListener(Id3MetadataListener listener) {
- id3MetadataListener = listener;
- }
-
- public void setSurface(Surface surface) {
- this.surface = surface;
- pushSurface(false);
- }
-
- public Surface getSurface() {
- return surface;
- }
-
- public void blockingClearSurface() {
- surface = null;
- pushSurface(true);
- }
-
- public int getTrackCount(int type) {
- return player.getTrackCount(type);
- }
-
- public MediaFormat getTrackFormat(int type, int index) {
- return player.getTrackFormat(type, index);
- }
-
- public int getSelectedTrack(int type) {
- return player.getSelectedTrack(type);
- }
-
- public void setSelectedTrack(int type, int index) {
- player.setSelectedTrack(type, index);
- if (type == TYPE_TEXT && index < 0 && captionListener != null) {
- captionListener.onCues(Collections.emptyList());
- }
- }
-
- public boolean getBackgrounded() {
- return backgrounded;
- }
-
- public void setBackgrounded(boolean backgrounded) {
- if (this.backgrounded == backgrounded) {
- return;
- }
- this.backgrounded = backgrounded;
- if (backgrounded) {
- videoTrackToRestore = getSelectedTrack(TYPE_VIDEO);
- setSelectedTrack(TYPE_VIDEO, TRACK_DISABLED);
- blockingClearSurface();
- } else {
- setSelectedTrack(TYPE_VIDEO, videoTrackToRestore);
- }
- }
-
- public void prepare() {
- if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILT) {
- player.stop();
- }
- rendererBuilder.cancel();
- videoFormat = null;
- videoRenderer = null;
- rendererBuildingState = RENDERER_BUILDING_STATE_BUILDING;
- maybeReportPlayerState();
- rendererBuilder.buildRenderers(this);
- }
-
- /**
- * Invoked with the results from a {@link RendererBuilder}.
- *
- * @param renderers Renderers indexed by {@link NPExoPlayer} TYPE_* constants. An individual
- * element may be null if there do not exist tracks of the corresponding type.
- * @param bandwidthMeter Provides an estimate of the currently available bandwidth. May be null.
- */
- /* package */ void onRenderers(TrackRenderer[] renderers, BandwidthMeter bandwidthMeter) {
- for (int i = 0; i < RENDERER_COUNT; i++) {
- if (renderers[i] == null) {
- // Convert a null renderer to a dummy renderer.
- renderers[i] = new DummyTrackRenderer();
- }
- }
- // Complete preparation.
- this.videoRenderer = renderers[TYPE_VIDEO];
- this.codecCounters = videoRenderer instanceof MediaCodecTrackRenderer
- ? ((MediaCodecTrackRenderer) videoRenderer).codecCounters
- : renderers[TYPE_AUDIO] instanceof MediaCodecTrackRenderer
- ? ((MediaCodecTrackRenderer) renderers[TYPE_AUDIO]).codecCounters : null;
- this.bandwidthMeter = bandwidthMeter;
- pushSurface(false);
- player.prepare(renderers);
- rendererBuildingState = RENDERER_BUILDING_STATE_BUILT;
- }
-
- /**
- * Invoked if a {@link RendererBuilder} encounters an error.
- *
- * @param e Describes the error.
- */
- /* package */ void onRenderersError(Exception e) {
- if (internalErrorListener != null) {
- internalErrorListener.onRendererInitializationError(e);
- }
- for (Listener listener : listeners) {
- listener.onError(e);
- }
- rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
- maybeReportPlayerState();
- }
-
- public void setPlayWhenReady(boolean playWhenReady) {
- player.setPlayWhenReady(playWhenReady);
- }
-
- public void seekTo(long positionMs) {
- player.seekTo(positionMs);
- }
-
- public void release() {
- rendererBuilder.cancel();
- rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
- surface = null;
- player.release();
- }
-
- public int getPlaybackState() {
- if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILDING) {
- return STATE_PREPARING;
- }
- int playerState = player.getPlaybackState();
- if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILT && playerState == STATE_IDLE) {
- // This is an edge case where the renderers are built, but are still being passed to the
- // player's playback thread.
- return STATE_PREPARING;
- }
- return playerState;
- }
-
- @Override
- public Format getFormat() {
- return videoFormat;
- }
-
- @Override
- public BandwidthMeter getBandwidthMeter() {
- return bandwidthMeter;
- }
-
- @Override
- public CodecCounters getCodecCounters() {
- return codecCounters;
- }
-
- @Override
- public long getCurrentPosition() {
- return player.getCurrentPosition();
- }
-
- public long getDuration() {
- return player.getDuration();
- }
-
- public int getBufferedPercentage() {
- return player.getBufferedPercentage();
- }
-
- public boolean getPlayWhenReady() {
- return player.getPlayWhenReady();
- }
-
- /* package */ Looper getPlaybackLooper() {
- return player.getPlaybackLooper();
- }
-
- /* package */ Handler getMainHandler() {
- return mainHandler;
- }
-
- @Override
- public void onPlayerStateChanged(boolean playWhenReady, int state) {
- maybeReportPlayerState();
- }
-
- @Override
- public void onPlayerError(ExoPlaybackException exception) {
- rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
- for (Listener listener : listeners) {
- listener.onError(exception);
- }
- }
-
- @Override
- public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
- float pixelWidthHeightRatio) {
- for (Listener listener : listeners) {
- listener.onVideoSizeChanged(width, height, unappliedRotationDegrees, pixelWidthHeightRatio);
- }
- }
-
- @Override
- public void onDroppedFrames(int count, long elapsed) {
- if (infoListener != null) {
- infoListener.onDroppedFrames(count, elapsed);
- }
- }
-
- @Override
- public void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate) {
- if (infoListener != null) {
- infoListener.onBandwidthSample(elapsedMs, bytes, bitrateEstimate);
- }
- }
-
- @Override
- public void onDownstreamFormatChanged(int sourceId, Format format, int trigger,
- long mediaTimeMs) {
- if (infoListener == null) {
- return;
- }
- if (sourceId == TYPE_VIDEO) {
- videoFormat = format;
- infoListener.onVideoFormatEnabled(format, trigger, mediaTimeMs);
- } else if (sourceId == TYPE_AUDIO) {
- infoListener.onAudioFormatEnabled(format, trigger, mediaTimeMs);
- }
- }
-
- @Override
- public void onDrmKeysLoaded() {
- // Do nothing.
- }
-
- @Override
- public void onDrmSessionManagerError(Exception e) {
- if (internalErrorListener != null) {
- internalErrorListener.onDrmSessionManagerError(e);
- }
- }
-
- @Override
- public void onDecoderInitializationError(DecoderInitializationException e) {
- if (internalErrorListener != null) {
- internalErrorListener.onDecoderInitializationError(e);
- }
- }
-
- @Override
- public void onAudioTrackInitializationError(AudioTrack.InitializationException e) {
- if (internalErrorListener != null) {
- internalErrorListener.onAudioTrackInitializationError(e);
- }
- }
-
- @Override
- public void onAudioTrackWriteError(AudioTrack.WriteException e) {
- if (internalErrorListener != null) {
- internalErrorListener.onAudioTrackWriteError(e);
- }
- }
-
- @Override
- public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
- if (internalErrorListener != null) {
- internalErrorListener.onAudioTrackUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
- }
- }
-
- @Override
- public void onCryptoError(CryptoException e) {
- if (internalErrorListener != null) {
- internalErrorListener.onCryptoError(e);
- }
- }
-
- @Override
- public void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
- long initializationDurationMs) {
- if (infoListener != null) {
- infoListener.onDecoderInitialized(decoderName, elapsedRealtimeMs, initializationDurationMs);
- }
- }
-
- @Override
- public void onLoadError(int sourceId, IOException e) {
- if (internalErrorListener != null) {
- internalErrorListener.onLoadError(sourceId, e);
- }
- }
-
- @Override
- public void onCues(List cues) {
- if (captionListener != null && getSelectedTrack(TYPE_TEXT) != TRACK_DISABLED) {
- captionListener.onCues(cues);
- }
- }
-
- @Override
- public void onMetadata(Map metadata) {
- if (id3MetadataListener != null && getSelectedTrack(TYPE_METADATA) != TRACK_DISABLED) {
- id3MetadataListener.onId3Metadata(metadata);
- }
- }
-
- @Override
- public void onAvailableRangeChanged(int sourceId, TimeRange availableRange) {
- if (infoListener != null) {
- infoListener.onAvailableRangeChanged(sourceId, availableRange);
- }
- }
-
- @Override
- public void onPlayWhenReadyCommitted() {
- // Do nothing.
- }
-
- @Override
- public void onDrawnToSurface(Surface surface) {
- // Do nothing.
- }
-
- @Override
- public void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
- long mediaStartTimeMs, long mediaEndTimeMs) {
- if (infoListener != null) {
- infoListener.onLoadStarted(sourceId, length, type, trigger, format, mediaStartTimeMs,
- mediaEndTimeMs);
- }
- }
-
- @Override
- public void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
- long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs) {
- if (infoListener != null) {
- infoListener.onLoadCompleted(sourceId, bytesLoaded, type, trigger, format, mediaStartTimeMs,
- mediaEndTimeMs, elapsedRealtimeMs, loadDurationMs);
- }
- }
-
- @Override
- public void onLoadCanceled(int sourceId, long bytesLoaded) {
- // Do nothing.
- }
-
- @Override
- public void onUpstreamDiscarded(int sourceId, long mediaStartTimeMs, long mediaEndTimeMs) {
- // Do nothing.
- }
-
- private void maybeReportPlayerState() {
- boolean playWhenReady = player.getPlayWhenReady();
- int playbackState = getPlaybackState();
- if (lastReportedPlayWhenReady != playWhenReady || lastReportedPlaybackState != playbackState) {
- for (Listener listener : listeners) {
- listener.onStateChanged(playWhenReady, playbackState);
- }
- lastReportedPlayWhenReady = playWhenReady;
- lastReportedPlaybackState = playbackState;
- }
- }
-
- private void pushSurface(boolean blockForSurfacePush) {
- if (videoRenderer == null) {
- return;
- }
-
- if (blockForSurfacePush) {
- player.blockingSendMessage(
- videoRenderer, MediaCodecVideoTrackRenderer.MSG_SET_SURFACE, surface);
- } else {
- player.sendMessage(
- videoRenderer, MediaCodecVideoTrackRenderer.MSG_SET_SURFACE, surface);
- }
- }
-
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/exoplayer/SmoothStreamingRendererBuilder.java b/app/src/main/java/org/schabi/newpipe/player/exoplayer/SmoothStreamingRendererBuilder.java
deleted file mode 100644
index 55b59c276..000000000
--- a/app/src/main/java/org/schabi/newpipe/player/exoplayer/SmoothStreamingRendererBuilder.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2014 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 org.schabi.newpipe.player.exoplayer;
-
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.LoadControl;
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.chunk.ChunkSampleSource;
-import com.google.android.exoplayer.chunk.ChunkSource;
-import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator;
-import com.google.android.exoplayer.drm.DrmSessionManager;
-import com.google.android.exoplayer.drm.MediaDrmCallback;
-import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
-import com.google.android.exoplayer.drm.UnsupportedDrmException;
-import com.google.android.exoplayer.smoothstreaming.DefaultSmoothStreamingTrackSelector;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingChunkSource;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifestParser;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-import com.google.android.exoplayer.util.ManifestFetcher;
-import com.google.android.exoplayer.util.Util;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.os.Handler;
-
-import java.io.IOException;
-
-/**
- * A {@link RendererBuilder} for SmoothStreaming.
- */
-public class SmoothStreamingRendererBuilder implements RendererBuilder {
-
- private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
- private static final int VIDEO_BUFFER_SEGMENTS = 200;
- private static final int AUDIO_BUFFER_SEGMENTS = 54;
- private static final int TEXT_BUFFER_SEGMENTS = 2;
- private static final int LIVE_EDGE_LATENCY_MS = 30000;
-
- private final Context context;
- private final String userAgent;
- private final String url;
- private final MediaDrmCallback drmCallback;
-
- private AsyncRendererBuilder currentAsyncBuilder;
-
- public SmoothStreamingRendererBuilder(Context context, String userAgent, String url,
- MediaDrmCallback drmCallback) {
- this.context = context;
- this.userAgent = userAgent;
- this.url = Util.toLowerInvariant(url).endsWith("/manifest") ? url : url + "/Manifest";
- this.drmCallback = drmCallback;
- }
-
- @Override
- public void buildRenderers(NPExoPlayer player) {
- currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, drmCallback, player);
- currentAsyncBuilder.init();
- }
-
- @Override
- public void cancel() {
- if (currentAsyncBuilder != null) {
- currentAsyncBuilder.cancel();
- currentAsyncBuilder = null;
- }
- }
-
- private static final class AsyncRendererBuilder
- implements ManifestFetcher.ManifestCallback {
-
- private final Context context;
- private final String userAgent;
- private final MediaDrmCallback drmCallback;
- private final NPExoPlayer player;
- private final ManifestFetcher manifestFetcher;
-
- private boolean canceled;
-
- public AsyncRendererBuilder(Context context, String userAgent, String url,
- MediaDrmCallback drmCallback, NPExoPlayer player) {
- this.context = context;
- this.userAgent = userAgent;
- this.drmCallback = drmCallback;
- this.player = player;
- SmoothStreamingManifestParser parser = new SmoothStreamingManifestParser();
- manifestFetcher = new ManifestFetcher<>(url, new DefaultHttpDataSource(userAgent, null),
- parser);
- }
-
- public void init() {
- manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this);
- }
-
- public void cancel() {
- canceled = true;
- }
-
- @Override
- public void onSingleManifestError(IOException exception) {
- if (canceled) {
- return;
- }
-
- player.onRenderersError(exception);
- }
-
- @Override
- public void onSingleManifest(SmoothStreamingManifest manifest) {
- if (canceled) {
- return;
- }
-
- Handler mainHandler = player.getMainHandler();
- LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
- DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(mainHandler, player);
-
- // Check drm support if necessary.
- DrmSessionManager drmSessionManager = null;
- if (manifest.protectionElement != null) {
- if (Util.SDK_INT < 18) {
- player.onRenderersError(
- new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME));
- return;
- }
- try {
- drmSessionManager = new StreamingDrmSessionManager(manifest.protectionElement.uuid,
- player.getPlaybackLooper(), drmCallback, null, player.getMainHandler(), player);
- } catch (UnsupportedDrmException e) {
- player.onRenderersError(e);
- return;
- }
- }
-
- // Build the video renderer.
- DataSource videoDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
- ChunkSource videoChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
- DefaultSmoothStreamingTrackSelector.newVideoInstance(context, true, false),
- videoDataSource, new AdaptiveEvaluator(bandwidthMeter), LIVE_EDGE_LATENCY_MS);
- ChunkSampleSource videoSampleSource = new ChunkSampleSource(videoChunkSource, loadControl,
- VIDEO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
- NPExoPlayer.TYPE_VIDEO);
- TrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context, videoSampleSource,
- MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
- drmSessionManager, true, mainHandler, player, 50);
-
- // Build the audio renderer.
- DataSource audioDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
- ChunkSource audioChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
- DefaultSmoothStreamingTrackSelector.newAudioInstance(),
- audioDataSource, null, LIVE_EDGE_LATENCY_MS);
- ChunkSampleSource audioSampleSource = new ChunkSampleSource(audioChunkSource, loadControl,
- AUDIO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
- NPExoPlayer.TYPE_AUDIO);
- TrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(audioSampleSource,
- MediaCodecSelector.DEFAULT, drmSessionManager, true, mainHandler, player,
- AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-
- // Build the text renderer.
- DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
- ChunkSource textChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
- DefaultSmoothStreamingTrackSelector.newTextInstance(),
- textDataSource, null, LIVE_EDGE_LATENCY_MS);
- ChunkSampleSource textSampleSource = new ChunkSampleSource(textChunkSource, loadControl,
- TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
- NPExoPlayer.TYPE_TEXT);
- TrackRenderer textRenderer = new TextTrackRenderer(textSampleSource, player,
- mainHandler.getLooper());
-
- // Invoke the callback.
- TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
- renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
- renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
- renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
- player.onRenderers(renderers, bandwidthMeter);
- }
-
- }
-
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/popup/PopupViewHolder.java b/app/src/main/java/org/schabi/newpipe/player/popup/PopupViewHolder.java
new file mode 100644
index 000000000..22895668e
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/popup/PopupViewHolder.java
@@ -0,0 +1,93 @@
+package org.schabi.newpipe.player.popup;
+
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.os.Build;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import com.devbrackets.android.exomedia.ui.widget.EMVideoView;
+
+import org.schabi.newpipe.R;
+
+public class PopupViewHolder {
+ private View rootView;
+ private EMVideoView videoView;
+ private View loadingPanel;
+ private ImageView endScreen;
+ private ImageView controlAnimationView;
+ private LinearLayout controlsRoot;
+ private SeekBar playbackSeekBar;
+ private TextView playbackCurrentTime;
+ private TextView playbackEndTime;
+
+ public PopupViewHolder(View rootView) {
+ if (rootView == null) return;
+ this.rootView = rootView;
+ this.videoView = (EMVideoView) rootView.findViewById(R.id.popupVideoView);
+ this.loadingPanel = rootView.findViewById(R.id.loadingPanel);
+ this.endScreen = (ImageView) rootView.findViewById(R.id.endScreen);
+ this.controlAnimationView = (ImageView) rootView.findViewById(R.id.controlAnimationView);
+ this.controlsRoot = (LinearLayout) rootView.findViewById(R.id.playbackControlRoot);
+ this.playbackSeekBar = (SeekBar) rootView.findViewById(R.id.playbackSeekBar);
+ this.playbackCurrentTime = (TextView) rootView.findViewById(R.id.playbackCurrentTime);
+ this.playbackEndTime = (TextView) rootView.findViewById(R.id.playbackEndTime);
+ doModifications();
+ }
+
+ private void doModifications() {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) playbackSeekBar.getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN);
+ playbackSeekBar.getProgressDrawable().setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY);
+ }
+
+ public boolean isControlsVisible() {
+ return controlsRoot != null && controlsRoot.getVisibility() == View.VISIBLE;
+ }
+
+ public boolean isVisible(View view) {
+ return view != null && view.getVisibility() == View.VISIBLE;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+ // GETTERS
+ ///////////////////////////////////////////////////////////////////////////
+
+ public View getRootView() {
+ return rootView;
+ }
+
+ public EMVideoView getVideoView() {
+ return videoView;
+ }
+
+ public View getLoadingPanel() {
+ return loadingPanel;
+ }
+
+ public ImageView getEndScreen() {
+ return endScreen;
+ }
+
+ public ImageView getControlAnimationView() {
+ return controlAnimationView;
+ }
+
+ public LinearLayout getControlsRoot() {
+ return controlsRoot;
+ }
+
+ public SeekBar getPlaybackSeekBar() {
+ return playbackSeekBar;
+ }
+
+ public TextView getPlaybackCurrentTime() {
+ return playbackCurrentTime;
+ }
+
+ public TextView getPlaybackEndTime() {
+ return playbackEndTime;
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/popup/StateInterface.java b/app/src/main/java/org/schabi/newpipe/player/popup/StateInterface.java
new file mode 100644
index 000000000..94ea41470
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/popup/StateInterface.java
@@ -0,0 +1,17 @@
+package org.schabi.newpipe.player.popup;
+
+public interface StateInterface {
+ int STATE_LOADING = 123;
+ int STATE_PLAYING = 125;
+ int STATE_PAUSED = 126;
+ int STATE_PAUSED_SEEK = 127;
+ int STATE_COMPLETED = 128;
+
+ void changeState(int state);
+
+ void onLoading();
+ void onPlaying();
+ void onPaused();
+ void onPausedSeek();
+ void onCompleted();
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavStack.java b/app/src/main/java/org/schabi/newpipe/util/NavStack.java
index f84c5725e..a5941ad83 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavStack.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavStack.java
@@ -73,10 +73,6 @@ public class NavStack {
return instance;
}
- private void addEntry(String url, Class ac, int serviceId) {
- stack.push(new NavEntry(url, serviceId));
- }
-
public void navBack(Activity activity) throws Exception {
if(stack.size() == 0) { // if stack is already empty here, activity was probably called
// from another app
@@ -120,7 +116,10 @@ public class NavStack {
}
private void openActivity(Context context, String url, int serviceId, Class acitivtyClass) {
- stack.push(new NavEntry(url, serviceId));
+ //if last element has the same url do not push to stack again
+ if(stack.isEmpty() || !stack.peek().url.equals(url)) {
+ stack.push(new NavEntry(url, serviceId));
+ }
Intent i = new Intent(context, acitivtyClass);
i.putExtra(SERVICE_ID, serviceId);
i.putExtra(URL, url);
@@ -144,6 +143,7 @@ public class NavStack {
public void restoreSavedInstanceState(Bundle state) {
ArrayList sa = state.getStringArrayList(NAV_STACK);
+ stack.clear();
for(String url : sa) {
stack.push(new NavEntry(url, NewPipe.getServiceByUrl(url).getServiceId()));
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java b/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java
index 4c43426c5..a5707ecb2 100644
--- a/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java
@@ -2,8 +2,12 @@ package org.schabi.newpipe.util;
import android.Manifest;
import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
import android.content.pm.PackageManager;
+import android.net.Uri;
import android.os.Build;
+import android.provider.Settings;
import android.support.annotation.RequiresApi;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
@@ -11,7 +15,7 @@ import android.support.v4.content.ContextCompat;
public class PermissionHelper {
public static final int PERMISSION_WRITE_STORAGE = 778;
public static final int PERMISSION_READ_STORAGE = 777;
-
+ public static final int PERMISSION_SYSTEM_ALERT_WINDOW = 779;
public static boolean checkStoragePermissions(Activity activity) {
@@ -65,4 +69,27 @@ public class PermissionHelper {
}
return true;
}
+
+
+ /**
+ * In order to be able to draw over other apps, the permission android.permission.SYSTEM_ALERT_WINDOW have to be granted.
+ *
+ * On < API 23 (MarshMallow) the permission was granted when the user installed the application (via AndroidManifest),
+ * on > 23, however, it have to start a activity asking the user if he agree.
+ *
+ * This method just return if canDraw over other apps, if it doesn't, try to get the permission,
+ * it does not get the result of the startActivityForResult, if the user accept, the next time that he tries to open
+ * it will return true.
+ *
+ * @param activity context to startActivityForResult
+ * @return returns {@link Settings#canDrawOverlays(Context)}
+ **/
+ @RequiresApi(api = Build.VERSION_CODES.M)
+ public static boolean checkSystemAlertWindowPermission(Activity activity) {
+ if (!Settings.canDrawOverlays(activity)) {
+ Intent i = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + activity.getPackageName()));
+ activity.startActivityForResult(i, PERMISSION_SYSTEM_ALERT_WINDOW);
+ return false;
+ }else return true;
+ }
}
diff --git a/app/src/main/res/drawable-hdpi/ic_action_av_fast_forward.png b/app/src/main/res/drawable-hdpi/ic_action_av_fast_forward.png
new file mode 100644
index 000000000..672ee37bc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_av_fast_forward.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white.png b/app/src/main/res/drawable-hdpi/ic_replay_white.png
new file mode 100644
index 000000000..fcddcf02d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_replay_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_av_fast_forward.png b/app/src/main/res/drawable-mdpi/ic_action_av_fast_forward.png
new file mode 100644
index 000000000..f266f3efd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_av_fast_forward.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white.png b/app/src/main/res/drawable-mdpi/ic_replay_white.png
new file mode 100644
index 000000000..3b4191325
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_replay_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_av_fast_forward.png b/app/src/main/res/drawable-xhdpi/ic_action_av_fast_forward.png
new file mode 100644
index 000000000..2e6f43cae
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_av_fast_forward.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white.png b/app/src/main/res/drawable-xhdpi/ic_replay_white.png
new file mode 100644
index 000000000..1573fb111
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_replay_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_av_fast_forward.png b/app/src/main/res/drawable-xxhdpi/ic_action_av_fast_forward.png
new file mode 100644
index 000000000..3012145f0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_av_fast_forward.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white.png
new file mode 100644
index 000000000..5105c2251
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_replay_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_av_fast_forward.png b/app/src/main/res/drawable-xxxhdpi/ic_action_av_fast_forward.png
new file mode 100644
index 000000000..599c66f70
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_av_fast_forward.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white.png
new file mode 100644
index 000000000..04cbde9af
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_replay_white.png differ
diff --git a/app/src/main/res/drawable/popup_controls_bg.xml b/app/src/main/res/drawable/popup_controls_bg.xml
new file mode 100644
index 000000000..d04812bd8
--- /dev/null
+++ b/app/src/main/res/drawable/popup_controls_bg.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exo_player.xml b/app/src/main/res/layout/activity_exo_player.xml
new file mode 100644
index 000000000..5653532ec
--- /dev/null
+++ b/app/src/main/res/layout/activity_exo_player.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/exo_player_activity.xml b/app/src/main/res/layout/exo_player_activity.xml
deleted file mode 100644
index c7d3a7c95..000000000
--- a/app/src/main/res/layout/exo_player_activity.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/exomedia_custom_controls.xml b/app/src/main/res/layout/exomedia_custom_controls.xml
new file mode 100644
index 000000000..dedaf7908
--- /dev/null
+++ b/app/src/main/res/layout/exomedia_custom_controls.xml
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_popup.xml b/app/src/main/res/layout/player_popup.xml
new file mode 100644
index 000000000..6d1860408
--- /dev/null
+++ b/app/src/main/res/layout/player_popup.xml
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_popup_notification.xml b/app/src/main/res/layout/player_popup_notification.xml
new file mode 100644
index 000000000..188589bef
--- /dev/null
+++ b/app/src/main/res/layout/player_popup_notification.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/videoitem_detail.xml b/app/src/main/res/menu/videoitem_detail.xml
index 06184da1d..c4f2d5fb1 100644
--- a/app/src/main/res/menu/videoitem_detail.xml
+++ b/app/src/main/res/menu/videoitem_detail.xml
@@ -22,6 +22,10 @@
app:showAsAction="ifRoom"
android:icon="?attr/cast"/>
+