From 1f27043b8264c2c43e62269992cbfd85d9753482 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Fri, 20 Nov 2015 16:30:05 +0100 Subject: stream: remove red_stream_ prefix from mjpeg callbacks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Author: Marc-André Lureau Acked-by: Frediano Ziglio --- server/stream.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'server/stream.c') diff --git a/server/stream.c b/server/stream.c index 6749f90c..518e2d88 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); -- cgit