1 files changed, 18 insertions, 25 deletions

diff --git a/chromium/media/cast/framer/framer.cc b/chromium/media/cast/framer/framer.cc
index 95048209dcd..b06e60fd035 100644
--- a/chromium/media/cast/framer/framer.cc
+++ b/chromium/media/cast/framer/framer.cc
@@ -11,13 +11,13 @@ namespace cast {
 
 typedef FrameList::const_iterator ConstFrameIterator;
 
-Framer::Framer(RtpPayloadFeedback* incoming_payload_feedback,
+Framer::Framer(base::TickClock* clock,
+               RtpPayloadFeedback* incoming_payload_feedback,
                uint32 ssrc,
                bool decoder_faster_than_max_frame_rate,
                int max_unacked_frames)
     : decoder_faster_than_max_frame_rate_(decoder_faster_than_max_frame_rate),
-      clock_(&default_tick_clock_),
-      cast_msg_builder_(new CastMessageBuilder(incoming_payload_feedback,
+      cast_msg_builder_(new CastMessageBuilder(clock, incoming_payload_feedback,
           &frame_id_map_, ssrc, decoder_faster_than_max_frame_rate,
           max_unacked_frames)) {
   DCHECK(incoming_payload_feedback) << "Invalid argument";
@@ -25,11 +25,11 @@ Framer::Framer(RtpPayloadFeedback* incoming_payload_feedback,
 
 Framer::~Framer() {}
 
-void Framer::InsertPacket(const uint8* payload_data,
-                          int payload_size,
+bool Framer::InsertPacket(const uint8* payload_data,
+                          size_t payload_size,
                           const RtpCastHeader& rtp_header) {
   bool complete = false;
-  if (!frame_id_map_.InsertPacket(rtp_header, &complete)) return;
+  if (!frame_id_map_.InsertPacket(rtp_header, &complete)) return false;
 
   // Does this packet belong to a new frame?
   FrameList::iterator it = frames_.find(rtp_header.frame_id);
@@ -45,24 +45,23 @@ void Framer::InsertPacket(const uint8* payload_data,
 
   if (complete) {
     // ACK as soon as possible.
+    VLOG(1) << "Complete frame " << static_cast<int>(rtp_header.frame_id);
     cast_msg_builder_->CompleteFrameReceived(rtp_header.frame_id,
                                              rtp_header.is_key_frame);
   }
+  return complete;
 }
 
 // This does not release the frame.
-bool Framer::GetEncodedAudioFrame(const base::TimeTicks& timeout,
-                                  EncodedAudioFrame* audio_frame,
+bool Framer::GetEncodedAudioFrame(EncodedAudioFrame* audio_frame,
                                   uint32* rtp_timestamp,
                                   bool* next_frame) {
-  uint8 frame_id;
+  uint32 frame_id;
   // Find frame id.
   if (frame_id_map_.NextContinuousFrame(&frame_id)) {
     // We have our next frame.
     *next_frame = true;
   } else {
-    if (WaitForNextFrame(timeout)) return false;
-
     if (!frame_id_map_.NextAudioFrameAllowingMissingFrames(&frame_id)) {
       return false;
     }
@@ -77,18 +76,15 @@ bool Framer::GetEncodedAudioFrame(const base::TimeTicks& timeout,
 }
 
 // This does not release the frame.
-bool Framer::GetEncodedVideoFrame(const base::TimeTicks& timeout,
-                                  EncodedVideoFrame* video_frame,
+bool Framer::GetEncodedVideoFrame(EncodedVideoFrame* video_frame,
                                   uint32* rtp_timestamp,
                                   bool* next_frame) {
-  uint8 frame_id;
+  uint32 frame_id;
   // Find frame id.
   if (frame_id_map_.NextContinuousFrame(&frame_id)) {
     // We have our next frame.
     *next_frame = true;
   } else {
-    if (WaitForNextFrame(timeout)) return false;
-
     // Check if we can skip frames when our decoder is too slow.
     if (!decoder_faster_than_max_frame_rate_) return false;
 
@@ -105,33 +101,30 @@ bool Framer::GetEncodedVideoFrame(const base::TimeTicks& timeout,
   return it->second->GetEncodedVideoFrame(video_frame, rtp_timestamp);
 }
 
-bool Framer::WaitForNextFrame(const base::TimeTicks& timeout) const {
-  base::TimeDelta wait_time = timeout - clock_->NowTicks();
-  if (wait_time.InMilliseconds() > 0)
-    return true;
-
-  return false;
-}
-
 void Framer::Reset() {
   frame_id_map_.Clear();
   frames_.clear();
   cast_msg_builder_->Reset();
 }
 
-void Framer::ReleaseFrame(uint8 frame_id) {
+void Framer::ReleaseFrame(uint32 frame_id) {
   frame_id_map_.RemoveOldFrames(frame_id);
   frames_.erase(frame_id);
 
   // We have a frame - remove all frames with lower frame id.
+  bool skipped_old_frame = false;
   FrameList::iterator it;
   for (it = frames_.begin(); it != frames_.end(); ) {
     if (IsOlderFrameId(it->first, frame_id)) {
       frames_.erase(it++);
+      skipped_old_frame = true;
     } else {
       ++it;
     }
   }
+  if (skipped_old_frame) {
+    cast_msg_builder_->UpdateCastMessage();
+  }
 }
 
 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) {