summaryrefslogtreecommitdiffstats
path: root/media/formats/webm/webm_stream_parser.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 01:00:25 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 01:00:25 +0000
commit17dc5b8d3866d0709e86a7d8fcce10b5e627a49a (patch)
tree0c891f882b37efa538bea1f02e32bb056865c576 /media/formats/webm/webm_stream_parser.cc
parent3d811377e2c57caca1e7fa694fed064d419cbd1f (diff)
downloadchromium_src-17dc5b8d3866d0709e86a7d8fcce10b5e627a49a.zip
chromium_src-17dc5b8d3866d0709e86a7d8fcce10b5e627a49a.tar.gz
chromium_src-17dc5b8d3866d0709e86a7d8fcce10b5e627a49a.tar.bz2
Add media::StreamParser::InitParameter struct.
The new struct is used to pass parameters to StreamParser::InitCB. This change makes it easier to add new parameters. BUG=338529 R=acolwell@chromium.org Review URL: https://codereview.chromium.org/254473006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/formats/webm/webm_stream_parser.cc')
-rw-r--r--media/formats/webm/webm_stream_parser.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
index 4a724090..b4ae1ff 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();
+ InitParameters params(kInfiniteDuration());
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;
}