loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move PlayerSurface from demo-compose to media3-ui-compose

Browse Source 
The new `media3-ui-compose` module does not have any Material library dependencies, but will rely on androidx.compose + foundation/runtime/ui and other non-theming/opinionated libraries. Surface handling is one such usecase.

PiperOrigin-RevId: 689004504
This commit is contained in:
jbibik 2024-10-23 09:57:01 -07:00 committed by Copybara-Service
parent 21526588be
commit 7da71f792b
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASENOTES.md
View File

@ -34,6 +34,7 @@
* Muxers: * Muxers:
* IMA extension: * IMA extension:
* UI: * UI:
* Add `PlayerSurface` Composable to `media3-ui-compose` module.
* Downloads: * Downloads:
* OkHttp Extension: * OkHttp Extension:
* Cronet Extension: * Cronet Extension:

1
demos/compose/build.gradle
View File

@ -76,6 +76,7 @@ dependencies {
implementation 'com.google.android.material:material:' + androidxMaterialVersion implementation 'com.google.android.material:material:' + androidxMaterialVersion
implementation project(modulePrefix + 'lib-exoplayer') implementation project(modulePrefix + 'lib-exoplayer')
implementation project(modulePrefix + 'lib-ui-compose')
// For detecting and debugging leaks only. LeakCanary is not needed for demo app to work. // For detecting and debugging leaks only. LeakCanary is not needed for demo app to work.
debugImplementation 'com.squareup.leakcanary:leakcanary-android:' + leakCanaryVersion debugImplementation 'com.squareup.leakcanary:leakcanary-android:' + leakCanaryVersion

2
demos/compose/src/main/java/androidx/media3/demo/compose/MainActivity.kt
View File

@ -30,6 +30,8 @@ import androidx.media3.common.MediaItem
import androidx.media3.common.Player import androidx.media3.common.Player
import androidx.media3.demo.compose.data.videos import androidx.media3.demo.compose.data.videos
import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.ui.compose.PlayerSurface
import androidx.media3.ui.compose.SURFACE_TYPE_SURFACE_VIEW
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {

3
libraries/ui_compose/build.gradle
View File

@ -52,6 +52,9 @@ dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.01.00') def composeBom = platform('androidx.compose:compose-bom:2024.01.00')
implementation composeBom implementation composeBom
implementation 'androidx.compose.foundation:foundation'
implementation 'androidx.core:core:' + androidxCoreVersion
} }
ext { ext {

10
demos/compose/src/main/java/androidx/media3/demo/compose/PlayerSurface.kt → libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.demo.compose package androidx.media3.ui.compose
import android.view.Surface import android.view.Surface
import android.view.SurfaceView import android.view.SurfaceView
@ -26,6 +26,7 @@ import androidx.compose.foundation.AndroidExternalSurfaceScope
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.media3.common.Player import androidx.media3.common.Player
import androidx.media3.common.util.UnstableApi
/** /**
* Provides a dedicated drawing [Surface] for media playbacks using a [Player]. * Provides a dedicated drawing [Surface] for media playbacks using a [Player].
@ -40,6 +41,7 @@ import androidx.media3.common.Player
* [Choosing a surface type](https://developer.android.com/media/media3/ui/playerview#surfacetype) * [Choosing a surface type](https://developer.android.com/media/media3/ui/playerview#surfacetype)
* for more information. * for more information.
*/ */
@UnstableApi
@Composable @Composable
fun PlayerSurface(player: Player, surfaceType: @SurfaceType Int, modifier: Modifier = Modifier) { fun PlayerSurface(player: Player, surfaceType: @SurfaceType Int, modifier: Modifier = Modifier) {
val onSurfaceCreated: (Surface) -> Unit = { surface -> player.setVideoSurface(surface) } val onSurfaceCreated: (Surface) -> Unit = { surface -> player.setVideoSurface(surface) }
@ -64,13 +66,13 @@ fun PlayerSurface(player: Player, surfaceType: @SurfaceType Int, modifier: Modif
* The type of surface view used for media playbacks. One of [SURFACE_TYPE_SURFACE_VIEW] or * The type of surface view used for media playbacks. One of [SURFACE_TYPE_SURFACE_VIEW] or
* [SURFACE_TYPE_TEXTURE_VIEW]. * [SURFACE_TYPE_TEXTURE_VIEW].
*/ */
@MustBeDocumented @UnstableApi
@Retention(AnnotationRetention.SOURCE) @Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER) @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
@IntDef(SURFACE_TYPE_SURFACE_VIEW, SURFACE_TYPE_TEXTURE_VIEW) @IntDef(SURFACE_TYPE_SURFACE_VIEW, SURFACE_TYPE_TEXTURE_VIEW)
annotation class SurfaceType annotation class SurfaceType
/** Surface type equivalent to [SurfaceView] . */ /** Surface type equivalent to [SurfaceView] . */
const val SURFACE_TYPE_SURFACE_VIEW = 1 @UnstableApi const val SURFACE_TYPE_SURFACE_VIEW = 1
/** Surface type equivalent to [TextureView]. */ /** Surface type equivalent to [TextureView]. */
const val SURFACE_TYPE_TEXTURE_VIEW = 2 @UnstableApi const val SURFACE_TYPE_TEXTURE_VIEW = 2