| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/cast/logging/logging_raw.h" | 5 #include "media/cast/logging/logging_raw.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| 11 | 11 |
| 12 namespace media { | 12 namespace media { |
| 13 namespace cast { | 13 namespace cast { |
| 14 | 14 |
| 15 LoggingRaw::LoggingRaw() {} | 15 LoggingRaw::LoggingRaw() {} |
| 16 | 16 |
| 17 LoggingRaw::~LoggingRaw() {} | 17 LoggingRaw::~LoggingRaw() {} |
| 18 | 18 |
| 19 void LoggingRaw::InsertFrameEvent(const base::TimeTicks& time_of_event, | 19 void LoggingRaw::InsertFrameEvent(const base::TimeTicks& time_of_event, |
| 20 CastLoggingEvent event, uint32 rtp_timestamp, | 20 CastLoggingEvent event, uint32 rtp_timestamp, |
| 21 uint32 frame_id) { | 21 uint32 frame_id) { |
| 22 InsertBaseFrameEvent(time_of_event, event, frame_id, rtp_timestamp, | 22 InsertBaseFrameEvent(time_of_event, event, frame_id, rtp_timestamp, |
| 23 base::TimeDelta(), 0); | 23 base::TimeDelta(), 0, false); |
| 24 } | 24 } |
| 25 | 25 |
| 26 void LoggingRaw::InsertFrameEventWithSize(const base::TimeTicks& time_of_event, | 26 void LoggingRaw::InsertEncodedFrameEvent(const base::TimeTicks& time_of_event, |
| 27 CastLoggingEvent event, | 27 CastLoggingEvent event, |
| 28 uint32 rtp_timestamp, uint32 frame_id, | 28 uint32 rtp_timestamp, uint32 frame_id, |
| 29 int size) { | 29 int size, bool key_frame) { |
| 30 InsertBaseFrameEvent(time_of_event, event, frame_id, rtp_timestamp, | 30 InsertBaseFrameEvent(time_of_event, event, frame_id, rtp_timestamp, |
| 31 base::TimeDelta(), size); | 31 base::TimeDelta(), size, key_frame); |
| 32 } | 32 } |
| 33 | 33 |
| 34 void LoggingRaw::InsertFrameEventWithDelay(const base::TimeTicks& time_of_event, | 34 void LoggingRaw::InsertFrameEventWithDelay(const base::TimeTicks& time_of_event, |
| 35 CastLoggingEvent event, | 35 CastLoggingEvent event, |
| 36 uint32 rtp_timestamp, | 36 uint32 rtp_timestamp, |
| 37 uint32 frame_id, | 37 uint32 frame_id, |
| 38 base::TimeDelta delay) { | 38 base::TimeDelta delay) { |
| 39 InsertBaseFrameEvent(time_of_event, event, frame_id, rtp_timestamp, delay, | 39 InsertBaseFrameEvent(time_of_event, event, frame_id, rtp_timestamp, delay, |
| 40 0); | 40 0, false); |
| 41 } | 41 } |
| 42 | 42 |
| 43 void LoggingRaw::InsertBaseFrameEvent(const base::TimeTicks& time_of_event, | 43 void LoggingRaw::InsertBaseFrameEvent(const base::TimeTicks& time_of_event, |
| 44 CastLoggingEvent event, uint32 frame_id, | 44 CastLoggingEvent event, uint32 frame_id, |
| 45 uint32 rtp_timestamp, | 45 uint32 rtp_timestamp, |
| 46 base::TimeDelta delay, int size) { | 46 base::TimeDelta delay, int size, |
| 47 bool key_frame) { |
| 47 FrameEvent frame_event; | 48 FrameEvent frame_event; |
| 48 frame_event.rtp_timestamp = rtp_timestamp; | 49 frame_event.rtp_timestamp = rtp_timestamp; |
| 49 frame_event.frame_id = frame_id; | 50 frame_event.frame_id = frame_id; |
| 50 frame_event.size = size; | 51 frame_event.size = size; |
| 51 frame_event.timestamp = time_of_event; | 52 frame_event.timestamp = time_of_event; |
| 52 frame_event.type = event; | 53 frame_event.type = event; |
| 53 frame_event.delay_delta = delay; | 54 frame_event.delay_delta = delay; |
| 55 frame_event.key_frame = key_frame; |
| 54 for (std::vector<RawEventSubscriber*>::const_iterator it = | 56 for (std::vector<RawEventSubscriber*>::const_iterator it = |
| 55 subscribers_.begin(); | 57 subscribers_.begin(); |
| 56 it != subscribers_.end(); ++it) { | 58 it != subscribers_.end(); ++it) { |
| 57 (*it)->OnReceiveFrameEvent(frame_event); | 59 (*it)->OnReceiveFrameEvent(frame_event); |
| 58 } | 60 } |
| 59 } | 61 } |
| 60 | 62 |
| 61 void LoggingRaw::InsertPacketEvent(const base::TimeTicks& time_of_event, | 63 void LoggingRaw::InsertPacketEvent(const base::TimeTicks& time_of_event, |
| 62 CastLoggingEvent event, uint32 rtp_timestamp, | 64 CastLoggingEvent event, uint32 rtp_timestamp, |
| 63 uint32 frame_id, uint16 packet_id, | 65 uint32 frame_id, uint16 packet_id, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 DCHECK(std::find(subscribers_.begin(), subscribers_.end(), subscriber) != | 105 DCHECK(std::find(subscribers_.begin(), subscribers_.end(), subscriber) != |
| 104 subscribers_.end()); | 106 subscribers_.end()); |
| 105 | 107 |
| 106 subscribers_.erase( | 108 subscribers_.erase( |
| 107 std::remove(subscribers_.begin(), subscribers_.end(), subscriber), | 109 std::remove(subscribers_.begin(), subscribers_.end(), subscriber), |
| 108 subscribers_.end()); | 110 subscribers_.end()); |
| 109 } | 111 } |
| 110 | 112 |
| 111 } // namespace cast | 113 } // namespace cast |
| 112 } // namespace media | 114 } // namespace media |
| OLD | NEW |