Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Reorder initialization

Browse source 
Initialize components in the pipeline order: demuxer first, decoder and
recorder second.
This commit is contained in:
Romain Vimont 2023-02-23 12:36:59 +01:00
parent f9efe48aac
commit ef6a3b97a7
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/scrcpy.c
View file

@ -382,17 +382,20 @@ scrcpy(struct scrcpy_options *options) {
file_pusher_initialized = true; file_pusher_initialized = true;
} }
struct sc_decoder *dec = NULL; static const struct sc_demuxer_callbacks demuxer_cbs = {
.on_ended = sc_demuxer_on_ended,
};
sc_demuxer_init(&s->demuxer, s->server.video_socket, &demuxer_cbs, NULL);
bool needs_decoder = options->display; bool needs_decoder = options->display;
#ifdef HAVE_V4L2 #ifdef HAVE_V4L2
needs_decoder |= !!options->v4l2_device; needs_decoder |= !!options->v4l2_device;
#endif #endif
if (needs_decoder) { if (needs_decoder) {
sc_decoder_init(&s->decoder); sc_decoder_init(&s->decoder);
dec = &s->decoder; sc_demuxer_add_sink(&s->demuxer, &s->decoder.packet_sink);
} }
struct sc_recorder *rec = NULL;
if (options->record_filename) { if (options->record_filename) {
static const struct sc_recorder_callbacks recorder_cbs = { static const struct sc_recorder_callbacks recorder_cbs = {
.on_ended = sc_recorder_on_ended, .on_ended = sc_recorder_on_ended,
@ -409,20 +412,7 @@ scrcpy(struct scrcpy_options *options) {
} }
recorder_started = true; recorder_started = true;
rec = &s->recorder; sc_demuxer_add_sink(&s->demuxer, &s->recorder.packet_sink);
}
static const struct sc_demuxer_callbacks demuxer_cbs = {
.on_ended = sc_demuxer_on_ended,
};
sc_demuxer_init(&s->demuxer, s->server.video_socket, &demuxer_cbs, NULL);
if (dec) {
sc_demuxer_add_sink(&s->demuxer, &dec->packet_sink);
}
if (rec) {
sc_demuxer_add_sink(&s->demuxer, &rec->packet_sink);
} }
struct sc_controller *controller = NULL; struct sc_controller *controller = NULL;