commit 811f2a676055220d1d1a65f4a6f671506eb12834
author Garratt Gallagher <garratt@google.com> Wed Feb 07 17:06:03 2018 -0800
committer Garratt Gallagher <garratt@google.com> Wed Feb 07 17:06:03 2018 -0800
tree b011a5c63869f936d606fbf1e15b53fac18160b2
parent 521a52fdec225d681ba1dd335aaa776a09fc2c15

rewrite compiling

Change-Id: I743b2f506973c6d3cedda07a064a0e6799faff90

system/ulib/video-utils/video_device_stream.cpp

diff --git a/system/ulib/video-utils/video_device_stream.cpp b/system/ulib/video-utils/video_device_stream.cpp
index 731f341..ea22e35 100644
--- a/system/ulib/video-utils/video_device_stream.cpp
+++ b/system/ulib/video-utils/video_device_stream.cpp
@@ -293,7 +293,10 @@
     new_frame_waiter_.set_trigger(ZX_CHANNEL_READABLE);
     new_frame_waiter_.set_handler(fbl::BindMember(this, &VideoDeviceStream::OnNewMessageSignalled));
     auto status = new_frame_waiter_.Begin();
-    FXL_DCHECK(status == ZX_OK);
+    if (status != ZX_OK) {
+        printf("Failed to start AutoWaiter\n");
+        return status;
+    }
 
     return ZX_OK;
 }
@@ -337,8 +340,7 @@
 async_wait_result_t VideoDeviceStream::OnNewMessageSignalled(async_t* async, zx_status_t status,
                             const zx_packet_signal* signal) {
     if (status != ZX_OK) {
-      FXL_LOG(ERROR) << "VideoDeviceStream received an error ("
-                     << zx_status_get_string(status) << ").  Exiting.";
+      printf("Error: VideoDeviceStream received an error.  Exiting.");
       return ASYNC_WAIT_FINISHED;
     }
     // todo: does the signal reset itself?
@@ -347,11 +349,11 @@
     camera_vb_frame_notify_t resp; 
     zx_status_t res = stream_ch_.read(0u, &resp, sizeof(resp), &rxed, nullptr, 0, nullptr);
     if (res != ZX_OK) {
-       FXL_LOG(ERROR) << "Failed to read notify";
+       printf("Error: Failed to read notify");
        return ASYNC_WAIT_AGAIN;
     }
-    if (resp.hdr != CAMERA_VB_FRAME_NOTIFY) {
-        FXL_LOG(ERROR) << "Wrong message on the channel";
+    if (resp.hdr.cmd != CAMERA_VB_FRAME_NOTIFY) {
+        printf("Error: Wrong message on the channel");
         return ASYNC_WAIT_AGAIN;
     }
     OnNewFrame(resp);