Allow dynamic frame sizes for FFmpeg inputs.

[nageru] / nageru / pbo_frame_allocator.cpp

diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
index 5910a0237fb6ce725072336666591a3c76f7799d..a649232edb91ff935f0f62cc737243bdbef374a4 100644 (file)
--- a/nageru/pbo_frame_allocator.cpp
+++ b/nageru/pbo_frame_allocator.cpp
@@ -13,6 +13,7 @@
 #include <va/va.h>
 
 #include "mjpeg_encoder.h"
+#include "defs.h"
 #include "shared/va_resource_pool.h"
 #include "v210_converter.h"
 #include "shared/va_display.h"
@@ -310,6 +311,11 @@ bmusb::FrameAllocator::Frame PBOFrameAllocator::create_frame(size_t width, size_
 {
         Frame vf;
 
+       size_t desired_frame_bytes = width * stride;
+       if (stride > 8192 * 4 || height > 8192 || desired_frame_bytes > MAX_FRAME_SIZE) {
+               return vf;
+       }
+
        {
                lock_guard<mutex> lock(freelist_mutex);
                if (freelist.empty()) {
@@ -322,10 +328,22 @@ bmusb::FrameAllocator::Frame PBOFrameAllocator::create_frame(size_t width, size_
                        freelist.pop();
                }
        }
-       vf.len = 0;
-       vf.overflow = 0;
 
        Userdata *userdata = (Userdata *)vf.userdata;
+       assert(generation == userdata->generation);
+       if (vf.size < desired_frame_bytes || (vf.size > FRAME_SIZE && vf.size > desired_frame_bytes * 2)) {
+               // Frame is either too small or way too large, so reallocate it.
+               // Note that width and height now automatically becomes the right size
+               // (the one we just asked for, instead of the default for the allocator,
+               // which is generally the global resolution); it doesn't matter
+               // for correctness, since we'll recreate the texture on upload if needed,
+               // but it is nice to save that step.
+               destroy_frame(&vf);
+               init_frame(vf, userdata, this, pixel_format, std::max<size_t>(desired_frame_bytes, FRAME_SIZE), width, height, permissions, map_bits, buffer, generation);
+       };
+
+       vf.len = 0;
+       vf.overflow = 0;
 
        if (mjpeg_encoder != nullptr &&
            mjpeg_encoder->should_encode_mjpeg_for_card(card_index)) {