Revert of Revert of Cast: Log playout delay from receiver (https://codereview.chromium.org/401273002/)

Reason for revert:
This revert wouldn't solve the flakiness. The fix for flakiness is in CQ now. Reverting this.


Original issue's description:
> Revert of Cast: Log playout delay from receiver (https://codereview.chromium.org/401213002/)
> 
> Reason for revert:
> This patch seems to break CastStreamingApiTestWithPixelOutput.EndToEnd.
> 
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29/builds/32598/steps/browser_tests/logs/EndToEnd
> 
> Original issue's description:
> > Cast: Log playout delay from receiver
> > 
> > The last refactoring in RTCP handling dropped the playout delay from
> > receiver. This change adds it back.
> > 
> > TBR=miu
> > BUG=393042
> > 
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=284395
> 
> TBR=miu@chromium.org,hclam@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=393042
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=284411

TBR=miu@chromium.org,dgozman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=393042

Review URL: https://codereview.chromium.org/410443002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284462 0039d316-1c4b-4281-b951-d872f2087c98

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);
+    }
   }
 }