Skip to content

Commit b994288

Browse files
committed
Rename decoder to video_decoder
This prepares the introduction of audio_decoder. PR #3757 <Genymobile/scrcpy#3757>
1 parent fe39654 commit b994288

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

app/src/scrcpy.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct scrcpy {
4242
struct sc_screen screen;
4343
struct sc_demuxer video_demuxer;
4444
struct sc_demuxer audio_demuxer;
45-
struct sc_decoder decoder;
45+
struct sc_decoder video_decoder;
4646
struct sc_recorder recorder;
4747
#ifdef HAVE_V4L2
4848
struct sc_v4l2_sink v4l2_sink;
@@ -436,13 +436,13 @@ scrcpy(struct scrcpy_options *options) {
436436
&audio_demuxer_cbs, NULL);
437437
}
438438

439-
bool needs_decoder = options->display;
439+
bool needs_video_decoder = options->display;
440440
#ifdef HAVE_V4L2
441-
needs_decoder |= !!options->v4l2_device;
441+
needs_video_decoder |= !!options->v4l2_device;
442442
#endif
443-
if (needs_decoder) {
444-
sc_decoder_init(&s->decoder);
445-
sc_demuxer_add_sink(&s->video_demuxer, &s->decoder.packet_sink);
443+
if (needs_video_decoder) {
444+
sc_decoder_init(&s->video_decoder);
445+
sc_demuxer_add_sink(&s->video_demuxer, &s->video_decoder.packet_sink);
446446
}
447447

448448
if (options->record_filename) {
@@ -656,7 +656,7 @@ scrcpy(struct scrcpy_options *options) {
656656
}
657657
screen_initialized = true;
658658

659-
sc_decoder_add_sink(&s->decoder, &s->screen.frame_sink);
659+
sc_decoder_add_sink(&s->video_decoder, &s->screen.frame_sink);
660660
}
661661

662662
#ifdef HAVE_V4L2
@@ -666,7 +666,7 @@ scrcpy(struct scrcpy_options *options) {
666666
goto end;
667667
}
668668

669-
sc_decoder_add_sink(&s->decoder, &s->v4l2_sink.frame_sink);
669+
sc_decoder_add_sink(&s->video_decoder, &s->v4l2_sink.frame_sink);
670670

671671
v4l2_sink_initialized = true;
672672
}

0 commit comments

Comments
 (0)