diff --git a/samples/gemini-video-metadata-creation/src/main/java/com/android/ai/samples/geminivideometadatacreation/util/VideoList.kt b/samples/gemini-video-metadata-creation/src/main/java/com/android/ai/samples/geminivideometadatacreation/util/VideoList.kt index e4775935..dbba65be 100644 --- a/samples/gemini-video-metadata-creation/src/main/java/com/android/ai/samples/geminivideometadatacreation/util/VideoList.kt +++ b/samples/gemini-video-metadata-creation/src/main/java/com/android/ai/samples/geminivideometadatacreation/util/VideoList.kt @@ -27,25 +27,27 @@ data class VideoItem( val uri: Uri, ) +const val VIDEO_BASE_URL = "https://storage.googleapis.com/androiddevelopers/samples_assets" + val sampleVideoList = listOf( VideoItem( R.string.video_title_android_spotlight_shorts, - "https://storage.googleapis.com/exoplayer-test-media-0/shorts_android_developers/shorts_10.mp4".toUri(), + "$VIDEO_BASE_URL/exoplayer-test-media-0/shorts_android_developers/shorts_10.mp4".toUri(), ), VideoItem( R.string.video_title_big_buck_bunny, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/BigBuckBunny.mp4".toUri(), ), VideoItem( R.string.video_title_tears_of_steel, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/TearsOfSteel.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/TearsOfSteel.mp4".toUri(), ), VideoItem( R.string.video_title_for_bigger_blazes, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/ForBiggerBlazes.mp4".toUri(), ), VideoItem( R.string.video_title_for_bigger_escape, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerEscapes.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/ForBiggerEscapes.mp4".toUri(), ), ) diff --git a/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/util/VideoList.kt b/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/util/VideoList.kt index 6cba302b..87dee86b 100644 --- a/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/util/VideoList.kt +++ b/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/util/VideoList.kt @@ -27,14 +27,16 @@ data class VideoItem( val uri: Uri, ) +const val VIDEO_BASE_URL = "https://storage.googleapis.com/androiddevelopers/samples_assets" + val sampleVideoList = listOf( VideoItem( R.string.video_title_big_buck_bunny, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/BigBuckBunny.mp4".toUri(), ), VideoItem( R.string.video_title_android_spotlight_shorts, - "https://storage.googleapis.com/exoplayer-test-media-0/shorts_android_developers/shorts_10.mp4".toUri(), + "$VIDEO_BASE_URL/exoplayer-test-media-0/shorts_android_developers/shorts_10.mp4".toUri(), ), VideoItem( R.string.video_title_youtube_google_tv, @@ -42,14 +44,14 @@ val sampleVideoList = listOf( ), VideoItem( R.string.video_title_tears_of_steel, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/TearsOfSteel.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/TearsOfSteel.mp4".toUri(), ), VideoItem( R.string.video_title_for_bigger_blazes, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/ForBiggerBlazes.mp4".toUri(), ), VideoItem( R.string.video_title_for_bigger_escape, - "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerEscapes.mp4".toUri(), + "$VIDEO_BASE_URL/gtv-videos-bucket/sample/ForBiggerEscapes.mp4".toUri(), ), ) diff --git a/ui-component/src/main/java/com/android/ai/uicomponent/VideoPlayer.kt b/ui-component/src/main/java/com/android/ai/uicomponent/VideoPlayer.kt index 397da849..b41b002a 100644 --- a/ui-component/src/main/java/com/android/ai/uicomponent/VideoPlayer.kt +++ b/ui-component/src/main/java/com/android/ai/uicomponent/VideoPlayer.kt @@ -245,11 +245,13 @@ fun VideoPickerDropdown( } } +const val VIDEO_BASE_URL = "https://storage.googleapis.com/androiddevelopers/samples_assets/gtv-videos-bucket/sample" + // Sample data for the picker private val sampleVideosForPicker = listOf( - VideoPickerData("Big Buck Bunny", "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4".toUri()), - VideoPickerData("Tears of Steel", "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/TearsOfSteel.mp4".toUri()), - VideoPickerData("For Bigger Blazes", "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4".toUri()), + VideoPickerData("Big Buck Bunny", "$VIDEO_BASE_URL/BigBuckBunny.mp4".toUri()), + VideoPickerData("Tears of Steel", "$VIDEO_BASE_URL/TearsOfSteel.mp4".toUri()), + VideoPickerData("For Bigger Blazes", "$VIDEO_BASE_URL/ForBiggerBlazes.mp4".toUri()), ) @Preview