Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(576)

Unified Diff: webrtc/video/video_quality_test.cc

Issue 1534233002: Incorrect timestamps used by video analyzer with real camera Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/video/video_capture_input.cc ('K') | « webrtc/video/video_capture_input.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_quality_test.cc
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index a94cb4642fb1a199aa5abf74fc117350ea0ac9b6..9893e16ca0d25071e307f00a7c7ced3ce77bd783 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -27,11 +27,13 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "webrtc/system_wrappers/include/cpu_info.h"
+#include "webrtc/system_wrappers/include/tick_util.h"
#include "webrtc/test/layer_filtering_transport.h"
#include "webrtc/test/run_loop.h"
#include "webrtc/test/statistics.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/video_renderer.h"
+#include "webrtc/video/video_capture_input.h"
#include "webrtc/video/video_quality_test.h"
namespace webrtc {
@@ -133,8 +135,8 @@ class VideoAnalyzer : public PacketReceiver,
}
void IncomingCapturedFrame(const VideoFrame& video_frame) override {
- VideoFrame copy = video_frame;
- copy.set_timestamp(copy.ntp_time_ms() * 90);
+ VideoFrame copy = static_cast<internal::VideoCaptureInput*>(input_)
+ ->UpdateTimestamps(video_frame);
{
rtc::CritScope lock(&crit_);
@@ -144,7 +146,7 @@ class VideoAnalyzer : public PacketReceiver,
frames_.push_back(copy);
}
- input_->IncomingCapturedFrame(video_frame);
+ input_->IncomingCapturedFrame(copy);
}
bool SendRtp(const uint8_t* packet,
« webrtc/video/video_capture_input.cc ('K') | « webrtc/video/video_capture_input.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698