From cc234acf5401ab6085f51744cb23e2cfbb9c688d Mon Sep 17 00:00:00 2001
From: Adam Gousetis <adamgousetis@google.com>
Date: Wed, 17 Apr 2019 01:50:40 +0000
Subject: [PATCH] [media] Fix for use_media_decoder running at infinte
framerate
Change-Id: I6cad0ff500c4f89607e4ac3c32c51fb270df5d37
---
garnet/lib/media/test/frame_sink.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/garnet/lib/media/test/frame_sink.cc b/garnet/lib/media/test/frame_sink.cc
index d18577829f7..be457df0cf8 100644
--- a/garnet/lib/media/test/frame_sink.cc
+++ b/garnet/lib/media/test/frame_sink.cc
@@ -4,16 +4,15 @@
#include "lib/media/test/frame_sink.h"
-#include "lib/media/test/frame_sink_view.h"
-
#include <fuchsia/mediacodec/cpp/fidl.h>
#include <lib/async-loop/cpp/loop.h>
#include <lib/async/cpp/task.h>
#include <lib/component/cpp/startup_context.h>
#include <lib/fit/defer.h>
-#include <src/lib/fxl/logging.h>
#include <lib/media/codec_impl/fourcc.h>
+#include <lib/media/test/frame_sink_view.h>
#include <lib/zx/vmo.h>
+#include <src/lib/fxl/logging.h>
#include <memory>
@@ -81,8 +80,9 @@ void FrameSink::PutFrame(
// Tell Scenic to show the first frame around now-ish.
present_time = zx_clock_get_monotonic() + ZX_SEC(1);
} else {
- present_time =
- last_requested_present_time_ + ZX_SEC(1.0 / frames_per_second_);
+ auto delta = ZX_USEC(1000000 / frames_per_second_);
+ FXL_CHECK(delta > 0);
+ present_time = last_requested_present_time_ + delta;
}
last_requested_present_time_ = present_time;
--
GitLab