Skip to content
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.

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

Use Provider to avoid creating AudioOffloadManager when disabled. #468

Merged
merged 5 commits into from
Aug 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch
import okhttp3.Call
import javax.inject.Provider

@Module
@InstallIn(ServiceComponent::class)
Expand Down Expand Up @@ -214,7 +215,7 @@ object PlaybackServiceModule {
audioOutputSelector: AudioOutputSelector,
playbackRules: PlaybackRules,
logger: ErrorReporter,
audioOffloadManager: AudioOffloadManager,
audioOffloadManager: Provider<AudioOffloadManager>,
appConfig: AppConfig
): Player =
WearConfiguredPlayer(
Expand All @@ -231,7 +232,7 @@ object PlaybackServiceModule {

if (appConfig.offloadEnabled && Build.VERSION.SDK_INT >= 30) {
serviceCoroutineScope.launch {
audioOffloadManager.connect(exoPlayer)
audioOffloadManager.get().connect(exoPlayer)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,32 @@ import com.google.android.horologist.media.repository.PlayerRepository
import com.google.android.horologist.media3.offload.AudioOffloadManager
import com.google.android.horologist.media3.offload.AudioOffloadStatus
import com.google.android.horologist.media3.util.toAudioFormat
import com.google.android.horologist.mediasample.ui.AppConfig
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.stateIn
import javax.inject.Inject
import javax.inject.Provider

@HiltViewModel
class AudioDebugScreenViewModel @Inject constructor(
private val audioOffloadManager: AudioOffloadManager,
private val audioOffloadManager: Provider<AudioOffloadManager>,
private val appConfig: AppConfig,
private val audioSink: DefaultAudioSink,
playerRepository: PlayerRepository,
) : ViewModel() {
fun audioOffloadFlow(): Flow<AudioOffloadStatus> = if (appConfig.offloadEnabled)
audioOffloadManager.get().offloadStatus
else {
flowOf(AudioOffloadStatus.Disabled)
}

val uiState: StateFlow<UiState?> = combine(
audioOffloadManager.offloadStatus,
audioOffloadFlow(),
playerRepository.currentMedia
) { audioOffloadStatus, currentMedia ->

Expand Down
6 changes: 6 additions & 0 deletions media3-backend/api/current.api
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ package com.google.android.horologist.media3.offload {
property public final com.google.android.horologist.media3.offload.AudioOffloadStrategy? strategy;
property public final String? strategyStatus;
property public final Boolean? trackOffload;
field public static final com.google.android.horologist.media3.offload.AudioOffloadStatus.Companion Companion;
}

public static final class AudioOffloadStatus.Companion {
method public com.google.android.horologist.media3.offload.AudioOffloadStatus getDisabled();
property public final com.google.android.horologist.media3.offload.AudioOffloadStatus Disabled;
}

@com.google.android.horologist.media3.ExperimentalHorologistMedia3BackendApi public interface AudioOffloadStrategy {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,18 @@ public data class AudioOffloadStatus(
null -> "N/A"
}
}

public companion object {
public val Disabled: AudioOffloadStatus = AudioOffloadStatus(
offloadSchedulingEnabled = false,
sleepingForOffload = false,
trackOffload = false,
format = null,
isPlaying = false,
errors = listOf(),
offloadTimes = OffloadTimes(),
strategyStatus = null,
strategy = null
)
}
}