Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: media/cast/logging/encoding_event_subscriber.cc

Issue 165723002: Cast: Implemented size limiting and event filtering in EncodingEventSubscriber. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/encoding_event_subscriber.h" 5 #include "media/cast/logging/encoding_event_subscriber.h"
6 6
7 #include <cstring>
7 #include <utility> 8 #include <utility>
8 9
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "media/cast/logging/proto/proto_utils.h" 11 #include "media/cast/logging/proto/proto_utils.h"
11 12
12 using google::protobuf::RepeatedPtrField; 13 using google::protobuf::RepeatedPtrField;
13 using media::cast::proto::AggregatedFrameEvent; 14 using media::cast::proto::AggregatedFrameEvent;
14 using media::cast::proto::AggregatedGenericEvent; 15 using media::cast::proto::AggregatedGenericEvent;
15 using media::cast::proto::AggregatedPacketEvent; 16 using media::cast::proto::AggregatedPacketEvent;
16 using media::cast::proto::BasePacketEvent; 17 using media::cast::proto::BasePacketEvent;
17 18
18 namespace media { 19 namespace media {
19 namespace cast { 20 namespace cast {
20 21
21 EncodingEventSubscriber::EncodingEventSubscriber() {} 22 EncodingEventSubscriber::EncodingEventSubscriber(
23 EventMediaType event_media_type, size_t max_frames)
24 : event_media_type_(event_media_type), max_frames_(max_frames) {}
22 25
23 EncodingEventSubscriber::~EncodingEventSubscriber() { 26 EncodingEventSubscriber::~EncodingEventSubscriber() {
24 DCHECK(thread_checker_.CalledOnValidThread()); 27 DCHECK(thread_checker_.CalledOnValidThread());
25 } 28 }
26 29
27 void EncodingEventSubscriber::OnReceiveFrameEvent( 30 void EncodingEventSubscriber::OnReceiveFrameEvent(
28 const FrameEvent& frame_event) { 31 const FrameEvent& frame_event) {
29 DCHECK(thread_checker_.CalledOnValidThread()); 32 DCHECK(thread_checker_.CalledOnValidThread());
30 33
31 FrameEventMap::iterator it = frame_event_map_.find(frame_event.rtp_timestamp); 34 if (ShouldProcessEvent(frame_event.type)) {
32 linked_ptr<AggregatedFrameEvent> event_proto; 35 FrameEventMap::iterator it =
36 frame_event_map_.find(frame_event.rtp_timestamp);
37 linked_ptr<AggregatedFrameEvent> event_proto;
33 38
34 // Look up existing entry. If not found, create a new entry and add to map. 39 // Look up existing entry. If not found, create a new entry and add to map.
35 if (it == frame_event_map_.end()) { 40 if (it == frame_event_map_.end()) {
36 event_proto.reset(new AggregatedFrameEvent); 41 event_proto.reset(new AggregatedFrameEvent);
37 event_proto->set_rtp_timestamp(frame_event.rtp_timestamp); 42 event_proto->set_rtp_timestamp(frame_event.rtp_timestamp);
38 frame_event_map_.insert( 43 frame_event_map_.insert(
39 std::make_pair(frame_event.rtp_timestamp, event_proto)); 44 std::make_pair(frame_event.rtp_timestamp, event_proto));
40 } else { 45 } else {
41 event_proto = it->second; 46 event_proto = it->second;
47 }
48
49 event_proto->add_event_type(ToProtoEventType(frame_event.type));
50 event_proto->add_event_timestamp_micros(
51 frame_event.timestamp.ToInternalValue());
52
53 if (frame_event.type == kAudioFrameEncoded ||
54 frame_event.type == kVideoFrameEncoded) {
55 event_proto->set_encoded_frame_size(frame_event.size);
56 } else if (frame_event.type == kAudioPlayoutDelay ||
57 frame_event.type == kVideoRenderDelay) {
58 event_proto->set_delay_millis(frame_event.delay_delta.InMilliseconds());
59 }
60
61 TruncateFrameEventMapIfNeeded();
42 } 62 }
43 63
44 event_proto->add_event_type(ToProtoEventType(frame_event.type)); 64 DCHECK(frame_event_map_.size() <= max_frames_);
45 event_proto->add_event_timestamp_micros(
46 frame_event.timestamp.ToInternalValue());
47
48 if (frame_event.type == kAudioFrameEncoded ||
49 frame_event.type == kVideoFrameEncoded) {
50 event_proto->set_encoded_frame_size(frame_event.size);
51 } else if (frame_event.type == kAudioPlayoutDelay ||
52 frame_event.type == kVideoRenderDelay) {
53 event_proto->set_delay_millis(frame_event.delay_delta.InMilliseconds());
54 }
55 } 65 }
56 66
57 void EncodingEventSubscriber::OnReceivePacketEvent( 67 void EncodingEventSubscriber::OnReceivePacketEvent(
58 const PacketEvent& packet_event) { 68 const PacketEvent& packet_event) {
59 DCHECK(thread_checker_.CalledOnValidThread()); 69 DCHECK(thread_checker_.CalledOnValidThread());
60 70
61 PacketEventMap::iterator it = 71 if (ShouldProcessEvent(packet_event.type)) {
62 packet_event_map_.find(packet_event.rtp_timestamp); 72 PacketEventMap::iterator it =
63 linked_ptr<AggregatedPacketEvent> event_proto; 73 packet_event_map_.find(packet_event.rtp_timestamp);
64 BasePacketEvent* base_packet_event_proto = NULL; 74 linked_ptr<AggregatedPacketEvent> event_proto;
75 BasePacketEvent* base_packet_event_proto = NULL;
65 76
66 // Look up existing entry. If not found, create a new entry and add to map. 77 // Look up existing entry. If not found, create a new entry and add to map.
67 if (it == packet_event_map_.end()) { 78 if (it == packet_event_map_.end()) {
68 event_proto.reset(new AggregatedPacketEvent); 79 event_proto.reset(new AggregatedPacketEvent);
69 event_proto->set_rtp_timestamp(packet_event.rtp_timestamp); 80 event_proto->set_rtp_timestamp(packet_event.rtp_timestamp);
70 packet_event_map_.insert( 81 packet_event_map_.insert(
71 std::make_pair(packet_event.rtp_timestamp, event_proto)); 82 std::make_pair(packet_event.rtp_timestamp, event_proto));
72 base_packet_event_proto = event_proto->add_base_packet_event(); 83 base_packet_event_proto = event_proto->add_base_packet_event();
73 base_packet_event_proto->set_packet_id(packet_event.packet_id); 84 base_packet_event_proto->set_packet_id(packet_event.packet_id);
74 } else { 85 } else {
75 // Found existing entry, now look up existing BasePacketEvent using packet 86 // Found existing entry, now look up existing BasePacketEvent using packet
76 // ID. If not found, create a new entry and add to proto. 87 // ID. If not found, create a new entry and add to proto.
77 event_proto = it->second; 88 event_proto = it->second;
78 RepeatedPtrField<BasePacketEvent>* field = 89 RepeatedPtrField<BasePacketEvent>* field =
79 event_proto->mutable_base_packet_event(); 90 event_proto->mutable_base_packet_event();
80 for (RepeatedPtrField<BasePacketEvent>::pointer_iterator it = 91 for (RepeatedPtrField<BasePacketEvent>::pointer_iterator it =
81 field->pointer_begin(); 92 field->pointer_begin();
82 it != field->pointer_end(); ++it) { 93 it != field->pointer_end();
83 if ((*it)->packet_id() == packet_event.packet_id) { 94 ++it) {
84 base_packet_event_proto = *it; 95 if ((*it)->packet_id() == packet_event.packet_id) {
85 break; 96 base_packet_event_proto = *it;
97 break;
98 }
99 }
100 if (!base_packet_event_proto) {
101 base_packet_event_proto = event_proto->add_base_packet_event();
102 base_packet_event_proto->set_packet_id(packet_event.packet_id);
86 } 103 }
87 } 104 }
88 if (!base_packet_event_proto) { 105
89 base_packet_event_proto = event_proto->add_base_packet_event(); 106 base_packet_event_proto->add_event_type(
90 base_packet_event_proto->set_packet_id(packet_event.packet_id); 107 ToProtoEventType(packet_event.type));
91 } 108 base_packet_event_proto->add_event_timestamp_micros(
109 packet_event.timestamp.ToInternalValue());
110
111 TruncatePacketEventMapIfNeeded();
92 } 112 }
93 113
94 base_packet_event_proto->add_event_type(ToProtoEventType(packet_event.type)); 114 DCHECK(packet_event_map_.size() <= max_frames_);
95 base_packet_event_proto->add_event_timestamp_micros(
96 packet_event.timestamp.ToInternalValue());
97 } 115 }
98 116
99 void EncodingEventSubscriber::OnReceiveGenericEvent( 117 void EncodingEventSubscriber::OnReceiveGenericEvent(
100 const GenericEvent& generic_event) { 118 const GenericEvent& generic_event) {
101 DCHECK(thread_checker_.CalledOnValidThread()); 119 DCHECK(thread_checker_.CalledOnValidThread());
102 120 // Do nothing, there are no generic events we are interested in.
103 GenericEventMap::iterator it = generic_event_map_.find(generic_event.type);
104 linked_ptr<AggregatedGenericEvent> event_proto;
105 if (it == generic_event_map_.end()) {
106 event_proto.reset(new AggregatedGenericEvent);
107 event_proto->set_event_type(ToProtoEventType(generic_event.type));
108 generic_event_map_.insert(std::make_pair(generic_event.type, event_proto));
109 } else {
110 event_proto = it->second;
111 }
112
113 event_proto->add_event_timestamp_micros(
114 generic_event.timestamp.ToInternalValue());
115 event_proto->add_value(generic_event.value);
116 } 121 }
117 122
118 void EncodingEventSubscriber::GetFrameEventsAndReset( 123 void EncodingEventSubscriber::GetFrameEventsAndReset(
119 FrameEventMap* frame_event_map) { 124 FrameEventMap* frame_event_map) {
120 DCHECK(thread_checker_.CalledOnValidThread()); 125 DCHECK(thread_checker_.CalledOnValidThread());
121 frame_event_map->swap(frame_event_map_); 126 frame_event_map->swap(frame_event_map_);
122 frame_event_map_.clear(); 127 frame_event_map_.clear();
123 } 128 }
124 129
125 void EncodingEventSubscriber::GetPacketEventsAndReset( 130 void EncodingEventSubscriber::GetPacketEventsAndReset(
126 PacketEventMap* packet_event_map) { 131 PacketEventMap* packet_event_map) {
127 DCHECK(thread_checker_.CalledOnValidThread()); 132 DCHECK(thread_checker_.CalledOnValidThread());
128 packet_event_map->swap(packet_event_map_); 133 packet_event_map->swap(packet_event_map_);
129 packet_event_map_.clear(); 134 packet_event_map_.clear();
130 } 135 }
131 136
132 void EncodingEventSubscriber::GetGenericEventsAndReset( 137
133 GenericEventMap* generic_event_map) { 138 bool EncodingEventSubscriber::ShouldProcessEvent(CastLoggingEvent event) {
134 DCHECK(thread_checker_.CalledOnValidThread()); 139 return GetEventMediaType(event) == event_media_type_;
135 generic_event_map->swap(generic_event_map_); 140 }
136 generic_event_map_.clear(); 141
142 void EncodingEventSubscriber::TruncateFrameEventMapIfNeeded() {
143 // This works because this is called everytime an event is inserted and
144 // we only insert events one at a time.
145 if (frame_event_map_.size() > max_frames_)
146 frame_event_map_.erase(frame_event_map_.begin());
147 }
148
149 void EncodingEventSubscriber::TruncatePacketEventMapIfNeeded() {
150 // This works because this is called everytime an event is inserted and
151 // we only insert events one at a time.
152 if (packet_event_map_.size() > max_frames_)
153 packet_event_map_.erase(packet_event_map_.begin());
137 } 154 }
138 155
139 } // namespace cast 156 } // namespace cast
140 } // namespace media 157 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/logging/encoding_event_subscriber.h ('k') | media/cast/logging/encoding_event_subscriber_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698