Merge pull request #63 from OpenHD/codex/add-nv21-support-to-fpvue

Add NV21 support for raw input and Allwinner OMX

Author: raphaelscholle

allwinnerv4l2display.cpp

@@ -175,7 +175,7 @@ bool AllwinnerV4L2Display::setup_drm() {
                       m_display_width,
                       m_display_height,
                       m_display_vrefresh,
-                      DRM_FORMAT_NV12,
+                      DRM_FORMAT_NV21,
                       MODESET_PLANE_TYPE_PRIMARY) < 0) {
     std::cerr << "modeset_prepare failed" << std::endl;
     return false;
@@ -240,7 +240,7 @@ bool AllwinnerV4L2Display::ensure_display_buffers(uint32_t width, uint32_t heigh
   recycle_display_buffers();
 
   debug_log("cedar", "Allocating ", kDisplayBufferCount,
-            " DRM NV12 buffers for ", width, "x", height);
+            " DRM NV21 buffers for ", width, "x", height);
 
   m_drm_buffers.resize(kDisplayBufferCount);
   uint32_t stride = width;
@@ -272,7 +272,7 @@ bool AllwinnerV4L2Display::ensure_display_buffers(uint32_t width, uint32_t heigh
     if (drmModeAddFB2(m_drm_fd,
                       width,
                       height,
-                      DRM_FORMAT_NV12,
+                      DRM_FORMAT_NV21,
                       handles,
                       pitches,
                       offsets,
@@ -575,7 +575,7 @@ void AllwinnerV4L2Display::teardown_omx() {
   m_decoder_state = OMX_StateLoaded;
 }
 
-static void copy_planar_to_nv12(uint8_t* dst,
+static void copy_planar_to_nv21(uint8_t* dst,
                                 uint32_t dst_stride,
                                 uint32_t dst_uv_stride,
                                 const uint8_t* src,
@@ -595,8 +595,8 @@ static void copy_planar_to_nv12(uint8_t* dst,
     const uint8_t* u_row = src_u + row * (width / 2);
     const uint8_t* v_row = src_v + row * (width / 2);
     for (uint32_t col = 0; col < width / 2; ++col) {
-      dst_row[2 * col] = u_row[col];
-      dst_row[2 * col + 1] = v_row[col];
+      dst_row[2 * col] = v_row[col];
+      dst_row[2 * col + 1] = u_row[col];
     }
   }
 }
@@ -725,7 +725,7 @@ void AllwinnerV4L2Display::decode_loop() {
     } else if (output_buffer->nFilledLen > 0) {
       auto& drm_buf = m_drm_buffers[m_drm_buffer_index];
       uint8_t* dst = static_cast<uint8_t*>(drm_buf.map);
-      copy_planar_to_nv12(dst,
+      copy_planar_to_nv21(dst,
                           m_display_stride,
                           m_display_stride,
                           output_buffer->pBuffer + output_buffer->nOffset,

display_host_main.cpp

@@ -442,13 +442,13 @@ static std::string build_sample_video_pipeline_command(const char *debug_sample_
                      << "    gst-launch-1.0 -q filesrc location=" << debug_sample_path
                      << " ! qtdemux name=demux demux.video_0 ! h264parse config-interval=1"
                      << " ! video/x-h264,stream-format=byte-stream,alignment=au ! queue ! \"$decoder\""
-                     << " ! videoconvert ! video/x-raw,format=NV12,width=1280,height=720 ! queue ! fdsink fd=1 sync=false;\n"
+                     << " ! videoconvert ! video/x-raw,format=NV21,width=1280,height=720 ! queue ! fdsink fd=1 sync=false;\n"
                      << "}\n"
                      << "(run_decoder omxh264dec || run_decoder mppvideodec || run_decoder avdec_h264)";
 
     std::string pipeline_command = "(";
     pipeline_command += pipeline_builder.str();
-    pipeline_command += ") | fpvue --screen-mode 1280x720@60 --stdin-nv12";
+    pipeline_command += ") | fpvue --screen-mode 1280x720@60 --stdin-nv21";
     return pipeline_command;
 }