diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
| commit | 23730a6e56a168d1879203e4b3819bb36e3d8f1f (patch) | |
| tree | 4b72bdd217f9beda1d1b975e21c9d646a9664c48 /media/formats/mp2t | |
| parent | 6d6d338a36340632714f2aab9a266979b71c3442 (diff) | |
| download | chromium_org-23730a6e56a168d1879203e4b3819bb36e3d8f1f.tar.gz | |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
Diffstat (limited to 'media/formats/mp2t')
| -rw-r--r-- | media/formats/mp2t/mp2t_stream_parser.cc | 2 | ||||
| -rw-r--r-- | media/formats/mp2t/mp2t_stream_parser_unittest.cc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media/formats/mp2t/mp2t_stream_parser.cc b/media/formats/mp2t/mp2t_stream_parser.cc index 66bdf4f4df..a22af1a149 100644 --- a/media/formats/mp2t/mp2t_stream_parser.cc +++ b/media/formats/mp2t/mp2t_stream_parser.cc @@ -484,7 +484,7 @@ bool Mp2tStreamParser::FinishInitializationIfNeeded() { // For Mpeg2 TS, the duration is not known. DVLOG(1) << "Mpeg2TS stream parser initialization done"; - init_cb_.Run(true, kInfiniteDuration()); + init_cb_.Run(true, kInfiniteDuration(), false); is_initialized_ = true; return true; diff --git a/media/formats/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc index 02370f2e6b..ea796745da 100644 --- a/media/formats/mp2t/mp2t_stream_parser_unittest.cc +++ b/media/formats/mp2t/mp2t_stream_parser_unittest.cc @@ -57,9 +57,12 @@ class Mp2tStreamParserTest : public testing::Test { return true; } - void OnInit(bool init_ok, base::TimeDelta duration) { + void OnInit(bool init_ok, + base::TimeDelta duration, + bool auto_update_timestamp_offset) { DVLOG(1) << "OnInit: ok=" << init_ok - << ", dur=" << duration.InMilliseconds(); + << ", dur=" << duration.InMilliseconds() + << ", autoTimestampOffset=" << auto_update_timestamp_offset; } bool OnNewConfig(const AudioDecoderConfig& ac, |