Skip to content

Display and control your Android device

Return a tri-state result from sinks

Romain Vimont05649b9d7d34
diff --git a/app/src/audio_player.c b/app/src/audio_player.c
index 75d49ec5..98a5f700 100644
--- a/app/src/audio_player.c
+++ b/app/src/audio_player.c
@@ -38,12 +38,13 @@ sc_audio_player_stream_callback(void *userdata, SDL_AudioStream *stream,
}
}
-static bool
+static enum sc_sink_result
sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
const AVFrame *frame) {
struct sc_audio_player *ap = DOWNCAST(sink);
- return sc_audio_regulator_push(&ap->audioreg, frame);
+ bool ok = sc_audio_regulator_push(&ap->audioreg, frame);
+ return ok ? SC_SINK_OK : SC_SINK_KO;
}
static bool
diff --git a/app/src/decoder.c b/app/src/decoder.c
index 187eea72..5bf98692 100644
--- a/app/src/decoder.c
+++ b/app/src/decoder.c
@@ -76,19 +76,19 @@ sc_decoder_close(struct sc_decoder *decoder) {
avcodec_free_context(&decoder->ctx);
}
-static bool
+static enum sc_sink_result
sc_decoder_push(struct sc_decoder *decoder, const AVPacket *packet) {
bool is_config = packet->pts == AV_NOPTS_VALUE;
if (is_config) {
// nothing to do
- return true;
+ return SC_SINK_OK;
}
int ret = avcodec_send_packet(decoder->ctx, packet);
if (ret < 0 && ret != AVERROR(EAGAIN)) {
LOGE("Decoder '%s': could not send video packet: %s",
decoder->name, av_err2str(ret));
- return false;
+ return SC_SINK_KO;
}
for (;;) {
@@ -100,7 +100,7 @@ sc_decoder_push(struct sc_decoder *decoder, const AVPacket *packet) {
if (ret) {
LOGE("Decoder '%s', could not receive video frame: %s",
decoder->name, av_err2str(ret));
- return false;
+ return SC_SINK_KO;
}
// a frame was received
@@ -131,19 +131,19 @@ sc_decoder_push(struct sc_decoder *decoder, const AVPacket *packet) {
decoder->frame_size = frame_size;
}
- bool ok = sc_frame_source_sinks_push(&decoder->frame_source,
- decoder->frame);
+ enum sc_sink_result result =
+ sc_frame_source_sinks_push(&decoder->frame_source, decoder->frame);
av_frame_unref(decoder->frame);
- if (!ok) {
- // Error already logged
- return false;
+ if (result != SC_SINK_OK) {
+ // Not a decoder error
+ return SC_SINK_STOPPED;
}
}
- return true;
+ return SC_SINK_OK;
}
-static bool
+static enum sc_sink_result
sc_decoder_push_session(struct sc_decoder *decoder,
const struct sc_stream_session *session) {
decoder->session = *session;
@@ -164,17 +164,16 @@ sc_decoder_packet_sink_close(struct sc_packet_sink *sink) {
sc_decoder_close(decoder);
}
-static bool
+static enum sc_sink_result
sc_decoder_packet_sink_push(struct sc_packet_sink *sink,
const AVPacket *packet) {
struct sc_decoder *decoder = DOWNCAST(sink);
return sc_decoder_push(decoder, packet);
}
-static bool
+static enum sc_sink_result
sc_decoder_packet_sink_push_session(struct sc_packet_sink *sink,
const struct sc_stream_session *session) {
-
struct sc_decoder *decoder = DOWNCAST(sink);
return sc_decoder_push_session(decoder, session);
}
diff --git a/app/src/demuxer.c b/app/src/demuxer.c
index 19a81a33..bb4ce77d 100644
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -307,10 +307,10 @@ run_demuxer(void *data) {
if (sc_demuxer_is_session(header)) {
sc_demuxer_parse_session(header, &session_data);
- ok = sc_packet_source_sinks_push_session(&demuxer->packet_source,
- &session_data);
- if (!ok) {
- // The sink already logged its concrete error
+ enum sc_sink_result result =
+ sc_packet_source_sinks_push_session(&demuxer->packet_source,
+ &session_data);
+ if (result != SC_SINK_OK) {
break;
}
} else {
@@ -328,10 +328,10 @@ run_demuxer(void *data) {
}
}
- ok = sc_packet_source_sinks_push(&demuxer->packet_source, packet);
+ enum sc_sink_result result =
+ sc_packet_source_sinks_push(&demuxer->packet_source, packet);
av_packet_unref(packet);
- if (!ok) {
- // The sink already logged its concrete error
+ if (result != SC_SINK_OK) {
break;
}
}
diff --git a/app/src/recorder.c b/app/src/recorder.c
index 38308b33..357224af 100644
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@@ -597,7 +597,7 @@ sc_recorder_video_packet_sink_close(struct sc_packet_sink *sink) {
sc_mutex_unlock(&recorder->mutex);
}
-static bool
+static enum sc_sink_result
sc_recorder_video_packet_sink_push(struct sc_packet_sink *sink,
const AVPacket *packet) {
struct sc_recorder *recorder = DOWNCAST_VIDEO(sink);
@@ -609,13 +609,13 @@ sc_recorder_video_packet_sink_push(struct sc_packet_sink *sink,
if (recorder->stopped) {
// reject any new packet
sc_mutex_unlock(&recorder->mutex);
- return false;
+ return SC_SINK_STOPPED;
}
AVPacket *rec = sc_recorder_packet_ref(packet);
if (!rec) {
sc_mutex_unlock(&recorder->mutex);
- return false;
+ return SC_SINK_KO;
}
rec->stream_index = recorder->video_stream.index;
@@ -625,13 +625,13 @@ sc_recorder_video_packet_sink_push(struct sc_packet_sink *sink,
LOG_OOM();
sc_mutex_unlock(&recorder->mutex);
av_packet_free(&rec);
- return false;
+ return SC_SINK_KO;
}
sc_cond_signal(&recorder->cond);
sc_mutex_unlock(&recorder->mutex);
- return true;
+ return SC_SINK_OK;
}
static bool
@@ -687,7 +687,7 @@ sc_recorder_audio_packet_sink_close(struct sc_packet_sink *sink) {
sc_mutex_unlock(&recorder->mutex);
}
-static bool
+static enum sc_sink_result
sc_recorder_audio_packet_sink_push(struct sc_packet_sink *sink,
const AVPacket *packet) {
struct sc_recorder *recorder = DOWNCAST_AUDIO(sink);
@@ -700,13 +700,13 @@ sc_recorder_audio_packet_sink_push(struct sc_packet_sink *sink,
if (recorder->stopped) {
// reject any new packet
sc_mutex_unlock(&recorder->mutex);
- return false;
+ return SC_SINK_STOPPED;
}
AVPacket *rec = sc_recorder_packet_ref(packet);
if (!rec) {
sc_mutex_unlock(&recorder->mutex);
- return false;
+ return SC_SINK_KO;
}
rec->stream_index = recorder->audio_stream.index;
@@ -716,13 +716,13 @@ sc_recorder_audio_packet_sink_push(struct sc_packet_sink *sink,
LOG_OOM();
sc_mutex_unlock(&recorder->mutex);
av_packet_free(&rec);
- return false;
+ return SC_SINK_KO;
}
sc_cond_signal(&recorder->cond);
sc_mutex_unlock(&recorder->mutex);
- return true;
+ return SC_SINK_OK;
}
static void
diff --git a/app/src/screen.c b/app/src/screen.c
index e75c6961..5ae65f70 100644
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -443,7 +443,7 @@ sc_screen_frame_sink_close(struct sc_frame_sink *sink) {
// nothing to do, the screen lifecycle is not managed by the frame producer
}
-static bool
+static enum sc_sink_result
sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
struct sc_screen *screen = DOWNCAST(sink);
assert(screen->video);
@@ -454,7 +454,7 @@ sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
screen->prevent_auto_resize = screen->current_session.video.client_resized;
sc_mutex_unlock(&screen->mutex);
if (!ok) {
- return false;
+ return SC_SINK_KO;
}
if (previous_skipped) {
@@ -465,19 +465,19 @@ sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
// Post the event on the UI thread
bool ok = sc_push_event(SC_EVENT_NEW_FRAME);
if (!ok) {
- return false;
+ return SC_SINK_KO;
}
}
- return true;
+ return SC_SINK_OK;
}
-static bool
+static enum sc_sink_result
sc_screen_frame_sink_push_session(struct sc_frame_sink *sink,
const struct sc_stream_session *session) {
struct sc_screen *screen = DOWNCAST(sink);
screen->current_session = *session;
- return true;
+ return SC_SINK_OK;
}
bool
diff --git a/app/src/trait/frame_sink.h b/app/src/trait/frame_sink.h
index 36fabe3a..478c1f7c 100644
--- a/app/src/trait/frame_sink.h
+++ b/app/src/trait/frame_sink.h
@@ -7,6 +7,7 @@
#include <libavcodec/avcodec.h>
#include "trait/packet_sink.h"
+#include "trait/sink.h"
/**
* Frame sink trait.
@@ -26,13 +27,13 @@ struct sc_frame_sink_ops {
void
(*close)(struct sc_frame_sink *sink);
- bool
+ enum sc_sink_result
(*push)(struct sc_frame_sink *sink, const AVFrame *frame);
/**
* Optional callback to be notified of a new stream session.
*/
- bool
+ enum sc_sink_result
(*push_session)(struct sc_frame_sink *sink,
const struct sc_stream_session *session);
};
diff --git a/app/src/trait/frame_source.c b/app/src/trait/frame_source.c
index d34e628b..737c85c4 100644
--- a/app/src/trait/frame_source.c
+++ b/app/src/trait/frame_source.c
@@ -47,31 +47,34 @@ sc_frame_source_sinks_close(struct sc_frame_source *source) {
sc_frame_source_sinks_close_firsts(source, source->sink_count);
}
-bool
+enum sc_sink_result
sc_frame_source_sinks_push(struct sc_frame_source *source,
const AVFrame *frame) {
assert(source->sink_count);
for (unsigned i = 0; i < source->sink_count; ++i) {
struct sc_frame_sink *sink = source->sinks[i];
- if (!sink->ops->push(sink, frame)) {
- return false;
+ enum sc_sink_result result = sink->ops->push(sink, frame);
+ if (result != SC_SINK_OK) {
+ return result;
}
}
- return true;
+ return SC_SINK_OK;
}
-bool
+enum sc_sink_result
sc_frame_source_sinks_push_session(struct sc_frame_source *source,
const struct sc_stream_session *session) {
assert(source->sink_count);
for (unsigned i = 0; i < source->sink_count; ++i) {
struct sc_frame_sink *sink = source->sinks[i];
- if (sink->ops->push_session &&
- !sink->ops->push_session(sink, session)) {
- return false;
+ if (sink->ops->push_session) {
+ enum sc_sink_result result = sink->ops->push_session(sink, session);
+ if (result != SC_SINK_OK) {
+ return result;
+ }
}
}
- return true;
+ return SC_SINK_OK;
}
diff --git a/app/src/trait/frame_source.h b/app/src/trait/frame_source.h
index 0a1ea8f1..ad65d282 100644
--- a/app/src/trait/frame_source.h
+++ b/app/src/trait/frame_source.h
@@ -34,11 +34,11 @@ sc_frame_source_sinks_open(struct sc_frame_source *source,
void
sc_frame_source_sinks_close(struct sc_frame_source *source);
-bool
+enum sc_sink_result
sc_frame_source_sinks_push(struct sc_frame_source *source,
const AVFrame *frame);
-bool
+enum sc_sink_result
sc_frame_source_sinks_push_session(struct sc_frame_source *source,
const struct sc_stream_session *session);
diff --git a/app/src/trait/packet_sink.h b/app/src/trait/packet_sink.h
index 7d13d46a..3755f5b8 100644
--- a/app/src/trait/packet_sink.h
+++ b/app/src/trait/packet_sink.h
@@ -6,6 +6,8 @@
#include <stdbool.h>
#include <libavcodec/avcodec.h>
+#include "trait/sink.h"
+
/**
* Packet sink trait.
*
@@ -34,13 +36,13 @@ struct sc_packet_sink_ops {
void
(*close)(struct sc_packet_sink *sink);
- bool
+ enum sc_sink_result
(*push)(struct sc_packet_sink *sink, const AVPacket *packet);
/**
* Optional callback to be notified of a new stream session.
*/
- bool
+ enum sc_sink_result
(*push_session)(struct sc_packet_sink *sink,
const struct sc_stream_session *session);
diff --git a/app/src/trait/packet_source.c b/app/src/trait/packet_source.c
index 7b5861f1..25682421 100644
--- a/app/src/trait/packet_source.c
+++ b/app/src/trait/packet_source.c
@@ -48,33 +48,36 @@ sc_packet_source_sinks_close(struct sc_packet_source *source) {
sc_packet_source_sinks_close_firsts(source, source->sink_count);
}
-bool
+enum sc_sink_result
sc_packet_source_sinks_push(struct sc_packet_source *source,
const AVPacket *packet) {
assert(source->sink_count);
for (unsigned i = 0; i < source->sink_count; ++i) {
struct sc_packet_sink *sink = source->sinks[i];
- if (!sink->ops->push(sink, packet)) {
- return false;
+ enum sc_sink_result result = sink->ops->push(sink, packet);
+ if (result != SC_SINK_OK) {
+ return result;
}
}
- return true;
+ return SC_SINK_OK;
}
-bool
+enum sc_sink_result
sc_packet_source_sinks_push_session(struct sc_packet_source *source,
const struct sc_stream_session *session) {
assert(source->sink_count);
for (unsigned i = 0; i < source->sink_count; ++i) {
struct sc_packet_sink *sink = source->sinks[i];
- if (sink->ops->push_session
- && !sink->ops->push_session(sink, session)) {
- return false;
+ if (sink->ops->push_session) {
+ enum sc_sink_result result = sink->ops->push_session(sink, session);
+ if (result != SC_SINK_OK) {
+ return result;
+ }
}
}
- return true;
+ return SC_SINK_OK;
}
void
diff --git a/app/src/trait/packet_source.h b/app/src/trait/packet_source.h
index c81b5da4..a206b185 100644
--- a/app/src/trait/packet_source.h
+++ b/app/src/trait/packet_source.h
@@ -35,11 +35,11 @@ sc_packet_source_sinks_open(struct sc_packet_source *source,
void
sc_packet_source_sinks_close(struct sc_packet_source *source);
-bool
+enum sc_sink_result
sc_packet_source_sinks_push(struct sc_packet_source *source,
const AVPacket *packet);
-bool
+enum sc_sink_result
sc_packet_source_sinks_push_session(struct sc_packet_source *source,
const struct sc_stream_session *session);
diff --git a/app/src/trait/sink.h b/app/src/trait/sink.h
new file mode 100644
index 00000000..92c6e5d9
--- /dev/null
+++ b/app/src/trait/sink.h
@@ -0,0 +1,18 @@
+#ifndef SC_SINK_H
+#define SC_SINK_H
+
+#include "common.h"
+
+enum sc_sink_result {
+ /* The item has been accepted */
+ SC_SINK_OK,
+
+ /* An error occurred */
+ SC_SINK_KO,
+
+ /* The sink is stopped and will not accept any further item (this is not an
+ * error) */
+ SC_SINK_STOPPED,
+};
+
+#endif
diff --git a/app/src/v4l2_sink.c b/app/src/v4l2_sink.c
index d4a0e510..355304b3 100644
--- a/app/src/v4l2_sink.c
+++ b/app/src/v4l2_sink.c
@@ -294,14 +294,20 @@ sc_v4l2_sink_close(struct sc_v4l2_sink *vs) {
sc_frame_buffer_destroy(&vs->fb);
}
-static bool
+static enum sc_sink_result
sc_v4l2_sink_push(struct sc_v4l2_sink *vs, const AVFrame *frame) {
sc_mutex_lock(&vs->mutex);
+
+ if (vs->stopped) {
+ sc_mutex_unlock(&vs->mutex);
+ return SC_SINK_STOPPED;
+ }
+
bool previous_skipped = sc_frame_buffer_has_frame(&vs->fb);
bool ok = sc_frame_buffer_push(&vs->fb, frame);
if (!ok) {
sc_mutex_unlock(&vs->mutex);
- return false;
+ return SC_SINK_KO;
}
if (!previous_skipped) {
@@ -310,7 +316,7 @@ sc_v4l2_sink_push(struct sc_v4l2_sink *vs, const AVFrame *frame) {
}
sc_mutex_unlock(&vs->mutex);
- return true;
+ return SC_SINK_OK;
}
static bool
@@ -326,7 +332,7 @@ sc_v4l2_frame_sink_close(struct sc_frame_sink *sink) {
sc_v4l2_sink_close(vs);
}
-static bool
+static enum sc_sink_result
sc_v4l2_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
struct sc_v4l2_sink *vs = DOWNCAST(sink);
return sc_v4l2_sink_push(vs, frame);
diff --git a/app/src/video_regulator.c b/app/src/video_regulator.c
index 2c0f1416..6c0b0796 100644
--- a/app/src/video_regulator.c
+++ b/app/src/video_regulator.c
@@ -63,7 +63,7 @@ run_buffering(void *data) {
struct sc_delayed_packet dpacket = sc_vecdeque_pop(&vr->queue);
- bool ok;
+ enum sc_sink_result result;
if (dpacket.type == SC_DELAYED_PACKET_TYPE_FRAME) {
sc_tick max_deadline = sc_tick_now() + vr->delay;
// PTS (written by the server) are expressed in microseconds
@@ -94,17 +94,20 @@ run_buffering(void *data) {
pts, dframe.push_date, sc_tick_now());
#endif
- ok = sc_frame_source_sinks_push(&vr->frame_source, dpacket.frame);
+ result = sc_frame_source_sinks_push(&vr->frame_source,
+ dpacket.frame);
} else {
assert(dpacket.type == SC_DELAYED_PACKET_TYPE_SESSION);
sc_mutex_unlock(&vr->mutex);
- ok = sc_frame_source_sinks_push_session(&vr->frame_source,
- &dpacket.session);
+ result = sc_frame_source_sinks_push_session(&vr->frame_source,
+ &dpacket.session);
}
sc_delayed_packet_destroy(&dpacket);
- if (!ok) {
- LOGE("Delayed packet could not be pushed, stopping");
+ if (result != SC_SINK_OK) {
+ if (result == SC_SINK_KO) {
+ LOGE("Delayed packet could not be pushed, stopping");
+ }
sc_mutex_lock(&vr->mutex);
// Prevent to push any new packet
vr->stopped = true;
@@ -198,7 +201,7 @@ sc_video_regulator_frame_sink_close(struct sc_frame_sink *sink) {
sc_mutex_destroy(&vr->mutex);
}
-static bool
+static enum sc_sink_result
sc_video_regulator_frame_sink_push(struct sc_frame_sink *sink,
const AVFrame *frame) {
struct sc_video_regulator *vr = DOWNCAST(sink);
@@ -207,7 +210,7 @@ sc_video_regulator_frame_sink_push(struct sc_frame_sink *sink,
if (vr->stopped) {
sc_mutex_unlock(&vr->mutex);
- return false;
+ return SC_SINK_STOPPED;
}
assert(frame->opaque_ref);
@@ -229,14 +232,14 @@ sc_video_regulator_frame_sink_push(struct sc_frame_sink *sink,
if (!dpacket) {
sc_mutex_unlock(&vr->mutex);
LOG_OOM();
- return false;
+ return SC_SINK_KO;
}
bool ok = sc_delayed_packet_init_frame(dpacket, frame);
if (!ok) {
sc_mutex_unlock(&vr->mutex);
LOG_OOM();
- return false;
+ return SC_SINK_KO;
}
#ifdef SC_BUFFERING_DEBUG
@@ -247,10 +250,10 @@ sc_video_regulator_frame_sink_push(struct sc_frame_sink *sink,
sc_mutex_unlock(&vr->mutex);
- return true;
+ return SC_SINK_OK;
}
-static bool
+static enum sc_sink_result
sc_video_regulator_frame_sink_push_session(struct sc_frame_sink *sink,
const struct sc_stream_session *session) {
struct sc_video_regulator *vr = DOWNCAST(sink);
@@ -259,7 +262,7 @@ sc_video_regulator_frame_sink_push_session(struct sc_frame_sink *sink,
if (vr->stopped) {
sc_mutex_unlock(&vr->mutex);
- return false;
+ return SC_SINK_STOPPED;
}
struct sc_delayed_packet *dpacket =
@@ -267,7 +270,7 @@ sc_video_regulator_frame_sink_push_session(struct sc_frame_sink *sink,
if (!dpacket) {
sc_mutex_unlock(&vr->mutex);
LOG_OOM();
- return false;
+ return SC_SINK_KO;
}
sc_delayed_packet_init_session(dpacket, session);
@@ -280,7 +283,7 @@ sc_video_regulator_frame_sink_push_session(struct sc_frame_sink *sink,
sc_mutex_unlock(&vr->mutex);
- return true;
+ return SC_SINK_OK;
}
void