summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2015-11-20 16:30:05 +0100
committerFrediano Ziglio <fziglio@redhat.com>2015-11-21 13:41:35 +0000
commit1f27043b8264c2c43e62269992cbfd85d9753482 (patch)
tree4e2b6fe8dd4c4627f1e07227b8b00aa99c08cdcb /server
parentf5c109573f37fb60b86c5cbb3f1c9f7308ca363f (diff)
downloadspice-1f27043b8264c2c43e62269992cbfd85d9753482.zip
spice-1f27043b8264c2c43e62269992cbfd85d9753482.tar.gz
spice-1f27043b8264c2c43e62269992cbfd85d9753482.tar.xz
stream: remove red_stream_ prefix from mjpeg callbacks
Author: Marc-André Lureau <marcandre.lureau@gmail.com> Acked-by: Frediano Ziglio <fziglio@redhat.com>
Diffstat (limited to 'server')
-rw-r--r--server/stream.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/server/stream.c b/server/stream.c
index 6749f90..518e2d8 100644
--- a/server/stream.c
+++ b/server/stream.c
@@ -582,7 +582,7 @@ static uint64_t get_initial_bit_rate(DisplayChannelClient *dcc, Stream *stream)
stream->width * stream->height) / DCC_TO_DC(dcc)->streams_size_total;
}
-static uint32_t red_stream_mjpeg_encoder_get_roundtrip(void *opaque)
+static uint32_t get_roundtrip_ms(void *opaque)
{
StreamAgent *agent = opaque;
int roundtrip;
@@ -602,14 +602,14 @@ static uint32_t red_stream_mjpeg_encoder_get_roundtrip(void *opaque)
return roundtrip;
}
-static uint32_t red_stream_mjpeg_encoder_get_source_fps(void *opaque)
+static uint32_t get_source_fps(void *opaque)
{
StreamAgent *agent = opaque;
return agent->stream->input_fps;
}
-static void red_stream_update_client_playback_latency(void *opaque, uint32_t delay_ms)
+static void update_client_playback_delay(void *opaque, uint32_t delay_ms)
{
StreamAgent *agent = opaque;
DisplayChannelClient *dcc = agent->dcc;
@@ -646,9 +646,9 @@ void dcc_create_stream(DisplayChannelClient *dcc, Stream *stream)
MJpegEncoderRateControlCbs mjpeg_cbs;
uint64_t initial_bit_rate;
- mjpeg_cbs.get_roundtrip_ms = red_stream_mjpeg_encoder_get_roundtrip;
- mjpeg_cbs.get_source_fps = red_stream_mjpeg_encoder_get_source_fps;
- mjpeg_cbs.update_client_playback_delay = red_stream_update_client_playback_latency;
+ mjpeg_cbs.get_roundtrip_ms = get_roundtrip_ms;
+ mjpeg_cbs.get_source_fps = get_source_fps;
+ mjpeg_cbs.update_client_playback_delay = update_client_playback_delay;
initial_bit_rate = get_initial_bit_rate(dcc, stream);
agent->mjpeg_encoder = mjpeg_encoder_new(initial_bit_rate, &mjpeg_cbs, agent);