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/base/audio_splicer.h | |
| 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/base/audio_splicer.h')
| -rw-r--r-- | media/base/audio_splicer.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/media/base/audio_splicer.h b/media/base/audio_splicer.h index c20ecc09a7..ce961d7a99 100644 --- a/media/base/audio_splicer.h +++ b/media/base/audio_splicer.h @@ -8,6 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" +#include "media/audio/audio_parameters.h" #include "media/base/media_export.h" namespace media { @@ -57,14 +58,17 @@ class MEDIA_EXPORT AudioSplicer { // |max_crossfade_duration_|. // // |pre_splice_sanitizer_| will be empty after this operation. - scoped_ptr<AudioBus> ExtractCrossfadeFromPreSplice(); + scoped_ptr<AudioBus> ExtractCrossfadeFromPreSplice( + scoped_refptr<AudioBuffer>* crossfade_buffer); - // Crossfades |pre_splice_bus->frames()| frames from |post_splice_sanitizer_| + // Crossfades |pre_splice_bus->frames()| frames from + // |post_splice_sanitizer_| // with those from |pre_splice_bus|. Adds the crossfaded buffer to // |output_sanitizer_| along with all buffers in |post_splice_sanitizer_|. // // |post_splice_sanitizer_| will be empty after this operation. - void CrossfadePostSplice(scoped_ptr<AudioBus> pre_splice_bus); + void CrossfadePostSplice(scoped_ptr<AudioBus> pre_splice_bus, + scoped_refptr<AudioBuffer> crossfade_buffer); const base::TimeDelta max_crossfade_duration_; base::TimeDelta splice_timestamp_; |