diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java similarity index 98% rename from extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java rename to extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java index 48acc4a9c8..acddae49e9 100644 --- a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ui/spherical/BaseGvrPlayerActivity.java +++ b/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.exoplayer2.ui.spherical; +package com.google.android.exoplayer2.ext.gvr; import android.content.Context; import android.content.Intent; @@ -32,8 +32,10 @@ import android.view.MotionEvent; import android.view.Surface; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.ext.gvr.R; import com.google.android.exoplayer2.ui.PlayerControlView; +import com.google.android.exoplayer2.ui.spherical.GlViewGroup; +import com.google.android.exoplayer2.ui.spherical.PointerRenderer; +import com.google.android.exoplayer2.ui.spherical.SceneRenderer; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; import com.google.vr.ndk.base.DaydreamApi; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java index 9e51c2ba45..247de5a3d0 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java @@ -40,7 +40,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * GL thread before it can be rendered. */ @TargetApi(15) -/* package */ final class CanvasRenderer { +public final class CanvasRenderer { private static final float WIDTH_UNIT = 0.8f; private static final float DISTANCE_UNIT = 1f; @@ -156,7 +156,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } /** Finishes constructing this object on the GL Thread. */ - /* package */ void init() { + public void init() { if (program != 0) { return; } @@ -183,7 +183,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * @param viewProjectionMatrix Array of floats containing the quad's 4x4 perspective matrix in the * {@link android.opengl.Matrix} format. */ - /* package */ void draw(float[] viewProjectionMatrix) { + public void draw(float[] viewProjectionMatrix) { if (displaySurfaceTexture == null) { return; } @@ -237,7 +237,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } /** Frees GL resources. */ - /* package */ void shutdown() { + public void shutdown() { if (program != 0) { GLES20.glDeleteProgram(program); GLES20.glDeleteTextures(1, new int[] {textureId}, 0); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java index 09e2f22207..b3c1a963b8 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java @@ -31,7 +31,7 @@ import android.widget.FrameLayout; import com.google.android.exoplayer2.util.Assertions; /** This View uses standard Android APIs to render its child Views to a texture. */ -/* package */ final class GlViewGroup extends FrameLayout { +public final class GlViewGroup extends FrameLayout { private final CanvasRenderer canvasRenderer; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java index d0a4d4c882..fa7118a0fb 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java @@ -24,7 +24,7 @@ import com.google.android.exoplayer2.util.GlUtil; import java.nio.FloatBuffer; /** Renders a pointer. */ -/* package */ final class PointerRenderer { +public final class PointerRenderer { // The pointer quad is 2 * SIZE units. private static final float SIZE = .01f; private static final float DISTANCE = 1; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java index b3b1acb7e4..6793b0c584 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java @@ -36,8 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; /** Renders a GL Scene. */ -/* package */ final class SceneRenderer - implements VideoFrameMetadataListener, CameraMotionListener { +public final class SceneRenderer implements VideoFrameMetadataListener, CameraMotionListener { private final AtomicBoolean frameAvailable; private final AtomicBoolean resetRotationAtNextFrame;