got vds compiling
Change-Id: I0618c12e8994cc7dc3ba52cf7be928b8b387bab9
diff --git a/system/ulib/video-utils/include/video-utils/video_device_stream.h b/system/ulib/video-utils/include/video-utils/video_device_stream.h
index 2a35a78..52d3396 100644
--- a/system/ulib/video-utils/include/video-utils/video_device_stream.h
+++ b/system/ulib/video-utils/include/video-utils/video_device_stream.h
@@ -31,6 +31,8 @@
protected:
// friend class fbl::unique_ptr<AudioDeviceStream>;
+ async_wait_result_t OnNewMessageSignalled(async_t* async, zx_status_t status,
+ const zx_packet_signal* signal);
// static bool IsChannelConnected(const zx::channel& ch);
@@ -38,8 +40,8 @@
// A value of zero means that the video buffer channel is uninitialized.
uint32_t max_frame_size_ = 0;
- VideoDeviceStream(bool input, uint32_t dev_id);
- VideoDeviceStream(bool input, const char* dev_path);
+ VideoDeviceStream(async_t *async, bool input, uint32_t dev_id);
+ VideoDeviceStream(async_t *async, bool input, const char* dev_path);
virtual ~VideoDeviceStream();
zx::channel stream_ch_;
diff --git a/system/ulib/video-utils/video_device_stream.cpp b/system/ulib/video-utils/video_device_stream.cpp
index a558964..731f341 100644
--- a/system/ulib/video-utils/video_device_stream.cpp
+++ b/system/ulib/video-utils/video_device_stream.cpp
@@ -91,13 +91,13 @@
return DoCallImpl(channel, req, resp, resp_handle_out);
}
-VideoDeviceStream::VideoDeviceStream(bool input, uint32_t dev_id)
- : new_frame_waiter_(fsl::MessageLoop::GetCurrent()->async()), input_(input) {
+VideoDeviceStream::VideoDeviceStream(async_t *async, bool input, uint32_t dev_id)
+ : new_frame_waiter_(async), input_(input) {
snprintf(name_, sizeof(name_), "/dev/class/camera/%03u", dev_id);
}
-VideoDeviceStream::VideoDeviceStream(bool input, const char* dev_path)
- : new_frame_waiter_(fsl::MessageLoop::GetCurrent()->async()), input_(input) {
+VideoDeviceStream::VideoDeviceStream(async_t *async, bool input, const char* dev_path)
+ : new_frame_waiter_(async), input_(input) {
strncpy(name_, dev_path, sizeof(name_));
name_[sizeof(name_) - 1] = 0;
}
@@ -286,10 +286,8 @@
printf("Unexpected response size (got %u, expected %zu)\n", bytes, sizeof(camera_vb_cmd_set_buffer_resp_t));
return ZX_ERR_INTERNAL;
}
- // zx_status_t result = dynamic_cast<camera_vb_cmd_set_buffer_resp_t*>(&resp)->result;
if (ZX_OK != resp.result) {
printf("SetBuffer failure (result: %d)\n", resp.result);
-
}
new_frame_waiter_.set_object(vb_ch_.get());
new_frame_waiter_.set_trigger(ZX_CHANNEL_READABLE);
