diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a58051897f..eb229a98cc 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -9,6 +9,9 @@ ([#5063](https://github.com/google/ExoPlayer/issues/5063)). * MP4: Support Opus and FLAC in the MP4 container, and in DASH ([#4883](https://github.com/google/ExoPlayer/issues/4883)). +* Spherical video: Fall back to `TYPE_ROTATION_VECTOR` if + `TYPE_GAME_ROTATION_VECTOR` is unavailable + ([#5119](https://github.com/google/ExoPlayer/issues/5119)). * Support seeking for a wider range of MPEG-TS streams ([#5097](https://github.com/google/ExoPlayer/issues/5097)). * DASH: Fix detecting the end of live events diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java index c6ddb8148b..7b58f54ac2 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java @@ -104,12 +104,18 @@ public final class SphericalSurfaceView extends GLSurfaceView { // Configure sensors and touch. sensorManager = (SensorManager) Assertions.checkNotNull(context.getSystemService(Context.SENSOR_SERVICE)); - // TYPE_GAME_ROTATION_VECTOR is the easiest sensor since it handles all the complex math for - // fusion. It's used instead of TYPE_ROTATION_VECTOR since the latter uses the magnetometer on - // devices. When used indoors, the magnetometer can take some time to settle depending on the - // device and amount of metal in the environment. - int type = Util.SDK_INT >= 18 ? Sensor.TYPE_GAME_ROTATION_VECTOR : Sensor.TYPE_ROTATION_VECTOR; - orientationSensor = sensorManager.getDefaultSensor(type); + Sensor orientationSensor = null; + if (Util.SDK_INT >= 18) { + // TYPE_GAME_ROTATION_VECTOR is the easiest sensor since it handles all the complex math for + // fusion. It's used instead of TYPE_ROTATION_VECTOR since the latter uses the magnetometer on + // devices. When used indoors, the magnetometer can take some time to settle depending on the + // device and amount of metal in the environment. + orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GAME_ROTATION_VECTOR); + } + if (orientationSensor == null) { + orientationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR); + } + this.orientationSensor = orientationSensor; scene = new SceneRenderer(); renderer = new Renderer(scene);