Upstream: Media implementation for Android.

media/base/test_data_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/test_data_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+
+#if !defined(OS_ANDROID)
 #include "media/ffmpeg/ffmpeg_common.h"
+#else
+#define FF_INPUT_BUFFER_PADDING_SIZE 16
+#endif
 
 namespace media {
 
 void ReadTestDataFile(const std::string& name, scoped_array<uint8>* buffer,

[scherkus (not reviewing), 2011/11/29 20:00:28]

which media unit tests require these methods but not ffmpeg?

perhaps you should be excluding those unit tests (and this file) as well if
they're not needed

[michaelbai, 2011/11/30 17:20:34]

Removed this file

                       int* size) {
   FilePath file_path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
 
   file_path = file_path.Append(FILE_PATH_LITERAL("media"))
       .Append(FILE_PATH_LITERAL("test"))
       .Append(FILE_PATH_LITERAL("data"))
       .AppendASCII(name);
 
   int64 tmp = 0;
@@ skipping 14 matching lines @@
 }
 
 void ReadTestDataFile(const std::string& name, scoped_refptr<Buffer>* buffer) {
   scoped_array<uint8> buf;
   int buf_size;
   ReadTestDataFile(name, &buf, &buf_size);
   *buffer = new DataBuffer(buf.release(), buf_size);
 }
 
 }  // namespace media