diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 01:23:58 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 01:23:58 +0000 |
| commit | db64fc3c269b8bcab976c21735437855a3c95637 (patch) | |
| tree | c8ead48f6594374077a9e0bb11afb08b7876fad9 /media/base | |
| parent | cae0e51976085db08f0f52266a864bfa439fe802 (diff) | |
| download | chromium_src-db64fc3c269b8bcab976c21735437855a3c95637.zip chromium_src-db64fc3c269b8bcab976c21735437855a3c95637.tar.gz chromium_src-db64fc3c269b8bcab976c21735437855a3c95637.tar.bz2 | |
Write tests for FFmpegAudioDecoder so I can rewrite the class sans regressions.
TEST=media_unittests
BUG=96773
Review URL: http://codereview.chromium.org/7891050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/test_data_util.cc | 6 | ||||
| -rw-r--r-- | media/base/test_data_util.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc index fc30744..45a3735 100644 --- a/media/base/test_data_util.cc +++ b/media/base/test_data_util.cc @@ -7,6 +7,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" +#include "media/ffmpeg/ffmpeg_common.h" namespace media { @@ -24,8 +25,11 @@ void ReadTestDataFile(const std::string& name, scoped_array<uint8>* buffer, CHECK(file_util::GetFileSize(file_path, &tmp)) << "Failed to get file size for '" << name << "'"; + // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are + // padded. Since most of our test data is passed to FFmpeg, it makes sense + // to do the padding here instead of scattering it around test code. int file_size = static_cast<int>(tmp); - buffer->reset(new uint8[file_size]); + buffer->reset(new uint8[file_size + FF_INPUT_BUFFER_PADDING_SIZE]); CHECK(file_size == file_util::ReadFile(file_path, reinterpret_cast<char*>(buffer->get()), diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h index 42878ae..f57b39d 100644 --- a/media/base/test_data_util.h +++ b/media/base/test_data_util.h @@ -23,7 +23,7 @@ void ReadTestDataFile(const std::string& name, scoped_array<uint8>* buffer, int* size); -// Reads a test file from media/test/data directory and stored it in +// Reads a test file from media/test/data directory and stores it in // a Buffer. // // |name| - The name of the file. |