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@xxxxxxxxxxxxxxx>
---
configure.ac | 2 +-
spice.proto | 2 ++
spice/enums.h | 2 ++
spice/protocol.h | 4 ++++
4 files changed, 9 insertions(+), 1 deletion(-)
Note:
* This increases the version to 0.12.12 so the spice server and
client can check for it. Adjust as appropriate.
diff --git a/configure.ac b/configure.ac
index e8d118d..7486d81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
m4_define([SPICE_MAJOR], 0)
m4_define([SPICE_MINOR], 12)
-m4_define([SPICE_MICRO], 11)
+m4_define([SPICE_MICRO], 12)
AC_INIT(spice-protocol, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice-protocol)
diff --git a/spice.proto b/spice.proto
index 3bca900..b03d0db 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 16885ac..e02a0c5 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 0c265ee..b63fbe5 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -136,6 +136,10 @@ enum {
SPICE_DISPLAY_CAP_STREAM_REPORT,
SPICE_DISPLAY_CAP_LZ4_COMPRESSION,
SPICE_DISPLAY_CAP_PREF_COMPRESSION,
+ SPICE_DISPLAY_CAP_MULTI_CODEC,
+ SPICE_DISPLAY_CAP_CODEC_MJPEG,
+ SPICE_DISPLAY_CAP_CODEC_VP8,
+ SPICE_DISPLAY_CAP_CODEC_H264,
};
enum {
--
2.6.2
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel