Fix YCbCrInput after the ResourcePool texture changes.

[movit] / ycbcr_input.h

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 2220f5d1ebd9392730f98439cbe3d98a7e6d8c30..eb8d0ec335db4b90bb8b138f45b3c67ddb31fbde 100644 (file)
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -1,5 +1,5 @@
-#ifndef _YCBCR_INPUT_H
-#define _YCBCR_INPUT_H 1
+#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.
@@ -10,9 +10,12 @@
 #include <string>
 
 #include "effect.h"
+#include "effect_chain.h"
 #include "image_format.h"
 #include "input.h"
 
+class ResourcePool;
+
 struct YCbCrFormat {
        // Which formula for Y' to use.
        YCbCrLumaCoefficients luma_coefficients;
@@ -63,10 +66,17 @@ public:
        // this data, you must either call set_pixel_data() again (using the same pointer
        // is fine), or invalidate_pixel_data(). Otherwise, the texture won't be re-uploaded
        // on subsequent frames.
-       void set_pixel_data(unsigned channel, const unsigned char *pixel_data)
+       //
+       // The data can either be a regular pointer (if pbo==0), or a byte offset
+       // into a PBO. The latter will allow you to start uploading the texture data
+       // asynchronously to the GPU, if you have any CPU-intensive work between the
+       // call to set_pixel_data() and the actual rendering. In either case,
+       // the pointer (and PBO, if set) has to be valid at the time of the render call.
+       void set_pixel_data(unsigned channel, const unsigned char *pixel_data, GLuint pbo = 0)
        {
                assert(channel >= 0 && channel < 3);
                this->pixel_data[channel] = pixel_data;
+               this->pbos[channel] = pbo;
                invalidate_pixel_data();
        }
 
@@ -77,23 +87,26 @@ public:
 
        void set_pitch(unsigned channel, unsigned pitch) {
                assert(channel >= 0 && channel < 3);
-               if (this->pitch[channel] != pitch) {
-                       this->pitch[channel] = pitch;
-                       needs_pbo_recreate = true;
-               }
+               this->pitch[channel] = pitch;
+       }
+
+       virtual void inform_added(EffectChain *chain)
+       {
+               resource_pool = chain->get_resource_pool();
        }
 
 private:
        ImageFormat image_format;
        YCbCrFormat ycbcr_format;
        GLuint pbos[3], texture_num[3];
-       bool needs_update, needs_pbo_recreate, finalized;
+       bool needs_update, finalized;
 
        int needs_mipmaps;
 
        unsigned width, height, widths[3], heights[3];
        const unsigned char *pixel_data[3];
        unsigned pitch[3];
+       ResourcePool *resource_pool;
 };
 
-#endif // !defined(_YCBCR_INPUT_H)
+#endif // !defined(_MOVIT_YCBCR_INPUT_H)