From 02a5ae4e0e6c5f8f3405d94dfbf89d9de2dc41f6 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Thu, 18 Sep 2014 11:50:01 +1200 Subject: [PATCH] Bug 1061046. Part 8: Remove PeerConnectionMedia's USECS_PER_S video rate and use the GraphRate instead. r=karlt --- .../signaling/src/peerconnection/PeerConnectionMedia.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h index c4e9fb9a7ba..02808a90da4 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h @@ -107,7 +107,8 @@ class Fake_VideoGenerator { // Make a track mozilla::VideoSegment *segment = new mozilla::VideoSegment(); - mStream->GetStream()->AsSourceStream()->AddTrack(1, mozilla::USECS_PER_S, 0, segment); + mStream->GetStream()->AsSourceStream()->AddTrack(1, + mStream->GetStream()->GraphRate(), 0, segment); mStream->GetStream()->AsSourceStream()->AdvanceKnownTracksTime(mozilla::STREAM_TIME_MAX); // Set the timer. Set to 10 fps. @@ -157,7 +158,8 @@ class Fake_VideoGenerator { // AddTrack takes ownership of segment mozilla::VideoSegment *segment = new mozilla::VideoSegment(); // 10 fps. - segment->AppendFrame(image.forget(), mozilla::USECS_PER_S / 10, + segment->AppendFrame(image.forget(), + gen->mStream->GetStream()->GraphRate() / 10, IntSize(WIDTH, HEIGHT)); gen->mStream->GetStream()->AsSourceStream()->AppendToTrack(1, segment);