Loosen up some restrictions on YCbCrInput if we have interleaved mode.

[movit] / ycbcr_input.h

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 31ba42bcbbacb9daa9e3fd1cadd9a80b6dee4a19..712035ce3444927faac0e7d7209e7ebe9e3db389 100644 (file)
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -9,12 +9,14 @@
 //   * 8-bit semiplanar Y'CbCr (Y' in one plane, CbCr in another),
 //     possibly subsampled.
 //   * 8-bit interleaved (chunked) Y'CbCr, no subsampling (4:4:4 only).
+//   * All of the above in 10- and 12-bit versions, where each sample is
+//     stored in a 16-bit int (so the 6 or 4 top bits are wasted).
 //   * 10-bit interleaved (chunked) Y'CbCr packed into 32-bit words
 //     (10:10:10:2), no subsampling (4:4:4 only).
 //
-// For the former case, it upsamples planes as needed, using the default linear
-// upsampling OpenGL gives you. Note that YCbCr422InterleavedInput supports the
-// important special case of 8-bit 4:2:2 interleaved.
+// For the planar and semiplanar cases, it upsamples planes as needed, using
+// the default linear upsampling OpenGL gives you. Note that YCbCr422InterleavedInput
+// supports the important special case of 8-bit 4:2:2 interleaved.
 
 #include <epoxy/gl.h>
 #include <assert.h>
@@ -49,7 +51,8 @@ enum YCbCrInputSplitting {
 
 class YCbCrInput : public Input {
 public:
-       // Type can be GL_UNSIGNED_BYTE for 8-bit, or GL_UNSIGNED_INT_2_10_10_10_REV
+       // Type can be GL_UNSIGNED_BYTE for 8-bit, GL_UNSIGNED_SHORT for 10- or 12-bit
+       // (or 8-bit, although that's a bit useless), or GL_UNSIGNED_INT_2_10_10_10_REV
        // for 10-bit (YCBCR_INPUT_INTERLEAVED only).
        YCbCrInput(const ImageFormat &image_format,
                   const YCbCrFormat &ycbcr_format,
@@ -72,7 +75,8 @@ public:
        unsigned get_height() const { return height; }
        Colorspace get_color_space() const { return image_format.color_space; }
        GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
-       virtual bool can_supply_mipmaps() const { return false; }
+       virtual bool can_supply_mipmaps() const { return ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED; }
+       virtual bool is_single_texture() const { return ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED; }
 
        // Tells the input where to fetch the actual pixel data. Note that if you change
        // this data, you must either call set_pixel_data() again (using the same pointer
@@ -93,6 +97,15 @@ public:
                invalidate_pixel_data();
        }
 
+       void set_pixel_data(unsigned channel, const uint16_t *pixel_data, GLuint pbo = 0)
+       {
+               assert(type == GL_UNSIGNED_SHORT);
+               assert(channel >= 0 && channel < num_channels);
+               this->pixel_data[channel] = reinterpret_cast<const unsigned char *>(pixel_data);
+               this->pbos[channel] = pbo;
+               invalidate_pixel_data();
+       }
+
        void set_pixel_data(unsigned channel, const uint32_t *pixel_data, GLuint pbo = 0)
        {
                assert(type == GL_UNSIGNED_INT_2_10_10_10_REV);