Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / media / cast / logging / logging_impl.cc

diff --git a/src/media/cast/logging/logging_impl.cc b/src/media/cast/logging/logging_impl.cc
index 3ab4b4d..7d975e2 100644 (file)
--- a/src/media/cast/logging/logging_impl.cc
+++ b/src/media/cast/logging/logging_impl.cc
@@ -25,13 +25,15 @@ void LoggingImpl::InsertFrameEvent(const base::TimeTicks& time_of_event,
   raw_.InsertFrameEvent(time_of_event, event, rtp_timestamp, frame_id);
 }
 
-void LoggingImpl::InsertFrameEventWithSize(const base::TimeTicks& time_of_event,
-                                           CastLoggingEvent event,
-                                           uint32 rtp_timestamp,
-                                           uint32 frame_id, int frame_size) {
+void LoggingImpl::InsertEncodedFrameEvent(const base::TimeTicks& time_of_event,
+                                          CastLoggingEvent event,
+                                          uint32 rtp_timestamp,
+                                          uint32 frame_id, int frame_size,
+                                          bool key_frame,
+                                          int target_bitrate) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  raw_.InsertFrameEventWithSize(time_of_event, event, rtp_timestamp, frame_id,
-                                frame_size);
+  raw_.InsertEncodedFrameEvent(time_of_event, event, rtp_timestamp, frame_id,
+                               frame_size, key_frame, target_bitrate);
 }
 
 void LoggingImpl::InsertFrameEventWithDelay(
@@ -75,7 +77,7 @@ void LoggingImpl::InsertPacketListEvent(const base::TimeTicks& time_of_event,
   DCHECK(thread_checker_.CalledOnValidThread());
   for (PacketList::const_iterator it = packets.begin(); it != packets.end();
        ++it) {
-    InsertSinglePacketEvent(time_of_event, event, *it);
+    InsertSinglePacketEvent(time_of_event, event, (*it)->data);
   }
 }
 
@@ -89,12 +91,6 @@ void LoggingImpl::InsertPacketEvent(const base::TimeTicks& time_of_event,
                          packet_id, max_packet_id, size);
 }
 
-void LoggingImpl::InsertGenericEvent(const base::TimeTicks& time_of_event,
-                                     CastLoggingEvent event, int value) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  raw_.InsertGenericEvent(time_of_event, event, value);
-}
-
 void LoggingImpl::AddRawEventSubscriber(RawEventSubscriber* subscriber) {
   DCHECK(thread_checker_.CalledOnValidThread());
   raw_.AddSubscriber(subscriber);