Move VADisplayWithCleanup into its own header file, in shared/.

[nageru] / nageru / mjpeg_encoder.cpp

diff --git a/nageru/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp
index 3308c3224e5fdec3d1d42c90482ab7360edc515d..857346db7592d67a79305cef7a1c643b167912bf 100644 (file)
--- a/nageru/mjpeg_encoder.cpp
+++ b/nageru/mjpeg_encoder.cpp
@@ -20,7 +20,7 @@ extern "C" {
 #include "shared/metrics.h"
 #include "pbo_frame_allocator.h"
 #include "shared/timebase.h"
-#include "va_display_with_cleanup.h"
+#include "shared/va_display.h"
 
 #include <movit/colorspace_conversion_effect.h>
 
@@ -882,9 +882,9 @@ void MJPEGEncoder::encode_jpeg_va(QueuedFrame &&qf)
 
        int y_h_samp_factor, y_v_samp_factor;
        if (is_uyvy(qf.frame)) {
-               // 4:2:2 (sample Y' twice as often vertically as Cb or Cr).
-               y_h_samp_factor = 1;
-               y_v_samp_factor = 2;
+               // 4:2:2 (sample Y' twice as often horizontally as Cb or Cr, vertical is left alone).
+               y_h_samp_factor = 2;
+               y_v_samp_factor = 1;
        } else {
                // 4:2:0 (sample Y' twice as often as Cb or Cr, in both directions)
                assert(is_i420(qf.frame));