Skip to content

Illustrate issue with small durations of the clips #3358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SathyaTadepalli wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Illustrate issue with small durations of the clips #3358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions ...composition/src/main/java/androidx/media3/demo/composition/CompositionPreviewViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,13 @@ import kotlinx.coroutines.guava.await
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.json.JSONException
import kotlin.math.min

@OptIn(ExperimentalApi::class)
class CompositionPreviewViewModel(application: Application) : AndroidViewModel(application) {

val compositionLayouts = listOf(Preset.SEQUENCE, Preset.GRID, Preset.PIP)
val compositionLayouts =
listOf(Preset.SEQUENCE, Preset.GRID, Preset.PIP, Preset.AV_SPLIT_REPRO)

private val _uiState = MutableStateFlow(createInitialState())
val uiState: StateFlow<CompositionPreviewState> = _uiState.asStateFlow()
Expand Down Expand Up @@ -227,13 +229,18 @@ class CompositionPreviewViewModel(application: Application) : AndroidViewModel(a
when (preset) {
Preset.GRID -> 4 // 2x2 Grid
Preset.PIP -> 2 // PiP Overlay
Preset.AV_SPLIT_REPRO -> 2 // video-only + audio-only
else -> 1 // Sequence
}
val currentTrackTypes = currentState.sequenceTrackTypes
val newTrackTypes =
List(numSequences) { i ->
if (i < currentTrackTypes.size) currentTrackTypes[i]
else setOf(C.TRACK_TYPE_AUDIO, C.TRACK_TYPE_VIDEO)
if (preset == Preset.AV_SPLIT_REPRO) {
listOf(setOf(C.TRACK_TYPE_VIDEO), setOf(C.TRACK_TYPE_AUDIO))
} else {
List(numSequences) { i ->
if (i < currentTrackTypes.size) currentTrackTypes[i]
else setOf(C.TRACK_TYPE_AUDIO, C.TRACK_TYPE_VIDEO)
}
}
val firstItem = currentState.mediaState.availableItems.firstOrNull()?.copy()
val newItemsBySequence: List<List<Item>> =
Expand All @@ -249,6 +256,11 @@ class CompositionPreviewViewModel(application: Application) : AndroidViewModel(a
Preset.SEQUENCE -> {
List(1) { if (firstItem != null) List(4) { firstItem.copy() } else emptyList() }
}
Preset.AV_SPLIT_REPRO -> {
// Same 3 clips in both sequences, so the audio-only sequence's item transitions
// mirror the video-only one exactly, as CompositionBuilder's split does.
List(2) { if (firstItem != null) List(3) { firstItem.copy() } else emptyList() }
}
Preset.CUSTOM -> {
val currentItemsBySequence = currentState.mediaState.selectedItemsBySequence
List(numSequences) { i -> currentItemsBySequence[i] }
Expand Down Expand Up @@ -840,7 +852,7 @@ class CompositionPreviewViewModel(application: Application) : AndroidViewModel(a
.setFrameRate(DEFAULT_FRAME_RATE_FPS)
// Setting duration explicitly is only required for preview with CompositionPlayer,
// and is not needed for export with Transformer.
.setDurationUs(item.durationUs)
.setDurationUs(min(item.durationUs, 400000L))
sequenceBuilder.addItem(itemBuilder.build())
}
}
Expand Down
3 changes: 3 additions & 0 deletions demos/composition/src/main/java/androidx/media3/demo/composition/data/CompositionState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,8 @@ enum class Preset {
SEQUENCE,
GRID,
PIP,
// Two sequences (video-only, audio-only) from the same clips, to test whether that
// structure is required to repro the short-clips playback freeze.
AV_SPLIT_REPRO,
CUSTOM,
}
1 change: 1 addition & 0 deletions ...s/composition/src/main/java/androidx/media3/demo/composition/ui/CompositionPreviewPane.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ private fun presetToString(preset: Preset): String {
Preset.SEQUENCE -> stringResource(R.string.preset_sequence)
Preset.GRID -> stringResource(R.string.preset_grid)
Preset.PIP -> stringResource(R.string.preset_pip)
Preset.AV_SPLIT_REPRO -> stringResource(R.string.preset_av_split_repro)
Preset.CUSTOM -> stringResource(R.string.preset_custom)
}
}
1 change: 1 addition & 0 deletions demos/composition/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
<string name="preset_sequence" translatable="false">Sequential</string>
<string name="preset_grid" translatable="false">2x2 grid</string>
<string name="preset_pip" translatable="false">PiP overlay</string>
<string name="preset_av_split_repro" translatable="false">AV split repro</string>
<string name="presets" translatable="false">Preset</string>
<string name="preview_composition_title" translatable="false">Preview: %s</string>
<string name="add_sequence" translatable="false">Add sequence</string>
Expand Down