Fix Android build after r119851

media/webm/webm_cluster_parser.cc

 // Copyright (c) 2012 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/webm/webm_cluster_parser.h"
 
 #include "base/logging.h"
 #include "media/base/data_buffer.h"
+#include "media/webm/webm_constants.h"
+
+#if !defined(OS_ANDROID)
 #include "media/ffmpeg/ffmpeg_common.h"
-#include "media/webm/webm_constants.h"
+
+// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+// padded with this value.
+#define INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
+#else
+// Since FFmpeg is not available on Android, align the value with the setting
+// in libavcodec's avcodec.h.
+#define INPUT_BUFFER_PADDING_SIZE 16

[acolwell GONE FROM CHROMIUM, 2012/01/31 16:30:43]

Since you're not compiling webm_stream_parser.cc for Android, it might be better
to just add this file to the 'sources not to build' list in media/media.gyp for
now. 

In the future we should probably add a USES_FFMPEG type define for this sort of
thing instead of an OS specific one. When that day comes the padding for the
non-FFmpeg case will be 0 because this is only here because FFmpeg expects it. 

+#endif
 
 namespace media {
 
 static Buffer* CreateBuffer(const uint8* data, size_t size) {
-  // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
-  // padded with this value.
-  scoped_array<uint8> buf(new uint8[size + FF_INPUT_BUFFER_PADDING_SIZE]);
+  scoped_array<uint8> buf(new uint8[size + INPUT_BUFFER_PADDING_SIZE]);
   memcpy(buf.get(), data, size);
-  memset(buf.get() + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+  memset(buf.get() + size, 0, INPUT_BUFFER_PADDING_SIZE);
   return new DataBuffer(buf.Pass(), size);
 }
 
 WebMClusterParser::WebMClusterParser(int64 timecode_scale,
                                      int audio_track_num,
                                      base::TimeDelta audio_default_duration,
                                      int video_track_num,
                                      base::TimeDelta video_default_duration)
     : timecode_multiplier_(timecode_scale / 1000.0),
       audio_track_num_(audio_track_num),
@@ skipping 105 matching lines @@
     DVLOG(1) << "Got SimpleBlock timecode is not strictly monotonically "
              << "increasing for track " << track_num;
     return false;
   }
 
   queue->push_back(buffer);
   return true;
 }
 
 }  // namespace media