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

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

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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_tracks_parser.h" 5 #include "media/formats/webm/webm_tracks_parser.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "media/base/media_util.h" 10 #include "media/base/media_util.h"
(...skipping 27 matching lines...) Expand all
38 38
39 int64_t mult = duration_in_ns / 1000; 39 int64_t mult = duration_in_ns / 1000;
40 mult /= timecode_scale_in_us; 40 mult /= timecode_scale_in_us;
41 if (mult == 0) 41 if (mult == 0)
42 return kNoTimestamp; 42 return kNoTimestamp;
43 43
44 mult = static_cast<double>(mult) * timecode_scale_in_us; 44 mult = static_cast<double>(mult) * timecode_scale_in_us;
45 return base::TimeDelta::FromMicroseconds(mult); 45 return base::TimeDelta::FromMicroseconds(mult);
46 } 46 }
47 47
48 WebMTracksParser::WebMTracksParser(const scoped_refptr<MediaLog>& media_log, 48 WebMTracksParser::WebMTracksParser(MediaLog* media_log, bool ignore_text_tracks)
49 bool ignore_text_tracks)
50 : ignore_text_tracks_(ignore_text_tracks), 49 : ignore_text_tracks_(ignore_text_tracks),
51 media_log_(media_log), 50 media_log_(media_log),
52 audio_client_(media_log), 51 audio_client_(media_log),
53 video_client_(media_log) { 52 video_client_(media_log) {
54 Reset(); 53 Reset();
55 } 54 }
56 55
57 WebMTracksParser::~WebMTracksParser() {} 56 WebMTracksParser::~WebMTracksParser() {}
58 57
59 void WebMTracksParser::Reset() { 58 void WebMTracksParser::Reset() {
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 } else { 364 } else {
366 track_language_ = str; 365 track_language_ = str;
367 } 366 }
368 return true; 367 return true;
369 } 368 }
370 369
371 return true; 370 return true;
372 } 371 }
373 372
374 } // namespace media 373 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/webm/webm_tracks_parser.h ('k') | media/formats/webm/webm_tracks_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698