From 15f6d17399eda98ac4e8481f244354177c5ca1b7 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Wed, 24 Aug 2016 14:35:46 -0400
Subject: [PATCH] media: fix wrong framerate emulation timing
A regression introduced by commit 88405c002c causes
framerate emulation not using the correct timing.
milliseconds was wrongly used in place of microseconds.
This patch changes this fact.
Change-Id: I29453582ce4f0a8f34838caea4a2ee9be5592dbe
Tuleap: #914
---
src/media/media_decoder.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/media/media_decoder.cpp b/src/media/media_decoder.cpp
index 29ae832c6f..952b184b06 100644
--- a/src/media/media_decoder.cpp
+++ b/src/media/media_decoder.cpp
@@ -327,7 +327,7 @@ MediaDecoder::decode(VideoFrame& result)
auto target = startTime_ + static_cast<std::int64_t>(frame_time.real() * 1e6);
auto now = av_gettime();
if (target > now) {
- std::this_thread::sleep_for(std::chrono::milliseconds(target - now));
+ std::this_thread::sleep_for(std::chrono::microseconds(target - now));
}
}
return Status::FrameFinished;
@@ -378,7 +378,7 @@ MediaDecoder::decode(const AudioFrame& decodedFrame)
auto target = startTime_ + static_cast<std::int64_t>(frame_time.real() * 1e6);
auto now = av_gettime();
if (target > now) {
- std::this_thread::sleep_for(std::chrono::milliseconds(target - now));
+ std::this_thread::sleep_for(std::chrono::microseconds(target - now));
}
}
return Status::FrameFinished;
--
GitLab