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

Side by Side Diff: media/base/android/demuxer_stream_player_params.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/base/android/demuxer_stream_player_params.h" 5 #include "media/base/android/demuxer_stream_player_params.h"
6 #include <iomanip> 6 #include <iomanip>
7 7
8 namespace media { 8 namespace media {
9 9
10 DemuxerConfigs::DemuxerConfigs() 10 DemuxerConfigs::DemuxerConfigs()
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 if (conf.audio_codec != media::kUnknownAudioCodec) { 133 if (conf.audio_codec != media::kUnknownAudioCodec) {
134 os << " audio:" << media::AsString(conf.audio_codec) 134 os << " audio:" << media::AsString(conf.audio_codec)
135 << " channels:" << conf.audio_channels 135 << " channels:" << conf.audio_channels
136 << " rate:" << conf.audio_sampling_rate 136 << " rate:" << conf.audio_sampling_rate
137 << (conf.is_audio_encrypted ? " encrypted" : "") 137 << (conf.is_audio_encrypted ? " encrypted" : "")
138 << " delay (ns):" << conf.audio_codec_delay_ns 138 << " delay (ns):" << conf.audio_codec_delay_ns
139 << " preroll (ns):" << conf.audio_seek_preroll_ns; 139 << " preroll (ns):" << conf.audio_seek_preroll_ns;
140 140
141 if (!conf.audio_extra_data.empty()) { 141 if (!conf.audio_extra_data.empty()) {
142 os << " extra:{" << std::hex; 142 os << " extra:{" << std::hex;
143 for (uint8 byte : conf.audio_extra_data) 143 for (uint8_t byte : conf.audio_extra_data)
144 os << " " << std::setfill('0') << std::setw(2) << (int)byte; 144 os << " " << std::setfill('0') << std::setw(2) << (int)byte;
145 os << "}" << std::dec; 145 os << "}" << std::dec;
146 } 146 }
147 } 147 }
148 148
149 if (conf.video_codec != media::kUnknownVideoCodec) { 149 if (conf.video_codec != media::kUnknownVideoCodec) {
150 os << " video:" << media::AsString(conf.video_codec) << " " 150 os << " video:" << media::AsString(conf.video_codec) << " "
151 << conf.video_size.width() << "x" << conf.video_size.height() 151 << conf.video_size.width() << "x" << conf.video_size.height()
152 << (conf.is_video_encrypted ? " encrypted" : ""); 152 << (conf.is_video_encrypted ? " encrypted" : "");
153 } 153 }
154 154
155 return os; 155 return os;
156 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698