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 <stddef.h> |
| 6 #include <stdint.h> |
| 7 |
5 #include <algorithm> | 8 #include <algorithm> |
6 #include <sstream> | 9 #include <sstream> |
7 | 10 |
| 11 #include "base/macros.h" |
8 #include "media/base/stream_parser.h" | 12 #include "media/base/stream_parser.h" |
9 #include "media/base/stream_parser_buffer.h" | 13 #include "media/base/stream_parser_buffer.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
11 | 15 |
12 namespace media { | 16 namespace media { |
13 | 17 |
14 typedef StreamParser::TrackId TrackId; | 18 typedef StreamParser::TrackId TrackId; |
15 typedef StreamParser::BufferQueue BufferQueue; | 19 typedef StreamParser::BufferQueue BufferQueue; |
16 typedef StreamParser::TextBufferQueueMap TextBufferQueueMap; | 20 typedef StreamParser::TextBufferQueueMap TextBufferQueueMap; |
17 | 21 |
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 VerifyMergeSuccess(expected, true); | 375 VerifyMergeSuccess(expected, true); |
372 | 376 |
373 // But appending something with a lower timestamp than the last timestamp | 377 // But appending something with a lower timestamp than the last timestamp |
374 // in the pre-existing merge result should fail. | 378 // in the pre-existing merge result should fail. |
375 int more_audio_timestamps[] = { 106, kEnd }; | 379 int more_audio_timestamps[] = { 106, kEnd }; |
376 GenerateAudioBuffers(more_audio_timestamps); | 380 GenerateAudioBuffers(more_audio_timestamps); |
377 VerifyMergeFailure(); | 381 VerifyMergeFailure(); |
378 } | 382 } |
379 | 383 |
380 } // namespace media | 384 } // namespace media |
OLD | NEW |