summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-21 11:31:28 +0000
committerdgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-21 11:31:28 +0000
commitea273f3dfa915baadb92ac22e93d4362e467f073 (patch)
treeb9abad21240c64c2f60bcedf45d18058acf95589 /media
parentb4f8a3898db8eccab83a0c03e4372eef94f81eeb (diff)
downloadchromium_src-ea273f3dfa915baadb92ac22e93d4362e467f073.zip
chromium_src-ea273f3dfa915baadb92ac22e93d4362e467f073.tar.gz
chromium_src-ea273f3dfa915baadb92ac22e93d4362e467f073.tar.bz2
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 Review URL: https://codereview.chromium.org/401273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/cast/test/simulator.cc21
1 files changed, 5 insertions, 16 deletions
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc
index 135d44b..27812c3 100644
--- a/media/cast/test/simulator.cc
+++ b/media/cast/test/simulator.cc
@@ -104,22 +104,11 @@ void LogTransportEvents(const scoped_refptr<CastEnvironment>& env,
frame_events.begin();
it != frame_events.end();
++it) {
- 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);
- }
+ env->Logging()->InsertFrameEvent(it->timestamp,
+ it->type,
+ it->media_type,
+ it->rtp_timestamp,
+ it->frame_id);
}
}