pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-08 22:10:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename StreamAgent to VideoStreamAgent

Browse Source 
Just to avoid confusion between different uses of the word Stream (e.g.
RedStream) clarify that it's related to video streams

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Jonathon Jongsma 2017-10-20 15:50:09 -05:00
parent 2e08354ce1
commit 5ea0f68263
7 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/dcc-private.h
View File

@ -61,7 +61,7 @@ struct DisplayChannelClientPrivate
uint8_t surface_client_created[NUM_SURFACES];
QRegion surface_client_lossy_region[NUM_SURFACES];
StreamAgent stream_agents[NUM_STREAMS];
VideoStreamAgent stream_agents[NUM_STREAMS];
uint32_t streams_max_latency;
uint64_t streams_max_bit_rate;
bool gl_draw_ongoing;

14
server/dcc-send.c
View File

@ -1709,7 +1709,7 @@ static bool red_marshall_stream_data(RedChannelClient *rcc,
}
int stream_id = display_channel_get_video_stream_id(display, stream);
StreamAgent *agent = &dcc->priv->stream_agents[stream_id];
VideoStreamAgent *agent = &dcc->priv->stream_agents[stream_id];
VideoBuffer *outbuf;
/* workaround for vga streams */
frame_mm_time = drawable->red_drawable->mm_time ?
@ -2151,7 +2151,8 @@ static void marshall_qxl_drawable(RedChannelClient *rcc,
}
static void marshall_stream_start(RedChannelClient *rcc,
SpiceMarshaller *base_marshaller, StreamAgent *agent)
SpiceMarshaller *base_marshaller,
VideoStreamAgent *agent)
{
DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
VideoStream *stream = agent->stream;
@ -2195,7 +2196,7 @@ static void marshall_stream_clip(RedChannelClient *rcc,
RedStreamClipItem *item)
{
DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
StreamAgent *agent = item->stream_agent;
VideoStreamAgent *agent = item->stream_agent;
spice_return_if_fail(agent->stream);
@ -2210,14 +2211,15 @@ static void marshall_stream_clip(RedChannelClient *rcc,
}
static void marshall_stream_end(RedChannelClient *rcc,
SpiceMarshaller *base_marshaller, StreamAgent* agent)
SpiceMarshaller *base_marshaller,
VideoStreamAgent* agent)
{
DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
SpiceMsgDisplayStreamDestroy destroy;
red_channel_client_init_send_data(rcc, SPICE_MSG_DISPLAY_STREAM_DESTROY);
destroy.id = display_channel_get_video_stream_id(DCC_TO_DC(dcc), agent->stream);
stream_agent_stop(agent);
video_stream_agent_stop(agent);
spice_marshall_msg_display_stream_destroy(base_marshaller, &destroy);
}
@ -2308,7 +2310,7 @@ static void marshall_stream_activate_report(RedChannelClient *rcc,
uint32_t stream_id)
{
DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
StreamAgent *agent = &dcc->priv->stream_agents[stream_id];
VideoStreamAgent *agent = &dcc->priv->stream_agents[stream_id];
SpiceMsgDisplayStreamActivateReport msg;
red_channel_client_init_send_data(rcc, SPICE_MSG_DISPLAY_STREAM_ACTIVATE_REPORT);

10
server/dcc.c
View File

@ -487,7 +487,7 @@ static void dcc_init_stream_agents(DisplayChannelClient *dcc)
DisplayChannel *display = DCC_TO_DC(dcc);
for (i = 0; i < NUM_STREAMS; i++) {
StreamAgent *agent = &dcc->priv->stream_agents[i];
VideoStreamAgent *agent = &dcc->priv->stream_agents[i];
agent->stream = display_channel_get_nth_video_stream(display, i);
region_init(&agent->vis_region);
region_init(&agent->clip);
@ -601,7 +601,7 @@ static void dcc_destroy_stream_agents(DisplayChannelClient *dcc)
int i;
for (i = 0; i < NUM_STREAMS; i++) {
StreamAgent *agent = &dcc->priv->stream_agents[i];
VideoStreamAgent *agent = &dcc->priv->stream_agents[i];
region_destroy(&agent->vis_region);
region_destroy(&agent->clip);
if (agent->video_encoder) {
@ -627,7 +627,7 @@ static void dcc_stop(DisplayChannelClient *dcc)
}
}
void dcc_stream_agent_clip(DisplayChannelClient* dcc, StreamAgent *agent)
void dcc_video_stream_agent_clip(DisplayChannelClient* dcc, VideoStreamAgent *agent)
{
RedStreamClipItem *item = red_stream_clip_item_new(agent);
int n_rects;
@ -1041,7 +1041,7 @@ static bool dcc_handle_init(DisplayChannelClient *dcc, SpiceMsgcDisplayInit *ini
static bool dcc_handle_stream_report(DisplayChannelClient *dcc,
SpiceMsgcDisplayStreamReport *report)
{
StreamAgent *agent;
VideoStreamAgent *agent;
if (report->stream_id >= NUM_STREAMS) {
spice_warning("stream_report: invalid stream id %u",
@ -1383,7 +1383,7 @@ bool dcc_handle_migrate_data(DisplayChannelClient *dcc, uint32_t size, void *mes
return TRUE;
}
StreamAgent* dcc_get_stream_agent(DisplayChannelClient *dcc, int stream_id)
VideoStreamAgent* dcc_get_video_stream_agent(DisplayChannelClient *dcc, int stream_id)
{
return &dcc->priv->stream_agents[stream_id];
}

8
server/dcc.h
View File

@ -79,7 +79,7 @@ GType display_channel_client_get_type(void) G_GNUC_CONST;
typedef struct DisplayChannel DisplayChannel;
typedef struct VideoStream VideoStream;
typedef struct StreamAgent StreamAgent;
typedef struct VideoStreamAgent VideoStreamAgent;
typedef struct WaitForChannels {
SpiceMsgWaitForChannels header;
@ -146,8 +146,8 @@ bool dcc_handle_migrate_data (DisplayCha
void dcc_push_monitors_config (DisplayChannelClient *dcc);
void dcc_destroy_surface (DisplayChannelClient *dcc,
uint32_t surface_id);
void dcc_stream_agent_clip (DisplayChannelClient* dcc,
StreamAgent *agent);
void dcc_video_stream_agent_clip (DisplayChannelClient* dcc,
VideoStreamAgent *agent);
void dcc_create_stream (DisplayChannelClient *dcc,
VideoStream *stream);
void dcc_create_surface (DisplayChannelClient *dcc,
@ -189,7 +189,7 @@ int dcc_compress_image (DisplayCha
int can_lossy,
compress_send_data_t* o_comp_data);
StreamAgent * dcc_get_stream_agent (DisplayChannelClient *dcc, int stream_id);
VideoStreamAgent *dcc_get_video_stream_agent(DisplayChannelClient *dcc, int stream_id);
ImageEncoders *dcc_get_encoders(DisplayChannelClient *dcc);
spice_wan_compression_t dcc_get_jpeg_state (DisplayChannelClient *dcc);
spice_wan_compression_t dcc_get_zlib_glz_state (DisplayChannelClient *dcc);

6
server/display-channel.c
View File

@ -341,7 +341,7 @@ static void streams_update_visible_region(DisplayChannel *display, Drawable *dra
while (item) {
VideoStream *stream = SPICE_CONTAINEROF(item, VideoStream, link);
StreamAgent *agent;
VideoStreamAgent *agent;
item = ring_next(ring, item);
@ -351,12 +351,12 @@ static void streams_update_visible_region(DisplayChannel *display, Drawable *dra
FOREACH_DCC(display, dcc) {
int stream_id = display_channel_get_video_stream_id(display, stream);
agent = dcc_get_stream_agent(dcc, stream_id);
agent = dcc_get_video_stream_agent(dcc, stream_id);
if (region_intersects(&agent->vis_region, &drawable->tree_item.base.rgn)) {
region_exclude(&agent->vis_region, &drawable->tree_item.base.rgn);
region_exclude(&agent->clip, &drawable->tree_item.base.rgn);
dcc_stream_agent_clip(dcc, agent);
dcc_video_stream_agent_clip(dcc, agent);
}
}
}

55
server/video-stream.c
View File

@ -27,7 +27,7 @@
#define FOREACH_STREAMS(display, item) \
RING_FOREACH(item, &(display)->priv->streams)
static void stream_agent_stats_print(StreamAgent *agent)
static void video_stream_agent_stats_print(VideoStreamAgent *agent)
{
#ifdef STREAM_STATS
StreamStats *stats = &agent->stats;
@ -67,11 +67,12 @@ static void video_stream_create_destroy_item_release(RedPipeItem *base)
{
StreamCreateDestroyItem *item = SPICE_UPCAST(StreamCreateDestroyItem, base);
DisplayChannel *display = DCC_TO_DC(item->agent->dcc);
stream_agent_unref(display, item->agent);
video_stream_agent_unref(display, item->agent);
g_free(item);
}
static RedPipeItem *video_stream_create_destroy_item_new(StreamAgent *agent, gint type)
static RedPipeItem *video_stream_create_destroy_item_new(VideoStreamAgent *agent,
gint type)
{
StreamCreateDestroyItem *item = g_new0(StreamCreateDestroyItem, 1);
@ -82,12 +83,12 @@ static RedPipeItem *video_stream_create_destroy_item_new(StreamAgent *agent, gin
return &item->base;
}
static RedPipeItem *video_stream_create_item_new(StreamAgent *agent)
static RedPipeItem *video_stream_create_item_new(VideoStreamAgent *agent)
{
return video_stream_create_destroy_item_new(agent, RED_PIPE_ITEM_TYPE_STREAM_CREATE);
}
static RedPipeItem *video_stream_destroy_item_new(StreamAgent *agent)
static RedPipeItem *video_stream_destroy_item_new(VideoStreamAgent *agent)
{
return video_stream_create_destroy_item_new(agent, RED_PIPE_ITEM_TYPE_STREAM_DESTROY);
}
@ -103,9 +104,9 @@ void video_stream_stop(DisplayChannel *display, VideoStream *stream)
spice_debug("stream %d", stream_id);
FOREACH_DCC(display, dcc) {
StreamAgent *stream_agent;
VideoStreamAgent *stream_agent;
stream_agent = dcc_get_stream_agent(dcc, stream_id);
stream_agent = dcc_get_video_stream_agent(dcc, stream_id);
region_clear(&stream_agent->vis_region);
region_clear(&stream_agent->clip);
if (stream_agent->video_encoder) {
@ -120,7 +121,7 @@ void video_stream_stop(DisplayChannel *display, VideoStream *stream)
}
red_channel_client_pipe_add(RED_CHANNEL_CLIENT(dcc),
video_stream_destroy_item_new(stream_agent));
stream_agent_stats_print(stream_agent);
video_stream_agent_stats_print(stream_agent);
}
display->priv->streams_size_total -= stream->width * stream->height;
ring_remove(&stream->link);
@ -157,7 +158,7 @@ void video_stream_unref(DisplayChannel *display, VideoStream *stream)
display->priv->stream_count--;
}
void stream_agent_unref(DisplayChannel *display, StreamAgent *agent)
void video_stream_agent_unref(DisplayChannel *display, VideoStreamAgent *agent)
{
video_stream_unref(display, agent->stream);
}
@ -170,12 +171,12 @@ static void red_stream_clip_item_free(RedPipeItem *base)
g_return_if_fail(item->base.refcount == 0);
stream_agent_unref(display, item->stream_agent);
video_stream_agent_unref(display, item->stream_agent);
g_free(item->rects);
g_free(item);
}
RedStreamClipItem *red_stream_clip_item_new(StreamAgent *agent)
RedStreamClipItem *red_stream_clip_item_new(VideoStreamAgent *agent)
{
RedStreamClipItem *item = g_new(RedStreamClipItem, 1);
red_pipe_item_init_full(&item->base, RED_PIPE_ITEM_TYPE_STREAM_CLIP,
@ -299,10 +300,11 @@ static void attach_stream(DisplayChannel *display, Drawable *drawable, VideoStre
}
FOREACH_DCC(display, dcc) {
StreamAgent *agent;
VideoStreamAgent *agent;
QRegion clip_in_draw_dest;
int stream_id = display_channel_get_video_stream_id(display, stream);
agent = dcc_get_stream_agent(dcc, display_channel_get_video_stream_id(display, stream));
agent = dcc_get_video_stream_agent(dcc, stream_id);
region_or(&agent->vis_region, &drawable->tree_item.base.rgn);
region_init(&clip_in_draw_dest);
@ -312,7 +314,7 @@ static void attach_stream(DisplayChannel *display, Drawable *drawable, VideoStre
if (!region_is_equal(&clip_in_draw_dest, &drawable->tree_item.base.rgn)) {
region_remove(&agent->clip, &drawable->red_drawable->bbox);
region_or(&agent->clip, &drawable->tree_item.base.rgn);
dcc_stream_agent_clip(dcc, agent);
dcc_video_stream_agent_clip(dcc, agent);
}
region_destroy(&clip_in_draw_dest);
#ifdef STREAM_STATS
@ -334,7 +336,7 @@ static void before_reattach_stream(DisplayChannel *display,
{
DisplayChannelClient *dcc;
int index;
StreamAgent *agent;
VideoStreamAgent *agent;
GList *dpi_link, *dpi_next;
spice_return_if_fail(stream->current);
@ -353,7 +355,7 @@ static void before_reattach_stream(DisplayChannel *display,
RedDrawablePipeItem *dpi = dpi_link->data;
dpi_next = dpi_link->next;
dcc = dpi->dcc;
agent = dcc_get_stream_agent(dcc, index);
agent = dcc_get_video_stream_agent(dcc, index);
if (red_channel_client_pipe_item_is_linked(RED_CHANNEL_CLIENT(dcc),
&dpi->dpi_pipe_item)) {
@ -548,7 +550,8 @@ void video_stream_maintenance(DisplayChannel *display,
}
}
static void dcc_update_streams_max_latency(DisplayChannelClient *dcc, StreamAgent *remove_agent)
static void dcc_update_streams_max_latency(DisplayChannelClient *dcc,
VideoStreamAgent *remove_agent)
{
uint32_t new_max_latency = 0;
int i;
@ -562,7 +565,7 @@ static void dcc_update_streams_max_latency(DisplayChannelClient *dcc, StreamAgen
return;
}
for (i = 0; i < NUM_STREAMS; i++) {
StreamAgent *other_agent = dcc_get_stream_agent(dcc, i);
VideoStreamAgent *other_agent = dcc_get_video_stream_agent(dcc, i);
if (other_agent == remove_agent || !other_agent->video_encoder) {
continue;
}
@ -622,7 +625,7 @@ static uint64_t get_initial_bit_rate(DisplayChannelClient *dcc, VideoStream *str
static uint32_t get_roundtrip_ms(void *opaque)
{
StreamAgent *agent = opaque;
VideoStreamAgent *agent = opaque;
int roundtrip;
RedChannelClient *rcc = RED_CHANNEL_CLIENT(agent->dcc);
@ -643,14 +646,14 @@ static uint32_t get_roundtrip_ms(void *opaque)
static uint32_t get_source_fps(void *opaque)
{
StreamAgent *agent = opaque;
VideoStreamAgent *agent = opaque;
return agent->stream->input_fps;
}
static void update_client_playback_delay(void *opaque, uint32_t delay_ms)
{
StreamAgent *agent = opaque;
VideoStreamAgent *agent = opaque;
DisplayChannelClient *dcc = agent->dcc;
RedChannel *channel = red_channel_client_get_channel(RED_CHANNEL_CLIENT(dcc));
RedClient *client = red_channel_client_get_client(RED_CHANNEL_CLIENT(dcc));
@ -722,7 +725,7 @@ static VideoEncoder* dcc_create_video_encoder(DisplayChannelClient *dcc,
void dcc_create_stream(DisplayChannelClient *dcc, VideoStream *stream)
{
int stream_id = display_channel_get_video_stream_id(DCC_TO_DC(dcc), stream);
StreamAgent *agent = dcc_get_stream_agent(dcc, stream_id);
VideoStreamAgent *agent = dcc_get_video_stream_agent(dcc, stream_id);
spice_return_if_fail(region_is_empty(&agent->vis_region));
@ -760,7 +763,7 @@ void dcc_create_stream(DisplayChannelClient *dcc, VideoStream *stream)
#endif
}
void stream_agent_stop(StreamAgent *agent)
void video_stream_agent_stop(VideoStreamAgent *agent)
{
DisplayChannelClient *dcc = agent->dcc;
@ -794,11 +797,11 @@ static void dcc_detach_stream_gracefully(DisplayChannelClient *dcc,
{
DisplayChannel *display = DCC_TO_DC(dcc);
int stream_id = display_channel_get_video_stream_id(display, stream);
StreamAgent *agent = dcc_get_stream_agent(dcc, stream_id);
VideoStreamAgent *agent = dcc_get_video_stream_agent(dcc, stream_id);
/* stopping the client from playing older frames at once*/
region_clear(&agent->clip);
dcc_stream_agent_clip(dcc, agent);
dcc_video_stream_agent_clip(dcc, agent);
if (region_is_empty(&agent->vis_region)) {
spice_debug("stream %d: vis region empty", stream_id);
@ -892,7 +895,7 @@ void video_stream_detach_behind(DisplayChannel *display,
int stream_id = display_channel_get_video_stream_id(display, stream);
FOREACH_DCC(display, dcc) {
StreamAgent *agent = dcc_get_stream_agent(dcc, stream_id);
VideoStreamAgent *agent = dcc_get_video_stream_agent(dcc, stream_id);
if (region_intersects(&agent->vis_region, region)) {
dcc_detach_stream_gracefully(dcc, stream, drawable);

14
server/video-stream.h
View File

@ -63,7 +63,7 @@ typedef struct StreamStats {
} StreamStats;
#endif
typedef struct StreamAgent {
typedef struct VideoStreamAgent {
QRegion vis_region; /* the part of the surface area that is currently occupied by video
fragments */
QRegion clip; /* the current video clipping. It can be different from vis_region:
@ -84,20 +84,20 @@ typedef struct StreamAgent {
#ifdef STREAM_STATS
StreamStats stats;
#endif
} StreamAgent;
} VideoStreamAgent;
typedef struct RedStreamClipItem {
RedPipeItem base;
StreamAgent *stream_agent;
VideoStreamAgent *stream_agent;
int clip_type;
SpiceClipRects *rects;
} RedStreamClipItem;
RedStreamClipItem * red_stream_clip_item_new (StreamAgent *agent);
RedStreamClipItem *red_stream_clip_item_new(VideoStreamAgent *agent);
typedef struct StreamCreateDestroyItem {
RedPipeItem base;
StreamAgent *agent;
VideoStreamAgent *agent;
} StreamCreateDestroyItem;
typedef struct ItemTrace {
@ -139,8 +139,8 @@ void video_stream_trace_add_drawable(DisplayChannel *display, Drawable *item);
void video_stream_detach_behind(DisplayChannel *display, QRegion *region,
Drawable *drawable);
void stream_agent_unref(DisplayChannel *display, StreamAgent *agent);
void stream_agent_stop(StreamAgent *agent);
void video_stream_agent_unref(DisplayChannel *display, VideoStreamAgent *agent);
void video_stream_agent_stop(VideoStreamAgent *agent);
void video_stream_detach_drawable(VideoStream *stream);