Support interleaved (chunky) 4:4:4 in YCbCrInput.

[movit] / ycbcr_input.h

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 282b55aaac2d1fe19dd3ef7bae9649e04ab1a54a..22208e006209de2430ab5a8ae0b4874ac74a7085 100644 (file)
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -1,9 +1,10 @@
 #ifndef _MOVIT_YCBCR_INPUT_H
 #define _MOVIT_YCBCR_INPUT_H 1
 
-// YCbCrInput is for handling planar 8-bit Y'CbCr (also sometimes, usually rather
-// imprecisely, called “YUV”), which is typically what you get from a video decoder.
-// It upsamples planes as needed, using the default linear upsampling OpenGL gives you.
+// YCbCrInput is for handling planar or 4:4:4 interleaved 8-bit Y'CbCr
+// (also sometimes, usually rather imprecisely, called “YUV”), which is typically
+// what you get from a video decoder. It upsamples planes as needed, using the
+// default linear upsampling OpenGL gives you.
 
 #include <epoxy/gl.h>
 #include <assert.h>
@@ -19,10 +20,8 @@ namespace movit {
 
 class ResourcePool;
 
-// Whether the data is fully planar (Y', Cb and Cr in one texture each)
-// or not. Note that this input does currently not support fully interleaved
-// data (Y', Cb and Cr next to each other), as 4:4:4 interleaved Y'CbCr seems
-// to be rare; however, YCbCr422InterleavedInput supports the important special
+// Whether the data is planar (Y', Cb and Cr in one texture each)
+// or not. Note that YCbCr422InterleavedInput supports the important special
 // case of 4:2:2 interleaved.
 enum YCbCrInputSplitting {
        // The standard, default case; Y', Cb and Cr in one texture each.
@@ -33,6 +32,11 @@ enum YCbCrInputSplitting {
        // If you specify this mode, the “Cr” pointer texture will be unused
        // (the ”Cb” texture contains both).
        YCBCR_INPUT_SPLIT_Y_AND_CBCR,
+
+       // Y', Cb and Cr interleaved in the same texture (the “Y” texture;
+       // “Cb” and “Cr” are unused). This means you cannot have any subsampling;
+       // 4:4:4 only.
+       YCBCR_INPUT_INTERLEAVED,
 };
 
 class YCbCrInput : public Input {
@@ -79,12 +83,50 @@ public:
 
        void invalidate_pixel_data();
 
-       void set_pitch(unsigned channel, unsigned pitch) {
+       // Note: Sets pitch to width, so even if your pitch is unchanged,
+       // you will need to re-set it after this call.
+       void set_width(unsigned width)
+       {
+               assert(width != 0);
+               this->width = width;
+
+               assert(width % ycbcr_format.chroma_subsampling_x == 0);
+               pitch[0] = widths[0] = width;
+               pitch[1] = widths[1] = width / ycbcr_format.chroma_subsampling_x;
+               pitch[2] = widths[2] = width / ycbcr_format.chroma_subsampling_x;
+               invalidate_pixel_data();
+       }
+
+       void set_height(unsigned height)
+       {
+               assert(height != 0);
+               this->height = height;
+
+               assert(height % ycbcr_format.chroma_subsampling_y == 0);
+               heights[0] = height;
+               heights[1] = height / ycbcr_format.chroma_subsampling_y;
+               heights[2] = height / ycbcr_format.chroma_subsampling_y;
+               invalidate_pixel_data();
+       }
+
+       void set_pitch(unsigned channel, unsigned pitch)
+       {
+               assert(pitch != 0);
                assert(channel >= 0 && channel < num_channels);
                this->pitch[channel] = pitch;
                invalidate_pixel_data();
        }
 
+       // Tells the input to use the specific OpenGL texture as pixel data for the given
+       // channel. The comments on FlatInput::set_texture_num() also apply here, except
+       // that this input generally does not use mipmaps.
+       void set_texture_num(unsigned channel, GLuint texture_num)
+       {
+               possibly_release_texture(channel);
+               this->texture_num[channel] = texture_num;
+               this->owns_texture[channel] = false;
+       }
+
        virtual void inform_added(EffectChain *chain)
        {
                resource_pool = chain->get_resource_pool();
@@ -93,6 +135,9 @@ public:
        bool set_int(const std::string& key, int value);
 
 private:
+       // Release the texture in the given channel if we have any, and it is owned by us.
+       void possibly_release_texture(unsigned channel);
+
        ImageFormat image_format;
        YCbCrFormat ycbcr_format;
        GLuint num_channels;
@@ -103,6 +148,7 @@ private:
        unsigned width, height, widths[3], heights[3];
        const unsigned char *pixel_data[3];
        unsigned pitch[3];
+       bool owns_texture[3];
        ResourcePool *resource_pool;
 };