haraldwolff
/
openauto
mirror of https://github.com/f1xpl/openauto.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use chrono to get timestamp

pull/10/merge
Michal Szwaj 2018-02-24 18:41:31 +01:00
parent 0aa318cc97
commit b7eea51c62
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/autoapp/Projection/AudioInputService.cpp
View File

@ -177,11 +177,8 @@ void AudioInputService::onAudioInputDataReady(aasdk::common::Data data)
sendPromise->then(std::bind(&AudioInputService::readAudioInput, this->shared_from_this()), sendPromise->then(std::bind(&AudioInputService::readAudioInput, this->shared_from_this()),
std::bind(&AudioInputService::onChannelError, this->shared_from_this(), std::placeholders::_1)); std::bind(&AudioInputService::onChannelError, this->shared_from_this(), std::placeholders::_1));
auto timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now().time_since_epoch());
timespec tp; channel_->sendAVMediaWithTimestampIndication(timestamp.count(), std::move(data), std::move(sendPromise));
clock_gettime(CLOCK_REALTIME, &tp);
auto timestamp = tp.tv_sec * 1000000 + tp.tv_nsec / 1000;
channel_->sendAVMediaWithTimestampIndication(timestamp, std::move(data), std::move(sendPromise));
} }
void AudioInputService::readAudioInput() void AudioInputService::readAudioInput()

16
src/autoapp/Projection/InputService.cpp
View File

@ -137,13 +137,11 @@ void InputService::onChannelError(const aasdk::error::Error& e)
void InputService::onButtonEvent(const ButtonEvent& event) void InputService::onButtonEvent(const ButtonEvent& event)
{ {
timespec tp; auto timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now().time_since_epoch());
clock_gettime(CLOCK_REALTIME, &tp);
auto timestamp = tp.tv_sec * 1000000 + tp.tv_nsec / 1000;
strand_.dispatch([this, self = this->shared_from_this(), event = std::move(event), timestamp]() { strand_.dispatch([this, self = this->shared_from_this(), event = std::move(event), timestamp = std::move(timestamp)]() {
aasdk::proto::messages::InputEventIndication inputEventIndication; aasdk::proto::messages::InputEventIndication inputEventIndication;
inputEventIndication.set_timestamp(timestamp); inputEventIndication.set_timestamp(timestamp.count());
if(event.code == aasdk::proto::enums::ButtonCode::SCROLL_WHEEL) if(event.code == aasdk::proto::enums::ButtonCode::SCROLL_WHEEL)
{ {
@ -168,13 +166,11 @@ void InputService::onButtonEvent(const ButtonEvent& event)
void InputService::onTouchEvent(const TouchEvent& event) void InputService::onTouchEvent(const TouchEvent& event)
{ {
timespec tp; auto timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now().time_since_epoch());
clock_gettime(CLOCK_REALTIME, &tp);
auto timestamp = tp.tv_sec * 1000000 + tp.tv_nsec / 1000;
strand_.dispatch([this, self = this->shared_from_this(), event = std::move(event), timestamp]() { strand_.dispatch([this, self = this->shared_from_this(), event = std::move(event), timestamp = std::move(timestamp)]() {
aasdk::proto::messages::InputEventIndication inputEventIndication; aasdk::proto::messages::InputEventIndication inputEventIndication;
inputEventIndication.set_timestamp(timestamp); inputEventIndication.set_timestamp(timestamp.count());
auto touchEvent = inputEventIndication.mutable_touch_event(); auto touchEvent = inputEventIndication.mutable_touch_event();
touchEvent->set_touch_action(event.type); touchEvent->set_touch_action(event.type);