OLD | NEW |
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 <algorithm> | 5 #include <algorithm> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 static_cast<size_t>(end - start)); | 52 static_cast<size_t>(end - start)); |
53 if (!AppendData(start, append_size)) | 53 if (!AppendData(start, append_size)) |
54 return false; | 54 return false; |
55 start += append_size; | 55 start += append_size; |
56 } | 56 } |
57 return true; | 57 return true; |
58 } | 58 } |
59 | 59 |
60 void OnInit(bool init_ok, | 60 void OnInit(bool init_ok, |
61 base::TimeDelta duration, | 61 base::TimeDelta duration, |
| 62 base::Time wallclock_timeline_offset, |
62 bool auto_update_timestamp_offset) { | 63 bool auto_update_timestamp_offset) { |
63 DVLOG(1) << "OnInit: ok=" << init_ok | 64 DVLOG(1) << "OnInit: ok=" << init_ok |
64 << ", dur=" << duration.InMilliseconds() | 65 << ", dur=" << duration.InMilliseconds() |
65 << ", autoTimestampOffset=" << auto_update_timestamp_offset; | 66 << ", autoTimestampOffset=" << auto_update_timestamp_offset; |
66 } | 67 } |
67 | 68 |
68 bool OnNewConfig(const AudioDecoderConfig& ac, | 69 bool OnNewConfig(const AudioDecoderConfig& ac, |
69 const VideoDecoderConfig& vc, | 70 const VideoDecoderConfig& vc, |
70 const StreamParser::TextTrackConfigMap& tc) { | 71 const StreamParser::TextTrackConfigMap& tc) { |
71 DVLOG(1) << "OnNewConfig: audio=" << ac.IsValidConfig() | 72 DVLOG(1) << "OnNewConfig: audio=" << ac.IsValidConfig() |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 // (close to 2^33 / 90000) which results in timestamps wrap around | 179 // (close to 2^33 / 90000) which results in timestamps wrap around |
179 // in the Mpeg2 TS stream. | 180 // in the Mpeg2 TS stream. |
180 ParseMpeg2TsFile("bear-1280x720_ptswraparound.ts", 512); | 181 ParseMpeg2TsFile("bear-1280x720_ptswraparound.ts", 512); |
181 EXPECT_EQ(video_frame_count_, 81); | 182 EXPECT_EQ(video_frame_count_, 81); |
182 EXPECT_GE(video_min_dts_, base::TimeDelta::FromSeconds(95443 - 10)); | 183 EXPECT_GE(video_min_dts_, base::TimeDelta::FromSeconds(95443 - 10)); |
183 EXPECT_LE(video_max_dts_, base::TimeDelta::FromSeconds(95443 + 10)); | 184 EXPECT_LE(video_max_dts_, base::TimeDelta::FromSeconds(95443 + 10)); |
184 } | 185 } |
185 | 186 |
186 } // namespace mp2t | 187 } // namespace mp2t |
187 } // namespace media | 188 } // namespace media |
OLD | NEW |