diff options
Diffstat (limited to 'chromium/media/base/test_helpers.h')
| -rw-r--r-- | chromium/media/base/test_helpers.h | 66 |
1 files changed, 24 insertions, 42 deletions
diff --git a/chromium/media/base/test_helpers.h b/chromium/media/base/test_helpers.h index 872d08d6f8d..8dc38958f5d 100644 --- a/chromium/media/base/test_helpers.h +++ b/chromium/media/base/test_helpers.h @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" +#include "media/base/channel_layout.h" #include "media/base/pipeline_status.h" #include "media/base/sample_format.h" #include "media/base/video_decoder_config.h" @@ -85,51 +86,32 @@ class TestVideoConfig { }; // Create an AudioBuffer containing |frames| frames of data, where each sample -// is of type T. Each frame will have the data from |channels| channels -// interleaved. |start| and |increment| are used to specify the values for the -// samples. Since this is interleaved data, channel 0 data will be: -// |start| -// |start| + |channels| * |increment| -// |start| + 2 * |channels| * |increment|, and so on. -// Data for subsequent channels is similar. No check is done that |format| -// requires data to be of type T, but it is verified that |format| is an -// interleaved format. +// is of type T. |start| and |increment| are used to specify the values for the +// samples, which are created in channel order. The value for frame and channel +// is determined by: // -// |start_time| will be used as the start time for the samples. |duration| is -// the duration. -template <class T> -scoped_refptr<AudioBuffer> MakeInterleavedAudioBuffer( - SampleFormat format, - int channels, - T start, - T increment, - int frames, - base::TimeDelta start_time, - base::TimeDelta duration); - -// Create an AudioBuffer containing |frames| frames of data, where each sample -// is of type T. Since this is planar data, there will be a block for each of -// |channel| channels. |start| and |increment| are used to specify the values -// for the samples, which are created in channel order. Since this is planar -// data, channel 0 data will be: -// |start| -// |start| + |increment| -// |start| + 2 * |increment|, and so on. -// Data for channel 1 will follow where channel 0 ends. Subsequent channels are -// similar. No check is done that |format| requires data to be of type T, but it -// is verified that |format| is a planar format. +// |start| + |channel| * |frames| * |increment| + index * |increment| // -// |start_time| will be used as the start time for the samples. |duration| is -// the duration. +// E.g., for a stereo buffer the values in channel 0 will be: +// start +// start + increment +// start + 2 * increment, ... +// +// While, values in channel 1 will be: +// start + frames * increment +// start + (frames + 1) * increment +// start + (frames + 2) * increment, ... +// +// |start_time| will be used as the start time for the samples. template <class T> -scoped_refptr<AudioBuffer> MakePlanarAudioBuffer( - SampleFormat format, - int channels, - T start, - T increment, - int frames, - base::TimeDelta start_time, - base::TimeDelta duration); +scoped_refptr<AudioBuffer> MakeAudioBuffer(SampleFormat format, + ChannelLayout channel_layout, + size_t channel_count, + int sample_rate, + T start, + T increment, + size_t frames, + base::TimeDelta timestamp); // Create a fake video DecoderBuffer for testing purpose. The buffer contains // part of video decoder config info embedded so that the testing code can do |