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

Give a name to demuxer instances

Browse source 
This will be useful in logs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
This commit is contained in:
Romain Vimont 2023-02-19 00:13:54 +01:00
parent e9876788c9
commit d499f890e7
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/demuxer.c
View file

@ -122,7 +122,7 @@ static bool
sc_demuxer_push_packet(struct sc_demuxer *demuxer, AVPacket *packet) { sc_demuxer_push_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
bool ok = push_packet_to_sinks(demuxer, packet); bool ok = push_packet_to_sinks(demuxer, packet);
if (!ok) { if (!ok) {
LOGE("Could not process packet"); LOGE("Demuxer '%s': could not process packet", demuxer->name);
return false; return false;
} }
@ -177,7 +177,7 @@ run_demuxer(void *data) {
const AVCodec *codec = avcodec_find_decoder(codec_id); const AVCodec *codec = avcodec_find_decoder(codec_id);
if (!codec) { if (!codec) {
LOGE("Decoder not found"); LOGE("Demuxer '%s': decoder not found", demuxer->name);
goto end; goto end;
} }
@ -217,7 +217,7 @@ run_demuxer(void *data) {
} }
} }
LOGD("End of frames"); LOGD("Demuxer '%s': end of frames", demuxer->name);
sc_packet_merger_destroy(&merger); sc_packet_merger_destroy(&merger);
@ -231,8 +231,9 @@ end:
} }
void 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) { const struct sc_demuxer_callbacks *cbs, void *cbs_userdata) {
demuxer->name = name; // statically allocated
demuxer->socket = socket; demuxer->socket = socket;
demuxer->sink_count = 0; demuxer->sink_count = 0;
@ -252,12 +253,12 @@ sc_demuxer_add_sink(struct sc_demuxer *demuxer, struct sc_packet_sink *sink) {
bool bool
sc_demuxer_start(struct sc_demuxer *demuxer) { 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", bool ok = sc_thread_create(&demuxer->thread, run_demuxer, "scrcpy-demuxer",
demuxer); demuxer);
if (!ok) { if (!ok) {
LOGE("Could not start demuxer thread"); LOGE("Demuxer '%s': could not start thread", demuxer->name);
return false; return false;
} }
return true; return true;

5
app/src/demuxer.h
View file

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

2
app/src/scrcpy.c
View file

@ -387,7 +387,7 @@ scrcpy(struct scrcpy_options *options) {
static const struct sc_demuxer_callbacks video_demuxer_cbs = { static const struct sc_demuxer_callbacks video_demuxer_cbs = {
.on_ended = sc_video_demuxer_on_ended, .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); &video_demuxer_cbs, NULL);
bool needs_decoder = options->display; bool needs_decoder = options->display;