summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Gouget <fgouget@codeweavers.com>2016-03-01 16:50:16 +0100
committerFrediano Ziglio <fziglio@redhat.com>2016-03-03 17:04:44 +0000
commit7937915d67702a5c4b5147b277c432f5555e3852 (patch)
tree040b91c36c473620180eea3df902de533aa7e274
parent0721716bb8c29f7d9abf1942182ad072fa0cc248 (diff)
downloadspice-protocol-7937915d67702a5c4b5147b277c432f5555e3852.tar.gz
spice-protocol-7937915d67702a5c4b5147b277c432f5555e3852.tar.xz
spice-protocol-7937915d67702a5c4b5147b277c432f5555e3852.zip
protocol: Add support for the VP8 and h264 video codecs
Clients that support multiple codecs must advertise the SPICE_DISPLAY_CAP_MULTI_CODEC capability and one SPICE_DISPLAY_CAP_CODEC_XXX per supported codec. Signed-off-by: Francois Gouget <fgouget@codeweavers.com> Acked-by: Christophe Fergeau <cfergeau@redhat.com>
-rw-r--r--spice.proto2
-rw-r--r--spice/enums.h2
-rw-r--r--spice/protocol.h4
3 files changed, 8 insertions, 0 deletions
diff --git a/spice.proto b/spice.proto
index af970f2..4a0778d 100644
--- a/spice.proto
+++ b/spice.proto
@@ -329,6 +329,8 @@ flags8 path_flags { /* TODO: C enum names changes */
enum8 video_codec_type {
MJPEG = 1,
+ VP8,
+ H264,
};
flags8 stream_flags {
diff --git a/spice/enums.h b/spice/enums.h
index 613db52..c6e9840 100644
--- a/spice/enums.h
+++ b/spice/enums.h
@@ -139,6 +139,8 @@ typedef enum SpicePathFlags {
typedef enum SpiceVideoCodecType {
SPICE_VIDEO_CODEC_TYPE_MJPEG = 1,
+ SPICE_VIDEO_CODEC_TYPE_VP8,
+ SPICE_VIDEO_CODEC_TYPE_H264,
SPICE_VIDEO_CODEC_TYPE_ENUM_END
} SpiceVideoCodecType;
diff --git a/spice/protocol.h b/spice/protocol.h
index 3e6c624..f4a2259 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -137,6 +137,10 @@ enum {
SPICE_DISPLAY_CAP_LZ4_COMPRESSION,
SPICE_DISPLAY_CAP_PREF_COMPRESSION,
SPICE_DISPLAY_CAP_GL_SCANOUT,
+ SPICE_DISPLAY_CAP_MULTI_CODEC,
+ SPICE_DISPLAY_CAP_CODEC_MJPEG,
+ SPICE_DISPLAY_CAP_CODEC_VP8,
+ SPICE_DISPLAY_CAP_CODEC_H264,
};
enum {