Fix Android build after r119851

Fix Android build after r119851

BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=120059

[Peter Beverloo, 2012-01-31 14:16:21]

r119851 broke the Android build, as can be seen here:
http://build.webkit.org/builders/Chromium%20Android%20Release/builds/10004/st...

Since it doesn't use FFmpeg, neither the included file nor the
FF_INPUT_BUFFER_PADDING_SIZE define are available. This definitely is not an
ideal solution and I'm open to suggestions, but both manually defining
FF_INPUT_BUFFER_PADDING_SIZE (namespaced with FF_) as having a random "size +
16" in the code seemed worse, although the latter could be clarified in a
comment.

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

https://chromiumcodereview.appspot.com/9293033/diff/1/media/webm/webm_cluster...
File media/webm/webm_cluster_parser.cc (right):

https://chromiumcodereview.appspot.com/9293033/diff/1/media/webm/webm_cluster...
media/webm/webm_cluster_parser.cc:20: #define INPUT_BUFFER_PADDING_SIZE 16
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.

[Peter Beverloo, 2012-01-31 17:04:43]

On 2012/01/31 16:30:43, acolwell wrote:
>
https://chromiumcodereview.appspot.com/9293033/diff/1/media/webm/webm_cluster...
> File media/webm/webm_cluster_parser.cc (right):
> 
>
https://chromiumcodereview.appspot.com/9293033/diff/1/media/webm/webm_cluster...
> media/webm/webm_cluster_parser.cc:20: #define INPUT_BUFFER_PADDING_SIZE 16
> 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. 
>

I'd prefer to exclude as little files as possible from the build, but it indeed
is the easier approach. Done.

> 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.

It would definitely be better to separate files based on
is-ffmpeg-available-or-not, rather than are-we-on-Android.

[acolwell GONE FROM CHROMIUM, 2012-01-31 17:22:14]

On 2012/01/31 17:04:43, Peter Beverloo wrote:
> On 2012/01/31 16:30:43, acolwell wrote:
> >
>
https://chromiumcodereview.appspot.com/9293033/diff/1/media/webm/webm_cluster...
> > File media/webm/webm_cluster_parser.cc (right):
> > 
> >
>
https://chromiumcodereview.appspot.com/9293033/diff/1/media/webm/webm_cluster...
> > media/webm/webm_cluster_parser.cc:20: #define INPUT_BUFFER_PADDING_SIZE 16
> > 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. 
> >
> 
> I'd prefer to exclude as little files as possible from the build, but it
indeed
> is the easier approach. Done.
> 
> > 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.
> 
> It would definitely be better to separate files based on
> is-ffmpeg-available-or-not, rather than are-we-on-Android.
LGTM

[commit-bot: I haz the power, 2012-01-31 17:23:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/peter@chromium.org/9293033/1002

[commit-bot: I haz the power, 2012-01-31 19:30:47]

Try job failure for 9293033-1002 (retry) on win_rel for step
"content_unittests".
It's a second try, previously, step "content_unittests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2012-02-01 10:57:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/peter@chromium.org/9293033/1002

[commit-bot: I haz the power, 2012-02-01 13:35:39]

Change committed as 120059