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 size_t append_size = std::min(piece_size, | 52 size_t append_size = std::min(piece_size, |
53 static_cast<size_t>(end - start)); | 53 static_cast<size_t>(end - start)); |
54 if (!AppendData(start, append_size)) | 54 if (!AppendData(start, append_size)) |
55 return false; | 55 return false; |
56 start += append_size; | 56 start += append_size; |
57 } | 57 } |
58 return true; | 58 return true; |
59 } | 59 } |
60 | 60 |
61 void InitF(bool init_ok, | 61 void InitF(bool init_ok, |
62 base::TimeDelta duration, | 62 const StreamParser::StreamParameters& params) { |
63 base::Time wallclock_timeline_offset, | 63 DVLOG(1) << "InitF: ok=" << init_ok |
64 bool auto_update_timestamp_offset) { | 64 << ", dur=" << params.duration.InMilliseconds() |
65 DVLOG(1) << "InitF: ok=" << init_ok << ", dur=" << duration.InMilliseconds() | 65 << ", autoTimestampOffset=" << params.auto_update_timestamp_offset; |
66 << ", autoTimestampOffset=" << auto_update_timestamp_offset; | |
67 } | 66 } |
68 | 67 |
69 bool NewConfigF(const AudioDecoderConfig& ac, | 68 bool NewConfigF(const AudioDecoderConfig& ac, |
70 const VideoDecoderConfig& vc, | 69 const VideoDecoderConfig& vc, |
71 const StreamParser::TextTrackConfigMap& tc) { | 70 const StreamParser::TextTrackConfigMap& tc) { |
72 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() | 71 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() |
73 << ", video=" << vc.IsValidConfig(); | 72 << ", video=" << vc.IsValidConfig(); |
74 configs_received_ = true; | 73 configs_received_ = true; |
75 return true; | 74 return true; |
76 } | 75 } |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 // The parser should fail instead of crash. See http://crbug.com/361347 | 211 // The parser should fail instead of crash. See http://crbug.com/361347 |
213 TEST_F(MP4StreamParserTest, MissingSampleAuxInfo) { | 212 TEST_F(MP4StreamParserTest, MissingSampleAuxInfo) { |
214 ParseMP4File("bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4", 512); | 213 ParseMP4File("bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4", 512); |
215 } | 214 } |
216 | 215 |
217 // TODO(strobe): Create and test media which uses CENC auxiliary info stored | 216 // TODO(strobe): Create and test media which uses CENC auxiliary info stored |
218 // inside a private box | 217 // inside a private box |
219 | 218 |
220 } // namespace mp4 | 219 } // namespace mp4 |
221 } // namespace media | 220 } // namespace media |
OLD | NEW |