Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1b6dd40a
authored
Feb 15, 2021
by
olly
Committed by
kim-vde
Feb 19, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Move Spherical UI components to the UI module
PiperOrigin-RevId: 357549002
parent
6a642ec5
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
14 additions
and
17 deletions
RELEASENOTES.md
library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java → library/common/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java → library/common/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java → library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/FrameRotationQueue.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java → library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/Projection.java
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java → library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionDecoder.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java → library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/FrameRotationQueueTest.java
library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java → library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/ProjectionDecoderTest.java
library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java → library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/ProjectionTest.java
RELEASENOTES.md
View file @
1b6dd40a
...
...
@@ -8,6 +8,8 @@
*
Add builder for
`PlayerNotificationManager`
.
*
Library restructuring:
*
`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
`Player.DefaultEventListener`
. Use
`Player.EventListener`
instead.
...
...
library/co
re
/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
→
library/co
mmon
/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
View file @
1b6dd40a
File moved
library/co
re
/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
→
library/co
mmon
/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
View file @
1b6dd40a
File moved
library/
core/src/main/java/com/google/android/exoplayer2/video
/spherical/FrameRotationQueue.java
→
library/
ui/src/main/java/com/google/android/exoplayer2/ui
/spherical/FrameRotationQueue.java
View file @
1b6dd40a
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
com
.
google
.
android
.
exoplayer2
.
video
.
spherical
;
package
com
.
google
.
android
.
exoplayer2
.
ui
.
spherical
;
import
android.opengl.Matrix
;
import
com.google.android.exoplayer2.util.TimedValueQueue
;
...
...
@@ -27,7 +27,7 @@ import com.google.android.exoplayer2.util.TimedValueQueue;
* <li>Recenters the rotations to componsate the yaw of the initial rotation.
* </ul>
*/
public
final
class
FrameRotationQueue
{
/* package */
final
class
FrameRotationQueue
{
private
final
float
[]
recenterMatrix
;
private
final
float
[]
rotationMatrix
;
private
final
TimedValueQueue
<
float
[]>
rotations
;
...
...
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
View file @
1b6dd40a
...
...
@@ -23,7 +23,6 @@ import android.opengl.Matrix;
import
android.view.Display
;
import
android.view.Surface
;
import
androidx.annotation.BinderThread
;
import
com.google.android.exoplayer2.video.spherical.FrameRotationQueue
;
/**
* Listens for orientation sensor events, converts event data to rotation matrix and roll value, and
...
...
library/
core/src/main/java/com/google/android/exoplayer2/video
/spherical/Projection.java
→
library/
ui/src/main/java/com/google/android/exoplayer2/ui
/spherical/Projection.java
View file @
1b6dd40a
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
com
.
google
.
android
.
exoplayer2
.
video
.
spherical
;
package
com
.
google
.
android
.
exoplayer2
.
ui
.
spherical
;
import
androidx.annotation.IntDef
;
import
com.google.android.exoplayer2.C
;
...
...
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention;
import
java.lang.annotation.RetentionPolicy
;
/** The projection mesh used with 360/VR videos. */
public
final
class
Projection
{
/* package */
final
class
Projection
{
/** Enforces allowed (sub) mesh draw modes. */
@Documented
...
...
library/
core/src/main/java/com/google/android/exoplayer2/video
/spherical/ProjectionDecoder.java
→
library/
ui/src/main/java/com/google/android/exoplayer2/ui
/spherical/ProjectionDecoder.java
View file @
1b6dd40a
...
...
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
com
.
google
.
android
.
exoplayer2
.
video
.
spherical
;
package
com
.
google
.
android
.
exoplayer2
.
ui
.
spherical
;
import
androidx.annotation.Nullable
;
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.ParsableByteArray
;
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.zip.Inflater
;
...
...
@@ -34,7 +34,7 @@ import java.util.zip.Inflater;
*
* <p>The decoder does not perform CRC checks at the moment.
*/
public
final
class
ProjectionDecoder
{
/* package */
final
class
ProjectionDecoder
{
private
static
final
int
TYPE_YTMP
=
0x79746d70
;
private
static
final
int
TYPE_MSHP
=
0x6d736870
;
...
...
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
View file @
1b6dd40a
...
...
@@ -22,7 +22,6 @@ import android.opengl.GLES20;
import
androidx.annotation.Nullable
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.util.GlUtil
;
import
com.google.android.exoplayer2.video.spherical.Projection
;
import
java.nio.FloatBuffer
;
/**
...
...
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
View file @
1b6dd40a
...
...
@@ -29,9 +29,6 @@ import com.google.android.exoplayer2.util.GlUtil;
import
com.google.android.exoplayer2.util.TimedValueQueue
;
import
com.google.android.exoplayer2.video.VideoFrameMetadataListener
;
import
com.google.android.exoplayer2.video.spherical.CameraMotionListener
;
import
com.google.android.exoplayer2.video.spherical.FrameRotationQueue
;
import
com.google.android.exoplayer2.video.spherical.Projection
;
import
com.google.android.exoplayer2.video.spherical.ProjectionDecoder
;
import
java.util.Arrays
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
org.checkerframework.checker.nullness.qual.MonotonicNonNull
;
...
...
library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
View file @
1b6dd40a
...
...
@@ -44,7 +44,7 @@ import androidx.annotation.Nullable;
* a nicer UI. An even more advanced UI would reproject the user's touch point into 3D and drag the
* Mesh as the user moves their finger. However, that requires quaternion interpolation.
*/
/* package */
class
TouchTracker
extends
GestureDetector
.
SimpleOnGestureListener
/* package */
final
class
TouchTracker
extends
GestureDetector
.
SimpleOnGestureListener
implements
View
.
OnTouchListener
,
OrientationListener
.
Listener
{
/* package */
interface
Listener
{
...
...
library/
core/src/test/java/com/google/android/exoplayer2/video
/spherical/FrameRotationQueueTest.java
→
library/
ui/src/test/java/com/google/android/exoplayer2/ui
/spherical/FrameRotationQueueTest.java
View file @
1b6dd40a
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
com
.
google
.
android
.
exoplayer2
.
video
.
spherical
;
package
com
.
google
.
android
.
exoplayer2
.
ui
.
spherical
;
import
static
com
.
google
.
common
.
truth
.
Truth
.
assertThat
;
...
...
library/
core/src/test/java/com/google/android/exoplayer2/video
/spherical/ProjectionDecoderTest.java
→
library/
ui/src/test/java/com/google/android/exoplayer2/ui
/spherical/ProjectionDecoderTest.java
View file @
1b6dd40a
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
com
.
google
.
android
.
exoplayer2
.
video
.
spherical
;
package
com
.
google
.
android
.
exoplayer2
.
ui
.
spherical
;
import
static
com
.
google
.
common
.
truth
.
Truth
.
assertThat
;
...
...
library/
core/src/test/java/com/google/android/exoplayer2/video
/spherical/ProjectionTest.java
→
library/
ui/src/test/java/com/google/android/exoplayer2/ui
/spherical/ProjectionTest.java
View file @
1b6dd40a
...
...
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
com
.
google
.
android
.
exoplayer2
.
video
.
spherical
;
package
com
.
google
.
android
.
exoplayer2
.
ui
.
spherical
;
import
static
com
.
google
.
common
.
truth
.
Truth
.
assertThat
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment