[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame

media/cast/framer/framer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/framer/framer.h"
 
 #include "base/logging.h"
 
 namespace media {
 namespace cast {
@@ skipping 51 matching lines @@
   if (complete) {
     // ACK as soon as possible.
     VLOG(2) << "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(transport::EncodedAudioFrame* audio_frame,
+bool Framer::GetEncodedAudioFrame(transport::EncodedFrame* audio_frame,
                                   bool* next_frame) {
   uint32 frame_id;
   // Find frame id.
   if (frame_id_map_.NextContinuousFrame(&frame_id)) {
     // We have our next frame.
     *next_frame = true;
   } else {
     if (!frame_id_map_.NextAudioFrameAllowingMissingFrames(&frame_id)) {
       return false;
     }
     *next_frame = false;
   }
 
   ConstFrameIterator it = frames_.find(frame_id);
   DCHECK(it != frames_.end());
   if (it == frames_.end())
     return false;
 
-  return it->second->GetEncodedAudioFrame(audio_frame);
+  return it->second->AssembleEncodedFrame(audio_frame);
 }
 
 // This does not release the frame.
-bool Framer::GetEncodedVideoFrame(transport::EncodedVideoFrame* video_frame,
+bool Framer::GetEncodedVideoFrame(transport::EncodedFrame* video_frame,
                                   bool* next_frame) {
   uint32 frame_id;
   // Find frame id.
   if (frame_id_map_.NextContinuousFrame(&frame_id)) {
     // We have our next frame.
     *next_frame = true;
   } else {
     // Check if we can skip frames when our decoder is too slow.
     if (!decoder_faster_than_max_frame_rate_)
       return false;
 
     if (!frame_id_map_.NextVideoFrameAllowingSkippingFrames(&frame_id)) {
       return false;
     }
     *next_frame = false;
   }
 
   ConstFrameIterator it = frames_.find(frame_id);
   DCHECK(it != frames_.end());
   if (it == frames_.end())
     return false;
 
-  return it->second->GetEncodedVideoFrame(video_frame);
+  return it->second->AssembleEncodedFrame(video_frame);
 }
 
 void Framer::Reset() {
   frame_id_map_.Clear();
   frames_.clear();
   cast_msg_builder_->Reset();
 }
 
 void Framer::ReleaseFrame(uint32 frame_id) {
   frame_id_map_.RemoveOldFrames(frame_id);
@@ skipping 16 matching lines @@
 }
 
 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) {
   return cast_msg_builder_->TimeToSendNextCastMessage(time_to_send);
 }
 
 void Framer::SendCastMessage() { cast_msg_builder_->UpdateCastMessage(); }
 
 }  // namespace cast
 }  // namespace media