Skip to content

SDK / exoplayer

Go to a project
Commit 9cf85c55 by bachinger Committed by microkatz
Options

Enable subtitle selection in session demo app 

Issue: androidx/media#102
#minor-release
PiperOrigin-RevId: 462391045
(cherry picked from commit 7fa3f993)
parent 87827942
Inline Side-by-side
Showing with 49 additions and 8 deletions
demos/session/src/main/assets/catalog.json
...@@ -13,10 +13,25 @@ ...@@ -13,10 +13,25 @@
"id": "video_02", "id": "video_02",
"title": "TTML Netflix Japanese examples (IMSC1.1)", "title": "TTML Netflix Japanese examples (IMSC1.1)",
"source": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-avc-baseline-480.mp4", "source": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-avc-baseline-480.mp4",
"album": "Video with subtitle",
"artist": "Subtitles",
"genre": "Video",
"image": "https://cdn.pixabay.com/photo/2014/10/09/13/14/video-481821_960_720.png",
"subtitles": [
{
"subtitle_uri": "https://storage.googleapis.com/exoplayer-test-media-1/ttml/netflix_japanese_ttml.xml", "subtitle_uri": "https://storage.googleapis.com/exoplayer-test-media-1/ttml/netflix_japanese_ttml.xml",
"subtitle_mime_type": "application/ttml+xml",
"subtitle_lang": "ja"
}
]
},
{
"id": "video_03",
"title": "MPEG-4 Timed Text",
"album": "Video with subtitle", "album": "Video with subtitle",
"artist": "Netflix", "artist": "Subtitles",
"genre": "Video", "genre": "Video",
"source": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/dizzy-with-tx3g.mp4",
"image": "https://cdn.pixabay.com/photo/2014/10/09/13/14/video-481821_960_720.png" "image": "https://cdn.pixabay.com/photo/2014/10/09/13/14/video-481821_960_720.png"
}, },
{ {
......
demos/session/src/main/java/androidx/media3/demo/session/MediaItemTree.kt
...@@ -18,6 +18,7 @@ package androidx.media3.demo.session ...@@ -18,6 +18,7 @@ package androidx.media3.demo.session
import android.content.res.AssetManager import android.content.res.AssetManager
import android.net.Uri import android.net.Uri
import androidx.media3.common.MediaItem import androidx.media3.common.MediaItem
import androidx.media3.common.MediaItem.SubtitleConfiguration
import androidx.media3.common.MediaMetadata import androidx.media3.common.MediaMetadata
import androidx.media3.common.MediaMetadata.FOLDER_TYPE_MIXED import androidx.media3.common.MediaMetadata.FOLDER_TYPE_MIXED
import androidx.media3.common.MediaMetadata.FOLDER_TYPE_NONE import androidx.media3.common.MediaMetadata.FOLDER_TYPE_NONE
...@@ -65,13 +66,13 @@ object MediaItemTree { ...@@ -65,13 +66,13 @@ object MediaItemTree {
mediaId: String, mediaId: String,
isPlayable: Boolean, isPlayable: Boolean,
@MediaMetadata.FolderType folderType: Int, @MediaMetadata.FolderType folderType: Int,
subtitleConfigurations: List<SubtitleConfiguration> = mutableListOf(),
album: String? = null, album: String? = null,
artist: String? = null, artist: String? = null,
genre: String? = null, genre: String? = null,
sourceUri: Uri? = null, sourceUri: Uri? = null,
imageUri: Uri? = null, imageUri: Uri? = null
): MediaItem { ): MediaItem {
// TODO(b/194280027): add artwork
val metadata = val metadata =
MediaMetadata.Builder() MediaMetadata.Builder()
.setAlbumTitle(album) .setAlbumTitle(album)
...@@ -82,8 +83,10 @@ object MediaItemTree { ...@@ -82,8 +83,10 @@ object MediaItemTree {
.setIsPlayable(isPlayable) .setIsPlayable(isPlayable)
.setArtworkUri(imageUri) .setArtworkUri(imageUri)
.build() .build()
return MediaItem.Builder() return MediaItem.Builder()
.setMediaId(mediaId) .setMediaId(mediaId)
.setSubtitleConfigurations(subtitleConfigurations)
.setMediaMetadata(metadata) .setMediaMetadata(metadata)
.setUri(sourceUri) .setUri(sourceUri)
.build() .build()
...@@ -156,6 +159,19 @@ object MediaItemTree { ...@@ -156,6 +159,19 @@ object MediaItemTree {
val title = mediaObject.getString("title") val title = mediaObject.getString("title")
val artist = mediaObject.getString("artist") val artist = mediaObject.getString("artist")
val genre = mediaObject.getString("genre") val genre = mediaObject.getString("genre")
val subtitleConfigurations: MutableList<SubtitleConfiguration> = mutableListOf()
if (mediaObject.has("subtitles")) {
val subtitlesJson = mediaObject.getJSONArray("subtitles")
for (i in 0 until subtitlesJson.length()) {
val subtitleObject = subtitlesJson.getJSONObject(i)
subtitleConfigurations.add(
SubtitleConfiguration.Builder(Uri.parse(subtitleObject.getString("subtitle_uri")))
.setMimeType(subtitleObject.getString("subtitle_mime_type"))
.setLanguage(subtitleObject.getString("subtitle_lang"))
.build()
)
}
}
val sourceUri = Uri.parse(mediaObject.getString("source")) val sourceUri = Uri.parse(mediaObject.getString("source"))
val imageUri = Uri.parse(mediaObject.getString("image")) val imageUri = Uri.parse(mediaObject.getString("image"))
// key of such items in tree // key of such items in tree
...@@ -170,12 +186,13 @@ object MediaItemTree { ...@@ -170,12 +186,13 @@ object MediaItemTree {
title = title, title = title,
mediaId = idInTree, mediaId = idInTree,
isPlayable = true, isPlayable = true,
folderType = FOLDER_TYPE_NONE,
subtitleConfigurations,
album = album, album = album,
artist = artist, artist = artist,
genre = genre, genre = genre,
sourceUri = sourceUri, sourceUri = sourceUri,
imageUri = imageUri, imageUri = imageUri
folderType = FOLDER_TYPE_NONE
) )
) )
...@@ -188,7 +205,8 @@ object MediaItemTree { ...@@ -188,7 +205,8 @@ object MediaItemTree {
title = album, title = album,
mediaId = albumFolderIdInTree, mediaId = albumFolderIdInTree,
isPlayable = true, isPlayable = true,
folderType = FOLDER_TYPE_PLAYLISTS folderType = FOLDER_TYPE_PLAYLISTS,
subtitleConfigurations
) )
) )
treeNodes[ALBUM_ID]!!.addChild(albumFolderIdInTree) treeNodes[ALBUM_ID]!!.addChild(albumFolderIdInTree)
...@@ -203,7 +221,8 @@ object MediaItemTree { ...@@ -203,7 +221,8 @@ object MediaItemTree {
title = artist, title = artist,
mediaId = artistFolderIdInTree, mediaId = artistFolderIdInTree,
isPlayable = true, isPlayable = true,
folderType = FOLDER_TYPE_PLAYLISTS folderType = FOLDER_TYPE_PLAYLISTS,
subtitleConfigurations
) )
) )
treeNodes[ARTIST_ID]!!.addChild(artistFolderIdInTree) treeNodes[ARTIST_ID]!!.addChild(artistFolderIdInTree)
...@@ -218,7 +237,8 @@ object MediaItemTree { ...@@ -218,7 +237,8 @@ object MediaItemTree {
title = genre, title = genre,
mediaId = genreFolderIdInTree, mediaId = genreFolderIdInTree,
isPlayable = true, isPlayable = true,
folderType = FOLDER_TYPE_PLAYLISTS folderType = FOLDER_TYPE_PLAYLISTS,
subtitleConfigurations
) )
) )
treeNodes[GENRE_ID]!!.addChild(genreFolderIdInTree) treeNodes[GENRE_ID]!!.addChild(genreFolderIdInTree)
......
demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
...@@ -29,9 +29,11 @@ import android.widget.ListView ...@@ -29,9 +29,11 @@ import android.widget.ListView
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.media3.common.C.TRACK_TYPE_TEXT
import androidx.media3.common.MediaItem import androidx.media3.common.MediaItem
import androidx.media3.common.MediaMetadata import androidx.media3.common.MediaMetadata
import androidx.media3.common.Player import androidx.media3.common.Player
import androidx.media3.common.Tracks
import androidx.media3.session.MediaController import androidx.media3.session.MediaController
import androidx.media3.session.SessionToken import androidx.media3.session.SessionToken
import androidx.media3.ui.PlayerView import androidx.media3.ui.PlayerView
...@@ -147,6 +149,10 @@ class PlayerActivity : AppCompatActivity() { ...@@ -147,6 +149,10 @@ class PlayerActivity : AppCompatActivity() {
override fun onRepeatModeChanged(repeatMode: Int) { override fun onRepeatModeChanged(repeatMode: Int) {
updateRepeatSwitchUI(repeatMode) updateRepeatSwitchUI(repeatMode)
} }
override fun onTracksChanged(tracks: Tracks) {
playerView.setShowSubtitleButton(tracks.isTypeSupported(TRACK_TYPE_TEXT))
}
} }
) )
} }
......
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