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

Unified Diff: media/formats/webm/webm_stream_parser.cc

Issue 254473006: Add media::StreamParser::StreamParameter struct. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: media/formats/webm/webm_stream_parser.cc
diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
index 4a724090dd91de3aa3ca7a78ab53c55213a18249..d477f0bb83fe503d0bd740f49d584afa861620d1 100644
--- a/media/formats/webm/webm_stream_parser.cc
+++ b/media/formats/webm/webm_stream_parser.cc
@@ -181,13 +181,15 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
bytes_parsed += result;
double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0;
- base::TimeDelta duration = kInfiniteDuration();
+ StreamParameters params;
if (info_parser.duration() > 0) {
int64 duration_in_us = info_parser.duration() * timecode_scale_in_us;
- duration = base::TimeDelta::FromMicroseconds(duration_in_us);
+ params.duration = base::TimeDelta::FromMicroseconds(duration_in_us);
}
+ params.timeline_offset = info_parser.date_utc();
+
const AudioDecoderConfig& audio_config = tracks_parser.audio_decoder_config();
if (audio_config.is_encrypted())
FireNeedKey(tracks_parser.audio_encryption_key_id());
@@ -219,8 +221,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
ChangeState(kParsingClusters);
if (!init_cb_.is_null())
- base::ResetAndReturn(&init_cb_).Run(
- true, duration, info_parser.date_utc(), false);
+ base::ResetAndReturn(&init_cb_).Run(true, params);
return bytes_parsed;
}

Powered by Google App Engine
This is Rietveld 408576698