pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use sc_ prefix for decoder

Browse Source
This commit is contained in:
Romain Vimont
2022-02-02 19:27:41 +01:00
parent 0bf7e4ddc4
commit 0080d0b0ff
3 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/scrcpy.c
View File

@@ -40,7 +40,7 @@ struct scrcpy {
struct sc_server server;
struct sc_screen screen;
struct stream stream;
struct decoder decoder;
struct sc_decoder decoder;
struct recorder recorder;
#ifdef HAVE_V4L2
struct sc_v4l2_sink v4l2_sink;
@@ -371,13 +371,13 @@ scrcpy(struct scrcpy_options *options) {
file_pusher_initialized = true;
}
struct decoder *dec = NULL;
struct sc_decoder *dec = NULL;
bool needs_decoder = options->display;
#ifdef HAVE_V4L2
needs_decoder |= !!options->v4l2_device;
#endif
if (needs_decoder) {
decoder_init(&s->decoder);
sc_decoder_init(&s->decoder);
dec = &s->decoder;
}
@@ -608,7 +608,7 @@ aoa_hid_end:
}
screen_initialized = true;
decoder_add_sink(&s->decoder, &s->screen.frame_sink);
sc_decoder_add_sink(&s->decoder, &s->screen.frame_sink);
}
#ifdef HAVE_V4L2
@@ -618,7 +618,7 @@ aoa_hid_end:
goto end;
}
decoder_add_sink(&s->decoder, &s->v4l2_sink.frame_sink);
sc_decoder_add_sink(&s->decoder, &s->v4l2_sink.frame_sink);
v4l2_sink_initialized = true;
}