validate input data

git-svn-id: https://xpra.org/svn/Xpra/trunk@13912 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/codecs/codec_checks.py

@@ -208,7 +208,7 @@ def do_testencoding(encoder_module, encoding, W, H, full=False, limit_w=TEST_LIM
                 #print("compressed data with %s: %s bytes (%s), metadata: %s" % (encoder_module.get_type(), len(data), type(data), meta))
                 #print("compressed data(%s, %s)=%s" % (encoding, cs_in, binascii.hexlify(data)))
                 if full:
-                    wrong_formats = [x for x in ("YUV420P", "YUV444P", "BGRX") if x!=cs_in]
+                    wrong_formats = [x for x in ("YUV420P", "YUV444P", "BGRX", "r210") if x!=cs_in]
                     #log("wrong formats (not %s): %s", cs_in, wrong_formats)
                     if wrong_formats:
                         wrong_format = wrong_formats[0]

src/xpra/codecs/enc_ffmpeg/encoder.pyx

@@ -649,6 +649,9 @@ cdef class Encoder(object):
         assert self.codec!=NULL
 
         if image:
+            assert image.get_pixel_format()==self.src_format, "invalid input format %s, expected %s" % (image.get_pixel_format, self.src_format)
+            assert image.get_width()==self.width and image.get_height()==self.height
+
             pixels = image.get_pixels()
             istrides = image.get_rowstride()
             assert len(pixels)==3, "image pixels does not have 3 planes! (found %s)" % len(pixels)

src/xpra/codecs/vpx/encoder.pyx

@@ -580,6 +580,8 @@ cdef class Encoder:
         assert self.context!=NULL
         pixels = image.get_pixels()
         istrides = image.get_rowstride()
+        assert image.get_pixel_format()==self.src_format, "invalid input format %s, expected %s" % (image.get_pixel_format, self.src_format)
+        assert image.get_width()==self.width and image.get_height()==self.height
         assert pixels, "failed to get pixels from %s" % image
         assert len(pixels)==3, "image pixels does not have 3 planes! (found %s)" % len(pixels)
         assert len(istrides)==3, "image strides does not have 3 values! (found %s)" % len(istrides)