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.

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

Jump to bottom

Add option to keep audio playing on device while mirroring #5102

Merged
merged 13 commits into from
Jul 19, 2024
Merged

Add option to keep audio playing on device while mirroring #5102

merged 13 commits into from
Jul 19, 2024

Conversation

rom1v
Copy link
Collaborator

@rom1v rom1v commented Jul 16, 2024 •
edited
Loading

Add a new method to capture audio on the device, provided by @yume-chan in #4380. It is exposed as a separate audio source (in addition to output and mic):

scrcpy --audio-source=playback

There are pros and cons, as noted by @yume-chan:

Pros:

  • Can choose to continue playing audio on device
  • Not affected by connected headsets
  • Not affected by system volume
  • […]

Cons:

  • Requires Android 13, in which the Shell app has MODIFY_AUDIO_ROUTING permission added
  • Apps can opt out from being captured. […]

With this audio source, it is possible to request to keep playing on the device while mirroring:

scrcpy --audio-source=playback --audio-dup

If the audio source is not specified and --audio-dup is set, then it is implicitly set to --audio-source=playback:

scrcpy --audio-dup   # equivalent

Fixes #3875

This was referenced Jul 16, 2024
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
This was referenced Jul 18, 2024
Open
Closed
Open
rom1v and others added 13 commits July 19, 2024 17:48
@rom1v
Make encode() method private
39132ff 
It is only used from AudioEncoder.

PR #5102 <#5102>
@rom1v
Rename audio capture exception
3b8ec0c 
The AudioCaptureForegroundException was very specific. Rename it to
AudioCaptureException to support other capture failures.

PR #5102 <#5102>
@rom1v
Throw AudioCaptureException on workaround error
cf09e78 
Replace a RuntimeException by a specific AudioCaptureException.

PR #5102 <#5102>
@rom1v
Move audio compatibility check
5e605b9 
The compatibility depends on the capture constraints, not the encoding.

This will allow to add a new capture implementation with different
constraints.

PR #5102 <#5102>
@rom1v
Move hardcoded audio configuration to AudioConfig
a2f3a5c 
This will allow to use these constants from different classes not
directly related to AudioCapture.

PR #5102 <#5102>
@rom1v
Move createAudioFormat() to AudioConfig
414ce4c 
This will allow to reuse this method.

PR #5102 <#5102>
@rom1v
Extract AudioRecordReader
053bf83 
Move the logic to read from an AudioRecord and handle all corner cases
for PTS. This simplifies AudioCapture.

PR #5102 <#5102>
@rom1v
Extract AudioCapture interface
0f07608 
Move the implementation to AudioDirectCapture and extract an
AudioCapture interface.

This will allow to provide another AudioCapture implementation.

PR #5102 <#5102>
@rom1v
Move audio source value
53c6eb6 
The MediaRecorder constant should not belong to the AudioSource enum.

This will allow to add a new AudioSource which has no meaningful
MediaRecorder audio source value.

PR #5102 <#5102>
@rom1v @yume-chan
Add audio playback capture method
a10f8cd 
Add a new method to capture audio playback.

It requires Android 13 (where the Shell app has MODIFY_AUDIO_ROUTING
permission).

The main benefit is that it supports keeping audio playing on the device
(implemented in a further commit).

Fixes #4380 <#4380>
PR #5102 <#5102>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
@rom1v @yume-chan
Add --audio-dup
31116a6 
Add an option to duplicate audio on the device, compatible with the new
audio playback capture (--audio-source=playback).

Fixes #3875 <#3875>
Fixes #4380 <#4380>
PR #5102 <#5102>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
@rom1v
Switch audio source if audio-dup is set
127a271 
Automatically switch implicit audio source to "playback" if --audio-dup
is passed.

This allows to run:

    scrcpy --audio-dup

without specifying explicitly:

    scrcpy --audio-source=playback --audio-dup

PR #5102 <#5102>
@rom1v
Update documentation for audio playback capture
ed40669 
PR #5102 <#5102>
@rom1v rom1v merged commit ed40669 into dev Jul 19, 2024
@rom1v
Copy link
Collaborator Author

rom1v commented Jul 19, 2024

🚀

Here is a binary for the current dev version:

I will probably publish a new version v2.6 in 10~15 days. Consider this as a release candidate.

This was referenced Jul 22, 2024
Closed
Closed
@rom1v rom1v added this to the v2.6 milestone Jul 28, 2024
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Make encode() method private
8f80633 
It is only used from AudioEncoder.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Rename audio capture exception
ab8497f 
The AudioCaptureForegroundException was very specific. Rename it to
AudioCaptureException to support other capture failures.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Throw AudioCaptureException on workaround error
49c2c52 
Replace a RuntimeException by a specific AudioCaptureException.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Move audio compatibility check
474e0f8 
The compatibility depends on the capture constraints, not the encoding.

This will allow to add a new capture implementation with different
constraints.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Move hardcoded audio configuration to AudioConfig
0f7d3db 
This will allow to use these constants from different classes not
directly related to AudioCapture.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Move createAudioFormat() to AudioConfig
3684421 
This will allow to reuse this method.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Extract AudioRecordReader
e505642 
Move the logic to read from an AudioRecord and handle all corner cases
for PTS. This simplifies AudioCapture.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Extract AudioCapture interface
0ff644e 
Move the implementation to AudioDirectCapture and extract an
AudioCapture interface.

This will allow to provide another AudioCapture implementation.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Move audio source value
98b0fbb 
The MediaRecorder constant should not belong to the AudioSource enum.

This will allow to add a new AudioSource which has no meaningful
MediaRecorder audio source value.

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @yume-chan @FreedomBen
Add audio playback capture method
a063ea2 
Add a new method to capture audio playback.

It requires Android 13 (where the Shell app has MODIFY_AUDIO_ROUTING
permission).

The main benefit is that it supports keeping audio playing on the device
(implemented in a further commit).

Fixes Genymobile#4380 <Genymobile#4380>
PR Genymobile#5102 <Genymobile#5102>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @yume-chan @FreedomBen
Add --audio-dup
fb4ae1c 
Add an option to duplicate audio on the device, compatible with the new
audio playback capture (--audio-source=playback).

Fixes Genymobile#3875 <Genymobile#3875>
Fixes Genymobile#4380 <Genymobile#4380>
PR Genymobile#5102 <Genymobile#5102>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Switch audio source if audio-dup is set
243fdc3 
Automatically switch implicit audio source to "playback" if --audio-dup
is passed.

This allows to run:

    scrcpy --audio-dup

without specifying explicitly:

    scrcpy --audio-source=playback --audio-dup

PR Genymobile#5102 <Genymobile#5102>
FreedomBen pushed a commit to FreedomBen/scrcpy that referenced this pull request Aug 2, 2024
@rom1v @FreedomBen
Update documentation for audio playback capture
6839cf8 
PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Make encode() method private
6c3b1ae 
It is only used from AudioEncoder.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Rename audio capture exception
8a81dcc 
The AudioCaptureForegroundException was very specific. Rename it to
AudioCaptureException to support other capture failures.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Throw AudioCaptureException on workaround error
7bad34d 
Replace a RuntimeException by a specific AudioCaptureException.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Move audio compatibility check
d7631d3 
The compatibility depends on the capture constraints, not the encoding.

This will allow to add a new capture implementation with different
constraints.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Move hardcoded audio configuration to AudioConfig
b3a9b6d 
This will allow to use these constants from different classes not
directly related to AudioCapture.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Move createAudioFormat() to AudioConfig
bf44c07 
This will allow to reuse this method.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Extract AudioRecordReader
1b7c811 
Move the logic to read from an AudioRecord and handle all corner cases
for PTS. This simplifies AudioCapture.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Extract AudioCapture interface
f54cc5e 
Move the implementation to AudioDirectCapture and extract an
AudioCapture interface.

This will allow to provide another AudioCapture implementation.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Move audio source value
8dff6cc 
The MediaRecorder constant should not belong to the AudioSource enum.

This will allow to add a new AudioSource which has no meaningful
MediaRecorder audio source value.

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @yume-chan @Gottox
Add audio playback capture method
63ce026 
Add a new method to capture audio playback.

It requires Android 13 (where the Shell app has MODIFY_AUDIO_ROUTING
permission).

The main benefit is that it supports keeping audio playing on the device
(implemented in a further commit).

Fixes Genymobile#4380 <Genymobile#4380>
PR Genymobile#5102 <Genymobile#5102>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @yume-chan @Gottox
Add --audio-dup
fa555a2 
Add an option to duplicate audio on the device, compatible with the new
audio playback capture (--audio-source=playback).

Fixes Genymobile#3875 <Genymobile#3875>
Fixes Genymobile#4380 <Genymobile#4380>
PR Genymobile#5102 <Genymobile#5102>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Switch audio source if audio-dup is set
937022f 
Automatically switch implicit audio source to "playback" if --audio-dup
is passed.

This allows to run:

    scrcpy --audio-dup

without specifying explicitly:

    scrcpy --audio-source=playback --audio-dup

PR Genymobile#5102 <Genymobile#5102>
Gottox pushed a commit to Gottox/scrcpy that referenced this pull request Sep 29, 2024
@rom1v @Gottox
Update documentation for audio playback capture
e77ed28 
PR Genymobile#5102 <Genymobile#5102>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.6
Development

Successfully merging this pull request may close these issues.
1 participant
@rom1v