OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "media/base/audio_splicer.h" | 5 #include "media/base/audio_splicer.h" |
6 | 6 |
| 7 #include <stdint.h> |
| 8 |
7 #include <cstdlib> | 9 #include <cstdlib> |
8 #include <deque> | 10 #include <deque> |
9 | 11 |
10 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/macros.h" |
11 #include "media/base/audio_buffer.h" | 14 #include "media/base/audio_buffer.h" |
12 #include "media/base/audio_bus.h" | 15 #include "media/base/audio_bus.h" |
13 #include "media/base/audio_decoder_config.h" | 16 #include "media/base/audio_decoder_config.h" |
14 #include "media/base/audio_timestamp_helper.h" | 17 #include "media/base/audio_timestamp_helper.h" |
15 #include "media/base/media_log.h" | 18 #include "media/base/media_log.h" |
16 #include "media/base/vector_math.h" | 19 #include "media/base/vector_math.h" |
17 | 20 |
18 namespace media { | 21 namespace media { |
19 | 22 |
20 namespace { | 23 namespace { |
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
548 AccurateTrimStart(frames_to_trim, remainder, output_ts_helper); | 551 AccurateTrimStart(frames_to_trim, remainder, output_ts_helper); |
549 CHECK(output_sanitizer_->AddInput(remainder)); | 552 CHECK(output_sanitizer_->AddInput(remainder)); |
550 } | 553 } |
551 | 554 |
552 // Transfer all remaining buffers out and reset once empty. | 555 // Transfer all remaining buffers out and reset once empty. |
553 CHECK(post_splice_sanitizer_->DrainInto(output_sanitizer_.get())); | 556 CHECK(post_splice_sanitizer_->DrainInto(output_sanitizer_.get())); |
554 post_splice_sanitizer_->Reset(); | 557 post_splice_sanitizer_->Reset(); |
555 } | 558 } |
556 | 559 |
557 } // namespace media | 560 } // namespace media |
OLD | NEW |