Skip to content

[AND-26] Fix sound still audible when device muted issue #1229

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

Merged
aleksandar-apostolov merged 7 commits into from
Nov 29, 2024
Merged

[AND-26] Fix sound still audible when device muted issue #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20016e2
Remove audioUsage CallServiceConfig and rely on Builder parameter.
liviu-timar Nov 20, 2024
e7dad03
Use correct log tags for livestream fg services
liviu-timar Nov 21, 2024
9a45f75
Adapt unit tests
liviu-timar Nov 21, 2024
41230fd
Revert "Remove audioUsage CallServiceConfig and rely on Builder param…
liviu-timar Nov 27, 2024
aec7de3
Revert "Adapt unit tests"
liviu-timar Nov 27, 2024
a6f46f4
Remove audioUsage Builder param and rely on callServiceConfig
liviu-timar Nov 27, 2024
3b87cb7
Fix message
liviu-timar Nov 27, 2024
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
2 changes: 1 addition & 1 deletion stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public class Call(
this,
scope,
clientImpl.peerConnectionFactory.eglBase.eglBaseContext,
clientImpl.audioUsage,
clientImpl.callServiceConfig.audioUsage,
)
}
}
Expand Down
7 changes: 5 additions & 2 deletions ...-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ public class StreamVideoBuilder @JvmOverloads constructor(
private val sounds: Sounds = defaultResourcesRingingConfig(context).toSounds(),
private val crashOnMissingPermission: Boolean = false,
private val permissionCheck: StreamPermissionCheck = DefaultStreamPermissionCheck(),
@Deprecated(
message = "This property is ignored. Set audioUsage in the callServiceConfig parameter.",
level = DeprecationLevel.WARNING,
)
private val audioUsage: Int = defaultAudioUsage,
private val appName: String? = null,
private val audioProcessing: ManagedAudioProcessingFactory? = null,
Expand Down Expand Up @@ -208,13 +212,12 @@ public class StreamVideoBuilder @JvmOverloads constructor(
callServiceConfig = callServiceConfig
?: callServiceConfig().copy(
runCallServiceInForeground = runForegroundServiceForCalls,
audioUsage = audioUsage,
audioUsage = defaultAudioUsage,
),
testSfuAddress = localSfuAddress,
sounds = sounds,
permissionCheck = permissionCheck,
crashOnMissingPermission = crashOnMissingPermission,
audioUsage = audioUsage,
appName = appName,
audioProcessing = audioProcessing,
leaveAfterDisconnectSeconds = leaveAfterDisconnectSeconds,
Expand Down
3 changes: 1 addition & 2 deletions ...m-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ internal class StreamVideoClient internal constructor(
internal val sounds: Sounds,
internal val permissionCheck: StreamPermissionCheck = DefaultStreamPermissionCheck(),
internal val crashOnMissingPermission: Boolean = false,
internal val audioUsage: Int = defaultAudioUsage,
internal val appName: String? = null,
internal val audioProcessing: ManagedAudioProcessingFactory? = null,
internal val leaveAfterDisconnectSeconds: Long = 30,
Expand All @@ -175,7 +174,7 @@ internal class StreamVideoClient internal constructor(

@InternalStreamVideoApi
public var peerConnectionFactory =
StreamPeerConnectionFactory(context, audioUsage, audioProcessing)
StreamPeerConnectionFactory(context, callServiceConfig.audioUsage, audioProcessing)

public override val userId = user.id

Expand Down
4 changes: 2 additions & 2 deletions ...n/io/getstream/video/android/core/notifications/internal/service/LivestreamCallService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ internal open class LivestreamCallService : CallService() {
* Due to the nature of the livestream calls, the service that is used is of different type.
*/
internal open class LivestreamAudioCallService : CallService() {
override val logger: TaggedLogger by taggedLogger("LivestreamHostCallService")
override val logger: TaggedLogger by taggedLogger("LivestreamAudioCallService")
override val serviceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
}

/**
* Due to the nature of the livestream calls, the service that is used is of different type.
*/
internal class LivestreamViewerService : LivestreamCallService() {
override val logger: TaggedLogger by taggedLogger("LivestreamHostCallService")
override val logger: TaggedLogger by taggedLogger("LivestreamViewerService")
override val serviceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
}