summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/renderer/media/cast_session_delegate.cc21
-rw-r--r--media/cast/test/simulator.cc21
2 files changed, 32 insertions, 10 deletions
diff --git a/chrome/renderer/media/cast_session_delegate.cc b/chrome/renderer/media/cast_session_delegate.cc
index 2e42c7b..f1dfa83 100644
--- a/chrome/renderer/media/cast_session_delegate.cc
+++ b/chrome/renderer/media/cast_session_delegate.cc
@@ -238,10 +238,21 @@ void CastSessionDelegate::LogRawEvents(
frame_events.begin();
it != frame_events.end();
++it) {
- cast_environment_->Logging()->InsertFrameEvent(it->timestamp,
- it->type,
- it->media_type,
- it->rtp_timestamp,
- it->frame_id);
+ if (it->type == media::cast::FRAME_PLAYOUT) {
+ cast_environment_->Logging()->InsertFrameEventWithDelay(
+ it->timestamp,
+ it->type,
+ it->media_type,
+ it->rtp_timestamp,
+ it->frame_id,
+ it->delay_delta);
+ } else {
+ cast_environment_->Logging()->InsertFrameEvent(
+ it->timestamp,
+ it->type,
+ it->media_type,
+ it->rtp_timestamp,
+ it->frame_id);
+ }
}
}
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc
index 27812c3..135d44b 100644
--- a/media/cast/test/simulator.cc
+++ b/media/cast/test/simulator.cc
@@ -104,11 +104,22 @@ void LogTransportEvents(const scoped_refptr<CastEnvironment>& env,
frame_events.begin();
it != frame_events.end();
++it) {
- env->Logging()->InsertFrameEvent(it->timestamp,
- it->type,
- it->media_type,
- it->rtp_timestamp,
- it->frame_id);
+ if (it->type == FRAME_PLAYOUT) {
+ env->Logging()->InsertFrameEventWithDelay(
+ it->timestamp,
+ it->type,
+ it->media_type,
+ it->rtp_timestamp,
+ it->frame_id,
+ it->delay_delta);
+ } else {
+ env->Logging()->InsertFrameEvent(
+ it->timestamp,
+ it->type,
+ it->media_type,
+ it->rtp_timestamp,
+ it->frame_id);
+ }
}
}