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

Side by Side Diff: media/formats/webm/webm_stream_parser.cc

Issue 2158923004: Convert media constants to constexpr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/formats/webm/webm_stream_parser.h" 5 #include "media/formats/webm/webm_stream_parser.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 WebMTracksParser tracks_parser(media_log_, ignore_text_tracks_); 194 WebMTracksParser tracks_parser(media_log_, ignore_text_tracks_);
195 result = tracks_parser.Parse(cur, cur_size); 195 result = tracks_parser.Parse(cur, cur_size);
196 196
197 if (result <= 0) 197 if (result <= 0)
198 return result; 198 return result;
199 199
200 bytes_parsed += result; 200 bytes_parsed += result;
201 201
202 double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0; 202 double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0;
203 InitParameters params(kInfiniteDuration()); 203 InitParameters params(kInfiniteDuration);
204 204
205 if (info_parser.duration() > 0) { 205 if (info_parser.duration() > 0) {
206 int64_t duration_in_us = info_parser.duration() * timecode_scale_in_us; 206 int64_t duration_in_us = info_parser.duration() * timecode_scale_in_us;
207 params.duration = base::TimeDelta::FromMicroseconds(duration_in_us); 207 params.duration = base::TimeDelta::FromMicroseconds(duration_in_us);
208 } 208 }
209 209
210 params.timeline_offset = info_parser.date_utc(); 210 params.timeline_offset = info_parser.date_utc();
211 211
212 if (unknown_segment_size_ && (info_parser.duration() <= 0) && 212 if (unknown_segment_size_ && (info_parser.duration() <= 0) &&
213 !info_parser.date_utc().is_null()) { 213 !info_parser.date_utc().is_null()) {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
284 return bytes_parsed; 284 return bytes_parsed;
285 } 285 }
286 286
287 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) { 287 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) {
288 std::vector<uint8_t> key_id_vector(key_id.begin(), key_id.end()); 288 std::vector<uint8_t> key_id_vector(key_id.begin(), key_id.end());
289 encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector); 289 encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector);
290 } 290 }
291 291
292 } // namespace media 292 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698