Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / media / cast / framer / frame_buffer.cc

diff --git a/src/media/cast/framer/frame_buffer.cc b/src/media/cast/framer/frame_buffer.cc
index 6fcdcf4..0c92047 100644 (file)
--- a/src/media/cast/framer/frame_buffer.cc
+++ b/src/media/cast/framer/frame_buffer.cc
@@ -4,6 +4,8 @@
 
 #include "media/cast/framer/frame_buffer.h"
 
+#include "base/logging.h"
+
 namespace media {
 namespace cast {
 
@@ -29,16 +31,19 @@ void FrameBuffer::InsertPacket(const uint8* payload_data,
     if (rtp_header.is_reference) {
       last_referenced_frame_id_ = rtp_header.reference_frame_id;
     } else {
-      last_referenced_frame_id_ = static_cast<uint8>(rtp_header.frame_id - 1);
+      last_referenced_frame_id_ = rtp_header.frame_id - 1;
     }
 
     rtp_timestamp_ = rtp_header.webrtc.header.timestamp;
   }
   // Is this the correct frame?
-  if (rtp_header.frame_id != frame_id_) return;
+  if (rtp_header.frame_id != frame_id_)
+    return;
 
   // Insert every packet only once.
-  if (packets_.find(rtp_header.packet_id) != packets_.end()) return;
+  if (packets_.find(rtp_header.packet_id) != packets_.end()) {
+    return;
+  }
 
   std::vector<uint8> data;
   std::pair<PacketMap::iterator, bool> retval =
@@ -46,8 +51,8 @@ void FrameBuffer::InsertPacket(const uint8* payload_data,
 
   // Insert the packet.
   retval.first->second.resize(payload_size);
-  std::copy(payload_data, payload_data + payload_size,
-            retval.first->second.begin());
+  std::copy(
+      payload_data, payload_data + payload_size, retval.first->second.begin());
 
   ++num_packets_received_;
   total_data_size_ += payload_size;
@@ -57,44 +62,43 @@ bool FrameBuffer::Complete() const {
   return num_packets_received_ - 1 == max_packet_id_;
 }
 
-bool FrameBuffer::GetEncodedAudioFrame(EncodedAudioFrame* audio_frame,
-                                       uint32* rtp_timestamp) const {
-  if (!Complete()) return false;
-
-  *rtp_timestamp = rtp_timestamp_;
+bool FrameBuffer::GetEncodedAudioFrame(
+    transport::EncodedAudioFrame* audio_frame) const {
+  if (!Complete())
+    return false;
 
   // Frame is complete -> construct.
   audio_frame->frame_id = frame_id_;
+  audio_frame->rtp_timestamp = rtp_timestamp_;
 
   // Build the data vector.
   audio_frame->data.clear();
   audio_frame->data.reserve(total_data_size_);
   PacketMap::const_iterator it;
   for (it = packets_.begin(); it != packets_.end(); ++it) {
-    audio_frame->data.insert(audio_frame->data.end(),
-                             it->second.begin(), it->second.end());
+    audio_frame->data.insert(
+        audio_frame->data.end(), it->second.begin(), it->second.end());
   }
   return true;
 }
 
-bool FrameBuffer::GetEncodedVideoFrame(EncodedVideoFrame* video_frame,
-                                       uint32* rtp_timestamp) const {
-  if (!Complete()) return false;
-
-  *rtp_timestamp = rtp_timestamp_;
-
+bool FrameBuffer::GetEncodedVideoFrame(
+    transport::EncodedVideoFrame* video_frame) const {
+  if (!Complete())
+    return false;
   // Frame is complete -> construct.
   video_frame->key_frame = is_key_frame_;
   video_frame->frame_id = frame_id_;
   video_frame->last_referenced_frame_id = last_referenced_frame_id_;
+  video_frame->rtp_timestamp = rtp_timestamp_;
 
   // Build the data vector.
   video_frame->data.clear();
   video_frame->data.reserve(total_data_size_);
   PacketMap::const_iterator it;
   for (it = packets_.begin(); it != packets_.end(); ++it) {
-    video_frame->data.insert(video_frame->data.end(),
-                             it->second.begin(), it->second.end());
+    video_frame->data.insert(
+        video_frame->data.end(), it->second.begin(), it->second.end());
   }
   return true;
 }