Skip to content

SDK / exoplayer

Go to a project
Commit 2e5a616f by olly Committed by Oliver Woodman
Options

Core/UI decoupling: Move spherical back to core 

A subsequent change will make the UI module access
SphericalGLSurfaceView and VideoDecoderGLSurfaceView
using reflection, now we're at the point where we only
need to reflect the constructors.

PiperOrigin-RevId: 369630102
parent a78b1829
Expand all
Inline Side-by-side
Showing with 82 additions and 205 deletions
RELEASENOTES.md
...@@ -74,8 +74,6 @@ ...@@ -74,8 +74,6 @@
cache. cache.
* Library restructuring: * Library restructuring:
* `DebugTextViewHelper` moved from `ui` package to `util` package. * `DebugTextViewHelper` moved from `ui` package to `util` package.
* Spherical UI components moved from `video.spherical` package to
`ui.spherical` package, and made package private.
* Remove deprecated symbols: * Remove deprecated symbols:
* Remove `ExoPlayerFactory` methods. Use `SimpleExoPlayer.Builder` * Remove `ExoPlayerFactory` methods. Use `SimpleExoPlayer.Builder`
instead. instead.
......
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
...@@ -48,8 +48,6 @@ import com.google.android.exoplayer2.util.ListenerSet; ...@@ -48,8 +48,6 @@ import com.google.android.exoplayer2.util.ListenerSet;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import com.google.android.gms.cast.CastStatusCodes; import com.google.android.gms.cast.CastStatusCodes;
import com.google.android.gms.cast.MediaInfo; import com.google.android.gms.cast.MediaInfo;
import com.google.android.gms.cast.MediaQueueItem; import com.google.android.gms.cast.MediaQueueItem;
...@@ -655,22 +653,6 @@ public final class CastPlayer extends BasePlayer { ...@@ -655,22 +653,6 @@ public final class CastPlayer extends BasePlayer {
/** This method is not supported and does nothing. */ /** This method is not supported and does nothing. */
@Override @Override
public void setVideoFrameMetadataListener(VideoFrameMetadataListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void clearVideoFrameMetadataListener(VideoFrameMetadataListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void setCameraMotionListener(CameraMotionListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void clearCameraMotionListener(CameraMotionListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void clearVideoSurface() {} public void clearVideoSurface() {}
/** This method is not supported and does nothing. */ /** This method is not supported and does nothing. */
......
library/common/src/main/java/com/google/android/exoplayer2/Player.java
...@@ -35,9 +35,7 @@ import com.google.android.exoplayer2.text.TextOutput; ...@@ -35,9 +35,7 @@ import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.util.ExoFlags; import com.google.android.exoplayer2.util.ExoFlags;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoListener; import com.google.android.exoplayer2.video.VideoListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -1687,40 +1685,6 @@ public interface Player { ...@@ -1687,40 +1685,6 @@ public interface Player {
float getVolume(); float getVolume();
/** /**
* Sets a listener to receive video frame metadata events.
*
* <p>This method is intended to be called by the same component that sets the {@link Surface}
* onto which video will be rendered. If using ExoPlayer's standard UI components, this method
* should not be called directly from application code.
*
* @param listener The listener.
*/
void setVideoFrameMetadataListener(VideoFrameMetadataListener listener);
/**
* Clears the listener which receives video frame metadata events if it matches the one passed.
* Else does nothing.
*
* @param listener The listener to clear.
*/
void clearVideoFrameMetadataListener(VideoFrameMetadataListener listener);
/**
* Sets a listener of camera motion events.
*
* @param listener The listener.
*/
void setCameraMotionListener(CameraMotionListener listener);
/**
* Clears the listener which receives camera motion events if it matches the one passed. Else does
* nothing.
*
* @param listener The listener to clear.
*/
void clearCameraMotionListener(CameraMotionListener listener);
/**
* Clears any {@link Surface}, {@link SurfaceHolder}, {@link SurfaceView} or {@link TextureView} * Clears any {@link Surface}, {@link SurfaceHolder}, {@link SurfaceView} or {@link TextureView}
* currently set on the player. * currently set on the player.
*/ */
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -52,8 +52,6 @@ import com.google.android.exoplayer2.util.HandlerWrapper; ...@@ -52,8 +52,6 @@ import com.google.android.exoplayer2.util.HandlerWrapper;
import com.google.android.exoplayer2.util.ListenerSet; import com.google.android.exoplayer2.util.ListenerSet;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -1012,22 +1010,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -1012,22 +1010,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
/** This method is not supported and does nothing. */ /** This method is not supported and does nothing. */
@Override @Override
public void setVideoFrameMetadataListener(VideoFrameMetadataListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void clearVideoFrameMetadataListener(VideoFrameMetadataListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void setCameraMotionListener(CameraMotionListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void clearCameraMotionListener(CameraMotionListener listener) {}
/** This method is not supported and does nothing. */
@Override
public void clearVideoSurface() {} public void clearVideoSurface() {}
/** This method is not supported and does nothing. */ /** This method is not supported and does nothing. */
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/FrameRotationQueue.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import android.opengl.Matrix; import android.opengl.Matrix;
import com.google.android.exoplayer2.util.TimedValueQueue; import com.google.android.exoplayer2.util.TimedValueQueue;
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/OrientationListener.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import android.hardware.Sensor; import android.hardware.Sensor;
import android.hardware.SensorEvent; import android.hardware.SensorEvent;
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/Projection.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionDecoder.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ui.spherical.Projection.Mesh;
import com.google.android.exoplayer2.ui.spherical.Projection.SubMesh;
import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableBitArray;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.spherical.Projection.Mesh;
import com.google.android.exoplayer2.video.spherical.Projection.SubMesh;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.zip.Inflater; import java.util.zip.Inflater;
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionRenderer.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import static com.google.android.exoplayer2.util.GlUtil.checkGlError; import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/SceneRenderer.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import static com.google.android.exoplayer2.util.GlUtil.checkGlError; import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
...@@ -28,7 +28,6 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -28,7 +28,6 @@ import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.GlUtil; import com.google.android.exoplayer2.util.GlUtil;
import com.google.android.exoplayer2.util.TimedValueQueue; import com.google.android.exoplayer2.util.TimedValueQueue;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/SphericalGLSurfaceView.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import android.content.Context; import android.content.Context;
import android.graphics.PointF; import android.graphics.PointF;
...@@ -36,9 +36,10 @@ import androidx.annotation.Nullable; ...@@ -36,9 +36,10 @@ import androidx.annotation.Nullable;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.opengles.GL10;
...@@ -54,6 +55,16 @@ import javax.microedition.khronos.opengles.GL10; ...@@ -54,6 +55,16 @@ import javax.microedition.khronos.opengles.GL10;
*/ */
public final class SphericalGLSurfaceView extends GLSurfaceView { public final class SphericalGLSurfaceView extends GLSurfaceView {
/** Listener for the {@link Surface} to which video frames should be rendered. */
public interface VideoSurfaceListener {
/** Called when the {@link Surface} to which video frames should be rendered is created. */
void onVideoSurfaceCreated(Surface surface);
/** Called when the {@link Surface} to which video frames should be rendered is destroyed. */
void onVideoSurfaceDestroyed(Surface surface);
}
// Arbitrary vertical field of view. // Arbitrary vertical field of view.
private static final int FIELD_OF_VIEW_DEGREES = 90; private static final int FIELD_OF_VIEW_DEGREES = 90;
private static final float Z_NEAR = 0.1f; private static final float Z_NEAR = 0.1f;
...@@ -64,6 +75,7 @@ public final class SphericalGLSurfaceView extends GLSurfaceView { ...@@ -64,6 +75,7 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
/* package */ static final float UPRIGHT_ROLL = (float) Math.PI; /* package */ static final float UPRIGHT_ROLL = (float) Math.PI;
private final CopyOnWriteArrayList<VideoSurfaceListener> videoSurfaceListeners;
private final SensorManager sensorManager; private final SensorManager sensorManager;
@Nullable private final Sensor orientationSensor; @Nullable private final Sensor orientationSensor;
private final OrientationListener orientationListener; private final OrientationListener orientationListener;
...@@ -72,7 +84,6 @@ public final class SphericalGLSurfaceView extends GLSurfaceView { ...@@ -72,7 +84,6 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
private final SceneRenderer scene; private final SceneRenderer scene;
@Nullable private SurfaceTexture surfaceTexture; @Nullable private SurfaceTexture surfaceTexture;
@Nullable private Surface surface; @Nullable private Surface surface;
@Nullable private Player player;
private boolean useSensorRotation; private boolean useSensorRotation;
private boolean isStarted; private boolean isStarted;
private boolean isOrientationListenerRegistered; private boolean isOrientationListenerRegistered;
...@@ -83,6 +94,7 @@ public final class SphericalGLSurfaceView extends GLSurfaceView { ...@@ -83,6 +94,7 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
public SphericalGLSurfaceView(Context context, @Nullable AttributeSet attributeSet) { public SphericalGLSurfaceView(Context context, @Nullable AttributeSet attributeSet) {
super(context, attributeSet); super(context, attributeSet);
videoSurfaceListeners = new CopyOnWriteArrayList<>();
mainHandler = new Handler(Looper.getMainLooper()); mainHandler = new Handler(Looper.getMainLooper());
// Configure sensors and touch. // Configure sensors and touch.
...@@ -116,6 +128,43 @@ public final class SphericalGLSurfaceView extends GLSurfaceView { ...@@ -116,6 +128,43 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
} }
/** /**
* Adds a {@link VideoSurfaceListener}.
*
* @param listener The listener to add.
*/
public void addVideoSurfaceListener(VideoSurfaceListener listener) {
videoSurfaceListeners.add(listener);
}
/**
* Removes a {@link VideoSurfaceListener}.
*
* @param listener The listener to remove.
*/
public void removeVideoSurfaceListener(VideoSurfaceListener listener) {
videoSurfaceListeners.remove(listener);
}
/**
* Returns the {@link Surface} to which video frames should be rendered, or {@code null} if it has
* not been created.
*/
@Nullable
public Surface getVideoSurface() {
return surface;
}
/** Returns the {@link VideoFrameMetadataListener} that should be registered during playback. */
public VideoFrameMetadataListener getVideoFrameMetadataListener() {
return scene;
}
/** Returns the {@link CameraMotionListener} that should be registered during playback. */
public CameraMotionListener getCameraMotionListener() {
return scene;
}
/**
* Sets the default stereo mode. If the played video doesn't contain a stereo mode the default one * Sets the default stereo mode. If the played video doesn't contain a stereo mode the default one
* is used. * is used.
* *
...@@ -125,26 +174,6 @@ public final class SphericalGLSurfaceView extends GLSurfaceView { ...@@ -125,26 +174,6 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
scene.setDefaultStereoMode(stereoMode); scene.setDefaultStereoMode(stereoMode);
} }
/** Sets the {@link Player} to use. */
public void setPlayer(@Nullable Player newPlayer) {
if (newPlayer == player) {
return;
}
if (player != null) {
if (surface != null) {
player.clearVideoSurface(surface);
}
player.clearVideoFrameMetadataListener(scene);
player.clearCameraMotionListener(scene);
}
player = newPlayer;
if (this.player != null) {
player.setVideoFrameMetadataListener(scene);
player.setCameraMotionListener(scene);
player.setVideoSurface(surface);
}
}
/** Sets whether to use the orientation sensor for rotation (if available). */ /** Sets whether to use the orientation sensor for rotation (if available). */
public void setUseSensorRotation(boolean useSensorRotation) { public void setUseSensorRotation(boolean useSensorRotation) {
this.useSensorRotation = useSensorRotation; this.useSensorRotation = useSensorRotation;
...@@ -173,14 +202,15 @@ public final class SphericalGLSurfaceView extends GLSurfaceView { ...@@ -173,14 +202,15 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
// Post to make sure we occur in order with any onSurfaceTextureAvailable calls. // Post to make sure we occur in order with any onSurfaceTextureAvailable calls.
mainHandler.post( mainHandler.post(
() -> { () -> {
if (surface != null) { @Nullable Surface oldSurface = surface;
if (player != null) { if (oldSurface != null) {
player.clearVideoSurface(surface); for (VideoSurfaceListener videoSurfaceListener : videoSurfaceListeners) {
videoSurfaceListener.onVideoSurfaceDestroyed(oldSurface);
} }
releaseSurface(surfaceTexture, surface);
surfaceTexture = null;
surface = null;
} }
releaseSurface(surfaceTexture, oldSurface);
surfaceTexture = null;
surface = null;
}); });
} }
...@@ -199,15 +229,16 @@ public final class SphericalGLSurfaceView extends GLSurfaceView { ...@@ -199,15 +229,16 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
} }
// Called on GL thread. // Called on GL thread.
private void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture) { private void onSurfaceTextureAvailable(SurfaceTexture newSurfaceTexture) {
mainHandler.post( mainHandler.post(
() -> { () -> {
SurfaceTexture oldSurfaceTexture = this.surfaceTexture; @Nullable SurfaceTexture oldSurfaceTexture = surfaceTexture;
Surface oldSurface = this.surface; @Nullable Surface oldSurface = surface;
this.surfaceTexture = surfaceTexture; Surface newSurface = new Surface(newSurfaceTexture);
this.surface = new Surface(surfaceTexture); surfaceTexture = newSurfaceTexture;
if (player != null) { surface = newSurface;
player.setVideoSurface(surface); for (VideoSurfaceListener videoSurfaceListener : videoSurfaceListeners) {
videoSurfaceListener.onVideoSurfaceCreated(newSurface);
} }
releaseSurface(oldSurfaceTexture, oldSurface); releaseSurface(oldSurfaceTexture, oldSurface);
}); });
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java → library/core/src/main/java/com/google/android/exoplayer2/video/spherical/TouchTracker.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import android.content.Context; import android.content.Context;
import android.graphics.PointF; import android.graphics.PointF;
......
library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/FrameRotationQueueTest.java → library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
......
library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/ProjectionDecoderTest.java → library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
......
library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/ProjectionTest.java → library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
......
library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java → library/core/src/test/java/com/google/android/exoplayer2/video/spherical/TouchTrackerTest.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.ui.spherical; package com.google.android.exoplayer2.video.spherical;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
...@@ -62,12 +62,12 @@ import com.google.android.exoplayer2.text.Cue; ...@@ -62,12 +62,12 @@ import com.google.android.exoplayer2.text.Cue;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.trackselection.TrackSelectionUtil; import com.google.android.exoplayer2.trackselection.TrackSelectionUtil;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
import com.google.android.exoplayer2.ui.spherical.SphericalGLSurfaceView;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.ErrorMessageProvider; import com.google.android.exoplayer2.util.ErrorMessageProvider;
import com.google.android.exoplayer2.util.RepeatModeUtil; import com.google.android.exoplayer2.util.RepeatModeUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView; import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView;
import com.google.android.exoplayer2.video.spherical.SphericalGLSurfaceView;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -566,8 +566,6 @@ public class PlayerView extends FrameLayout implements AdViewProvider { ...@@ -566,8 +566,6 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
if (oldPlayer.isCommandAvailable(COMMAND_SET_VIDEO_SURFACE)) { if (oldPlayer.isCommandAvailable(COMMAND_SET_VIDEO_SURFACE)) {
if (surfaceView instanceof TextureView) { if (surfaceView instanceof TextureView) {
oldPlayer.clearVideoTextureView((TextureView) surfaceView); oldPlayer.clearVideoTextureView((TextureView) surfaceView);
} else if (surfaceView instanceof SphericalGLSurfaceView) {
((SphericalGLSurfaceView) surfaceView).setPlayer(null);
} else if (surfaceView instanceof SurfaceView) { } else if (surfaceView instanceof SurfaceView) {
oldPlayer.clearVideoSurfaceView((SurfaceView) surfaceView); oldPlayer.clearVideoSurfaceView((SurfaceView) surfaceView);
} }
...@@ -587,8 +585,6 @@ public class PlayerView extends FrameLayout implements AdViewProvider { ...@@ -587,8 +585,6 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
if (player.isCommandAvailable(COMMAND_SET_VIDEO_SURFACE)) { if (player.isCommandAvailable(COMMAND_SET_VIDEO_SURFACE)) {
if (surfaceView instanceof TextureView) { if (surfaceView instanceof TextureView) {
player.setVideoTextureView((TextureView) surfaceView); player.setVideoTextureView((TextureView) surfaceView);
} else if (surfaceView instanceof SphericalGLSurfaceView) {
((SphericalGLSurfaceView) surfaceView).setPlayer(player);
} else if (surfaceView instanceof SurfaceView) { } else if (surfaceView instanceof SurfaceView) {
player.setVideoSurfaceView((SurfaceView) surfaceView); player.setVideoSurfaceView((SurfaceView) surfaceView);
} }
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
...@@ -63,12 +63,12 @@ import com.google.android.exoplayer2.text.Cue; ...@@ -63,12 +63,12 @@ import com.google.android.exoplayer2.text.Cue;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.trackselection.TrackSelectionUtil; import com.google.android.exoplayer2.trackselection.TrackSelectionUtil;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
import com.google.android.exoplayer2.ui.spherical.SphericalGLSurfaceView;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.ErrorMessageProvider; import com.google.android.exoplayer2.util.ErrorMessageProvider;
import com.google.android.exoplayer2.util.RepeatModeUtil; import com.google.android.exoplayer2.util.RepeatModeUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView; import com.google.android.exoplayer2.video.VideoDecoderGLSurfaceView;
import com.google.android.exoplayer2.video.spherical.SphericalGLSurfaceView;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -570,11 +570,8 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider { ...@@ -570,11 +570,8 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
} }
@Nullable Player oldPlayer = this.player; @Nullable Player oldPlayer = this.player;
if (oldPlayer != null) { if (oldPlayer != null) {
oldPlayer.removeListener(componentListener);
if (surfaceView instanceof TextureView) { if (surfaceView instanceof TextureView) {
oldPlayer.clearVideoTextureView((TextureView) surfaceView); oldPlayer.clearVideoTextureView((TextureView) surfaceView);
} else if (surfaceView instanceof SphericalGLSurfaceView) {
((SphericalGLSurfaceView) surfaceView).setPlayer(null);
} else if (surfaceView instanceof SurfaceView) { } else if (surfaceView instanceof SurfaceView) {
oldPlayer.clearVideoSurfaceView((SurfaceView) surfaceView); oldPlayer.clearVideoSurfaceView((SurfaceView) surfaceView);
} }
...@@ -593,8 +590,6 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider { ...@@ -593,8 +590,6 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
if (player.isCommandAvailable(COMMAND_SET_VIDEO_SURFACE)) { if (player.isCommandAvailable(COMMAND_SET_VIDEO_SURFACE)) {
if (surfaceView instanceof TextureView) { if (surfaceView instanceof TextureView) {
player.setVideoTextureView((TextureView) surfaceView); player.setVideoTextureView((TextureView) surfaceView);
} else if (surfaceView instanceof SphericalGLSurfaceView) {
((SphericalGLSurfaceView) surfaceView).setPlayer(player);
} else if (surfaceView instanceof SurfaceView) { } else if (surfaceView instanceof SurfaceView) {
player.setVideoSurfaceView((SurfaceView) surfaceView); player.setVideoSurfaceView((SurfaceView) surfaceView);
} }
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SingleTapListener.java deleted 100644 → 0
/*
* Copyright (C) 2018 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.google.android.exoplayer2.ui.spherical;
import android.view.MotionEvent;
/** Listens tap events on a {@link android.view.View}. */
public interface SingleTapListener {
/**
* Notified when a tap occurs with the up {@link MotionEvent} that triggered it.
*
* @param e The up motion event that completed the first tap.
* @return Whether the event is consumed.
*/
boolean onSingleTapUp(MotionEvent e);
}
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/package-info.java deleted 100644 → 0
/*
* Copyright (C) 2019 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.
*/
@NonNullApi
package com.google.android.exoplayer2.ui.spherical;
import com.google.android.exoplayer2.util.NonNullApi;
testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
...@@ -41,8 +41,6 @@ import com.google.android.exoplayer2.text.Cue; ...@@ -41,8 +41,6 @@ import com.google.android.exoplayer2.text.Cue;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.trackselection.TrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import java.util.List; import java.util.List;
/** /**
...@@ -447,26 +445,6 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer { ...@@ -447,26 +445,6 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer {
} }
@Override @Override
public void setVideoFrameMetadataListener(VideoFrameMetadataListener listener) {
throw new UnsupportedOperationException();
}
@Override
public void clearVideoFrameMetadataListener(VideoFrameMetadataListener listener) {
throw new UnsupportedOperationException();
}
@Override
public void setCameraMotionListener(CameraMotionListener listener) {
throw new UnsupportedOperationException();
}
@Override
public void clearCameraMotionListener(CameraMotionListener listener) {
throw new UnsupportedOperationException();
}
@Override
public void clearVideoSurface() { public void clearVideoSurface() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment