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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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 <algorithm> 7 #include <algorithm>
8 #include <cstring> 8 #include <cstring>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 if (frame_event.type == FRAME_CAPTURE_END) { 97 if (frame_event.type == FRAME_CAPTURE_END) {
98 if (frame_event.media_type == VIDEO_EVENT && 98 if (frame_event.media_type == VIDEO_EVENT &&
99 frame_event.width > 0 && frame_event.height > 0) { 99 frame_event.width > 0 && frame_event.height > 0) {
100 event_proto->set_width(frame_event.width); 100 event_proto->set_width(frame_event.width);
101 event_proto->set_height(frame_event.height); 101 event_proto->set_height(frame_event.height);
102 } 102 }
103 } else if (frame_event.type == FRAME_ENCODED) { 103 } else if (frame_event.type == FRAME_ENCODED) {
104 event_proto->set_encoded_frame_size(frame_event.size); 104 event_proto->set_encoded_frame_size(frame_event.size);
105 if (frame_event.encoder_cpu_utilization >= 0.0) { 105 if (frame_event.encoder_cpu_utilization >= 0.0) {
106 event_proto->set_encoder_cpu_percent_utilized(base::saturated_cast<int32>( 106 event_proto->set_encoder_cpu_percent_utilized(
107 base::saturated_cast<int32_t>(
107 frame_event.encoder_cpu_utilization * 100.0 + 0.5)); 108 frame_event.encoder_cpu_utilization * 100.0 + 0.5));
108 } 109 }
109 if (frame_event.idealized_bitrate_utilization >= 0.0) { 110 if (frame_event.idealized_bitrate_utilization >= 0.0) {
110 event_proto->set_idealized_bitrate_percent_utilized( 111 event_proto->set_idealized_bitrate_percent_utilized(
111 base::saturated_cast<int32>( 112 base::saturated_cast<int32_t>(
112 frame_event.idealized_bitrate_utilization * 100.0 + 0.5)); 113 frame_event.idealized_bitrate_utilization * 100.0 + 0.5));
113 } 114 }
114 if (frame_event.media_type == VIDEO_EVENT) { 115 if (frame_event.media_type == VIDEO_EVENT) {
115 event_proto->set_key_frame(frame_event.key_frame); 116 event_proto->set_key_frame(frame_event.key_frame);
116 event_proto->set_target_bitrate(frame_event.target_bitrate); 117 event_proto->set_target_bitrate(frame_event.target_bitrate);
117 } 118 }
118 } else if (frame_event.type == FRAME_PLAYOUT) { 119 } else if (frame_event.type == FRAME_PLAYOUT) {
119 event_proto->set_delay_millis(frame_event.delay_delta.InMilliseconds()); 120 event_proto->set_delay_millis(frame_event.delay_delta.InMilliseconds());
120 } 121 }
121 122
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 frame_event_storage_index_ = 0; 294 frame_event_storage_index_ = 0;
294 packet_event_map_.clear(); 295 packet_event_map_.clear();
295 packet_event_storage_.clear(); 296 packet_event_storage_.clear();
296 packet_event_storage_index_ = 0; 297 packet_event_storage_index_ = 0;
297 seen_first_rtp_timestamp_ = false; 298 seen_first_rtp_timestamp_ = false;
298 first_rtp_timestamp_ = 0u; 299 first_rtp_timestamp_ = 0u;
299 } 300 }
300 301
301 } // namespace cast 302 } // namespace cast
302 } // namespace media 303 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698