Compare commits

..

41 Commits

Author SHA1 Message Date
Romain Vimont
e4108a311a Add support for AAC audio codec
Add option --audio-codec=aac.
2023-02-19 02:32:49 +01:00
Romain Vimont
430ecc36c1 Add option to select audio codec
Introduce the selection mechanism. Alternative codecs will be added
later.
2023-02-19 02:32:49 +01:00
Romain Vimont
1ad2abec1d Add --audio-bit-rate option
Add an option to configure the audio bit-rate.
2023-02-19 02:32:49 +01:00
Romain Vimont
c61f86af0b Disable MethodLength checkstyle on createOptions()
This method will grow as needed to initialize options.
2023-02-19 02:32:49 +01:00
Romain Vimont
8fe6d78070 Remove default bit-rate on client side
If no bit-rate is passed, let the server use the default value (8Mbps).

This avoids to define a default value on both sides, and to pass the
default bit-rate as an argument when starting the server.
2023-02-19 02:32:49 +01:00
Romain Vimont
3f532ab5b5 Record at least video packets on stop
If the recorder is stopped while it has not received any audio packet
yet, make sure the video stream is correctly recorded.
2023-02-19 02:32:49 +01:00
Romain Vimont
b006c6f3ef Disable audio on initialization error
By default, audio is enabled (--no-audio must be explicitly passed to
disable it).

However, some devices may not support audio capture (typically devices
below Android 11, or Android 11 when the shell application is not
foreground on start).

In that case, make the server notify the client to dynamically disable
audio forwarding so that it does not wait indefinitely for an audio
stream.

Also disable audio on unknown codec or missing decoder on the
client-side, for the same reasons.
2023-02-19 02:32:49 +01:00
Romain Vimont
662615baa8 Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-02-19 02:32:49 +01:00
Romain Vimont
0f92c17b62 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-02-19 02:32:49 +01:00
Romain Vimont
9f4c16bc77 Do not merge config audio packets
For video streams (at least H.264 and H.265), the config packet
containing SPS/PPS must be prepended to the next packet (the following
keyframe).

For audio streams (at least OPUS), they must not be merged.
2023-02-19 02:32:49 +01:00
Romain Vimont
5e964c7cb9 Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-02-19 02:32:49 +01:00
Romain Vimont
90c2ce8885 Give a name to demuxer instances
This will be useful in logs.
2023-02-19 02:32:49 +01:00
Romain Vimont
98d4e64a0f Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-02-19 02:32:49 +01:00
Romain Vimont
f9cbd8726f Extract OPUS extradata
For OPUS codec, FFmpeg expects the raw extradata, but MediaCodec wraps
it in some structure.

Fix the config packet to send only the raw extradata.
2023-02-19 02:32:49 +01:00
Romain Vimont
101d7908b2 Use a streamer to send the audio stream
Send each encoded audio packet using a streamer.
2023-02-19 02:32:49 +01:00
Romain Vimont
c1a4c91c51 Encode recorded audio on the device
For now, the encoded packets are just logged in the console.
2023-02-19 02:32:17 +01:00
Simon Chan
5865b5f9b4 Capture device audio
Create an AudioRecorder to capture the audio source REMOTE_SUBMIX.

For now, the captured packets are just logged in the console.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-19 02:32:17 +01:00
Simon Chan
6ff4c92f3e Add a new socket for audio stream
When audio is enabled, open a new socket to send the audio stream from
the device to the client.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-19 02:32:17 +01:00
Simon Chan
d9e5356586 Add --no-audio option
Audio will be enabled by default (when supported). Add an option to
disable it.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-19 02:32:17 +01:00
Romain Vimont
60b39cdda5 Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-02-19 02:32:17 +01:00
Romain Vimont
b581fd78c1 Use shell package name for workarounds
For consistency.
2023-02-19 02:32:17 +01:00
Romain Vimont
97d773524c Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-02-19 02:32:17 +01:00
Romain Vimont
6b396f8297 Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-19 02:32:17 +01:00
Simon Chan
6b9365e71b Add a fake Android Context
Since scrcpy-server is not an Android application (it's a java
executable), it has no Context.

Some features will require a Context instance to get the package name
and the UID. Add a FakeContext for this purpose.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-19 02:32:17 +01:00
Romain Vimont
be6ec050b3 Use Process.ROOT_UID
Replace ServiceManager.USER_ID by existing constant Process.ROOT_UID.
2023-02-19 02:32:17 +01:00
Romain Vimont
5782bb8743 Make streamer independent of codec type
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
2023-02-19 02:32:17 +01:00
Romain Vimont
159516b1d7 Pass all args to ScreenEncoder constructor
There is no good reason to pass some of them in the constructor and some
others as parameters of the streamScreen() method.
2023-02-19 02:12:25 +01:00
Romain Vimont
398e477738 Move screen encoder initialization
This prepares further refactors.
2023-02-19 02:12:25 +01:00
Romain Vimont
db142b7c65 Write streamer header from ScreenEncoder
The screen encoder is responsible to write data to the video streamer.
2023-02-19 02:12:25 +01:00
Romain Vimont
4533f186c0 Use VideoStreamer directly from ScreenEncoder
The Callbacks interface notifies new packets. But in addition, the
screen encoder will need to write headers on start.

We could add a function onStart(), but for simplicity, just remove the
interface, which brings no value, and call the streamer directly.

Refs 87972e2022
2023-02-19 02:12:25 +01:00
Romain Vimont
b52741583c Simplify error handling on socket creation
On any error, all previously opened sockets must be closed.

Handle these errors in a single catch-block. Currently, there are only 2
sockets, but this will simplify even more with more sockets.

Note: this commit is better displayed with --ignore-space-change (-b).
2023-02-19 02:12:25 +01:00
Romain Vimont
561492b199 Refactor recorder logic
Process the initial config packet (necessary to write the header)
separately.
2023-02-19 02:12:25 +01:00
Romain Vimont
a9d0a01a85 Move last packet recording
Write the last packet at the end.
2023-02-19 02:12:25 +01:00
Romain Vimont
78bf9f4e27 Open recording file from the recorder thread
The recorder opened the target file from the packet sink open()
callback, called by the demuxer. Only then the recorder thread was
started.

One golden rule for the recorder is to never block the demuxer for I/O,
because it would impact mirroring. This rule is respected on recording
packets, but not for the initial recorder opening.

Therefore, start the recorder thread from sc_recorder_init(), open the
file immediately from the recorder thread, then make it wait for the
stream to start (on packet sink open()).

Now that the recorder can report errors directly (rather than making the
demuxer call fail), it is possible to report file opening error even
before the packet sink is open.
2023-02-19 02:12:25 +01:00
Romain Vimont
d71ddc06db Inline packet_sink impl in recorder
Remove useless wrappers.
2023-02-19 02:12:25 +01:00
Romain Vimont
9d207456af Initialize recorder fields from init()
The recorder has two initialization phases: one to initialize the
concrete recorder object, and one to open its packet_sink trait.

Initialize mutex and condvar as part of the object initialization.

If there were several packet_sink traits, the mutex and condvar would
still be initialized only once.
2023-02-19 02:12:25 +01:00
Romain Vimont
00fdfcc4c7 Report recorder errors
Stop scrcpy on recorder errors.

It was previously indirectly stopped by the demuxer, which failed to
push packets to a recorder in error. Report it directly instead:
 - it avoids to wait for the next demuxer call;
 - it will allow to open the target file from a separate thread and stop
   immediately on any I/O error.
2023-02-19 02:12:25 +01:00
Romain Vimont
2a1661672c Move previous packet to a local variable
It is only used from run_recorder().
2023-02-19 02:12:25 +01:00
Romain Vimont
7ca65b7452 Move pts_origin to a local variable
It is only used from run_recorder().
2023-02-19 02:12:25 +01:00
Romain Vimont
ad9bf02300 Change PTS origin type from uint64_t to int64_t
It is initialized from AVPacket.pts, which is an int64_t.
2023-02-19 02:12:25 +01:00
Romain Vimont
e02f30f895 Remove unnecessary error logs
When a call to a packet or frame sink fails, do not log the error on the
caller side: either the "failure" is expected (explicitly stopped) or it
must be logged by the packet or frame sink implementation.
2023-02-19 02:10:14 +01:00
9 changed files with 64 additions and 37 deletions

View File

@@ -29,7 +29,6 @@ sc_decoder_open_sinks(struct sc_decoder *decoder) {
for (unsigned i = 0; i < decoder->sink_count; ++i) {
struct sc_frame_sink *sink = decoder->sinks[i];
if (!sink->ops->open(sink)) {
LOGE("Could not open frame sink %d", i);
sc_decoder_close_first_sinks(decoder, i);
return false;
}
@@ -63,7 +62,6 @@ sc_decoder_open(struct sc_decoder *decoder, const AVCodec *codec) {
}
if (!sc_decoder_open_sinks(decoder)) {
LOGE("Could not open decoder sinks");
av_frame_free(&decoder->frame);
avcodec_close(decoder->codec_ctx);
avcodec_free_context(&decoder->codec_ctx);
@@ -86,7 +84,6 @@ push_frame_to_sinks(struct sc_decoder *decoder, const AVFrame *frame) {
for (unsigned i = 0; i < decoder->sink_count; ++i) {
struct sc_frame_sink *sink = decoder->sinks[i];
if (!sink->ops->push(sink, frame)) {
LOGE("Could not send frame to sink %d", i);
return false;
}
}

View File

@@ -117,7 +117,6 @@ push_packet_to_sinks(struct sc_demuxer *demuxer, const AVPacket *packet) {
for (unsigned i = 0; i < demuxer->sink_count; ++i) {
struct sc_packet_sink *sink = demuxer->sinks[i];
if (!sink->ops->push(sink, packet)) {
LOGE("Could not send packet to sink %d", i);
return false;
}
}
@@ -129,7 +128,7 @@ static bool
sc_demuxer_push_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
bool ok = push_packet_to_sinks(demuxer, packet);
if (!ok) {
LOGE("Could not process packet");
LOGE("Demuxer '%s': could not process packet", demuxer->name);
return false;
}
@@ -154,7 +153,6 @@ sc_demuxer_open_sinks(struct sc_demuxer *demuxer, const AVCodec *codec) {
for (unsigned i = 0; i < demuxer->sink_count; ++i) {
struct sc_packet_sink *sink = demuxer->sinks[i];
if (!sink->ops->open(sink, codec)) {
LOGE("Could not open packet sink %d", i);
sc_demuxer_close_first_sinks(demuxer, i);
return false;
}
@@ -183,12 +181,15 @@ run_demuxer(void *data) {
uint32_t raw_codec_id;
bool ok = sc_demuxer_recv_codec_id(demuxer, &raw_codec_id);
if (!ok) {
LOGE("Demuxer '%s': stream disabled due to connection error",
demuxer->name);
eos = true;
goto end;
}
if (raw_codec_id == 0) {
// Stream explicitly disabled by the device
LOGW("Demuxer '%s': stream explicitly disabled by the device",
demuxer->name);
sc_demuxer_disable_sinks(demuxer);
eos = true;
goto end;
@@ -196,18 +197,21 @@ run_demuxer(void *data) {
enum AVCodecID codec_id = sc_demuxer_to_avcodec_id(raw_codec_id);
if (codec_id == AV_CODEC_ID_NONE) {
// Error already logged
LOGE("Demuxer '%s': stream disabled due to unsupported codec",
demuxer->name);
sc_demuxer_disable_sinks(demuxer);
goto end;
}
const AVCodec *codec = avcodec_find_decoder(codec_id);
if (!codec) {
LOGE("Decoder not found");
LOGE("Demuxer '%s': stream disabled due to missing decoder",
demuxer->name);
sc_demuxer_disable_sinks(demuxer);
goto end;
}
if (!sc_demuxer_open_sinks(demuxer, codec)) {
LOGE("Could not open demuxer sinks");
goto end;
}
@@ -252,7 +256,7 @@ run_demuxer(void *data) {
}
}
LOGD("End of frames");
LOGD("Demuxer '%s': end of frames", demuxer->name);
if (must_merge_config_packet) {
sc_packet_merger_destroy(&merger);
@@ -268,10 +272,11 @@ end:
}
void
sc_demuxer_init(struct sc_demuxer *demuxer, sc_socket socket,
sc_demuxer_init(struct sc_demuxer *demuxer, const char *name, sc_socket socket,
const struct sc_demuxer_callbacks *cbs, void *cbs_userdata) {
assert(socket != SC_SOCKET_NONE);
demuxer->name = name; // statically allocated
demuxer->socket = socket;
demuxer->sink_count = 0;
@@ -291,12 +296,12 @@ sc_demuxer_add_sink(struct sc_demuxer *demuxer, struct sc_packet_sink *sink) {
bool
sc_demuxer_start(struct sc_demuxer *demuxer) {
LOGD("Starting demuxer thread");
LOGD("Demuxer '%s': starting thread", demuxer->name);
bool ok = sc_thread_create(&demuxer->thread, run_demuxer, "scrcpy-demuxer",
demuxer);
if (!ok) {
LOGE("Could not start demuxer thread");
LOGE("Demuxer '%s': could not start thread", demuxer->name);
return false;
}
return true;

View File

@@ -15,6 +15,8 @@
#define SC_DEMUXER_MAX_SINKS 2
struct sc_demuxer {
const char *name; // must be statically allocated (e.g. a string literal)
sc_socket socket;
sc_thread thread;
@@ -29,8 +31,9 @@ struct sc_demuxer_callbacks {
void (*on_ended)(struct sc_demuxer *demuxer, bool eos, void *userdata);
};
// The name must be statically allocated (e.g. a string literal)
void
sc_demuxer_init(struct sc_demuxer *demuxer, sc_socket socket,
sc_demuxer_init(struct sc_demuxer *demuxer, const char *name, sc_socket socket,
const struct sc_demuxer_callbacks *cbs, void *cbs_userdata);
void

View File

@@ -249,7 +249,9 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
sc_cond_wait(&recorder->queue_cond, &recorder->mutex);
}
if (recorder->stopped && sc_recorder_has_empty_queues(recorder)) {
if (recorder->stopped && sc_queue_is_empty(&recorder->video_queue)) {
// If the recorder is stopped, don't process anything if there are not
// at least video packets
sc_mutex_unlock(&recorder->mutex);
return false;
}
@@ -257,8 +259,9 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
struct sc_record_packet *video_pkt;
sc_queue_take(&recorder->video_queue, next, &video_pkt);
struct sc_record_packet *audio_pkt;
if (recorder->audio) {
struct sc_record_packet *audio_pkt = NULL;
if (!sc_queue_is_empty(&recorder->audio_queue)) {
assert(recorder->audio);
sc_queue_take(&recorder->audio_queue, next, &audio_pkt);
}
@@ -279,7 +282,7 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
goto end;
}
if (recorder->audio) {
if (audio_pkt) {
if (audio_pkt->packet->pts != AV_NOPTS_VALUE) {
LOGE("The first audio packet is not a config packet");
goto end;
@@ -304,7 +307,7 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
end:
sc_record_packet_delete(video_pkt);
if (recorder->audio) {
if (audio_pkt) {
sc_record_packet_delete(audio_pkt);
}
@@ -353,12 +356,6 @@ sc_recorder_process_packets(struct sc_recorder *recorder) {
assert(recorder->audio
|| (!audio_pkt && sc_queue_is_empty(&recorder->audio_queue)));
if (recorder->stopped && sc_queue_is_empty(&recorder->video_queue)
&& sc_queue_is_empty(&recorder->audio_queue)) {
sc_mutex_unlock(&recorder->mutex);
break;
}
if (!video_pkt && !sc_queue_is_empty(&recorder->video_queue)) {
sc_queue_take(&recorder->video_queue, next, &video_pkt);
}
@@ -367,6 +364,13 @@ sc_recorder_process_packets(struct sc_recorder *recorder) {
sc_queue_take(&recorder->audio_queue, next, &audio_pkt);
}
if (recorder->stopped && !video_pkt && !audio_pkt) {
assert(sc_queue_is_empty(&recorder->video_queue));
assert(sc_queue_is_empty(&recorder->audio_queue));
sc_mutex_unlock(&recorder->mutex);
break;
}
assert(video_pkt || audio_pkt); // at least one
sc_mutex_unlock(&recorder->mutex);
@@ -391,6 +395,21 @@ sc_recorder_process_packets(struct sc_recorder *recorder) {
} else if (video_pkt && audio_pkt) {
pts_origin =
MIN(video_pkt->packet->pts, audio_pkt->packet->pts);
} else if (recorder->stopped) {
if (video_pkt) {
// The recorder is stopped without audio, record the video
// packets
pts_origin = video_pkt->packet->pts;
} else {
// Fail if there is no video
error = true;
goto end;
}
// If the recorder is stopped while one of the streams has no
// packets, then we must avoid a live-loop and correctly record
// the stream having packets.
pts_origin = video_pkt ? video_pkt->packet->pts
: audio_pkt->packet->pts;
} else {
// We need both video and audio packets to initialize pts_origin
continue;
@@ -413,8 +432,8 @@ sc_recorder_process_packets(struct sc_recorder *recorder) {
sc_record_packet_delete(video_pkt_previous);
if (!ok) {
LOGE("Could not record video packet");
// TODO cleanup
return false;
error = true;
goto end;
}
}
@@ -427,13 +446,13 @@ sc_recorder_process_packets(struct sc_recorder *recorder) {
audio_pkt->packet->dts = audio_pkt->packet->pts;
bool ok = sc_recorder_write_audio(recorder, audio_pkt->packet);
sc_record_packet_delete(audio_pkt);
if (!ok) {
LOGE("Could not record audio packet");
error = true;
goto end;
}
sc_record_packet_delete(audio_pkt);
audio_pkt = NULL;
}
}
@@ -657,7 +676,7 @@ sc_recorder_audio_packet_sink_disable(struct sc_packet_sink *sink) {
assert(!recorder->audio_disabled);
assert(!recorder->audio_codec);
LOGW("Audio stream disabled: it could not be captured by the device");
LOGW("Audio stream recording disabled");
sc_mutex_lock(&recorder->mutex);
recorder->audio_disabled = true;

View File

@@ -463,14 +463,14 @@ scrcpy(struct scrcpy_options *options) {
static const struct sc_demuxer_callbacks video_demuxer_cbs = {
.on_ended = sc_video_demuxer_on_ended,
};
sc_demuxer_init(&s->video_demuxer, s->server.video_socket,
sc_demuxer_init(&s->video_demuxer, "video", s->server.video_socket,
&video_demuxer_cbs, NULL);
if (options->audio) {
static const struct sc_demuxer_callbacks audio_demuxer_cbs = {
.on_ended = sc_audio_demuxer_on_ended,
};
sc_demuxer_init(&s->audio_demuxer, s->server.audio_socket,
sc_demuxer_init(&s->audio_demuxer, "audio", s->server.audio_socket,
&audio_demuxer_cbs, NULL);
}

View File

@@ -20,7 +20,7 @@ import java.util.concurrent.BlockingQueue;
public final class AudioEncoder {
private static class InputTask {
final int index;
private final int index;
InputTask(int index) {
this.index = index;
@@ -28,8 +28,8 @@ public final class AudioEncoder {
}
private static class OutputTask {
final int index;
final MediaCodec.BufferInfo bufferInfo;
private final int index;
private final MediaCodec.BufferInfo bufferInfo;
OutputTask(int index, MediaCodec.BufferInfo bufferInfo) {
this.index = index;

View File

@@ -2,7 +2,10 @@ package com.genymobile.scrcpy;
public interface Codec {
enum Type {VIDEO, AUDIO}
enum Type {
VIDEO,
AUDIO,
}
Type getType();

View File

@@ -159,6 +159,7 @@ public final class Server {
return thread;
}
@SuppressWarnings("MethodLength")
private static Options createOptions(String... args) {
if (args.length < 1) {
throw new IllegalArgumentException("Missing client version");

View File

@@ -2,7 +2,6 @@ package com.genymobile.scrcpy;
import android.annotation.SuppressLint;
import android.app.Application;
import android.app.Instrumentation;
import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
import android.os.Looper;