wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 989203 - Fix and suppress some Android gcc warnings in media/omx-plugin/ directory. r=cajbir

Browse Source
This commit is contained in:
Chris Peterson 2014-03-27 23:34:49 -04:00
parent fa2f80dbdc
commit 098c0f584c
6 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/omx-plugin/OmxPlugin.cpp
View File

@ -277,7 +277,7 @@ enum ColorFormatSupport {
static ColorFormatSupport
IsColorFormatSupported(OMX_COLOR_FORMATTYPE aColorFormat)
{
switch (aColorFormat) {
switch (static_cast<int>(aColorFormat)) {
case OMX_COLOR_FormatCbYCrY:
case OMX_COLOR_FormatYUV420Planar:
case OMX_COLOR_FormatYUV420SemiPlanar:
@ -346,7 +346,7 @@ FindPreferredDecoderAndColorFormat(const sp<IOMX>& aOmx,
if (supported) {
strncpy(aDecoderName, caps.mComponentName.string(), aDecoderLen);
*aColorFormat = (OMX_COLOR_FORMATTYPE)color;
*aColorFormat = color;
found = true;
}
@ -727,7 +727,7 @@ void OmxDecoder::ToVideoFrame_YUV420SemiPlanar(VideoFrame *aFrame, int64_t aTime
// to see if the video size patches the raw width and height. If so we can
// use those figures instead.
if (aSize == mVideoWidth * mVideoHeight * 3 / 2) {
if (static_cast<int>(aSize) == mVideoWidth * mVideoHeight * 3 / 2) {
videoStride = mVideoWidth;
videoSliceHeight = mVideoHeight;
}

3
media/omx-plugin/froyo/moz.build
View File

@ -20,3 +20,6 @@ LOCAL_INCLUDES += [
# Don't use STL wrappers; this isn't Gecko code
DISABLE_STL_WRAPPING = True
# Suppress warnings in third-party code.
CXXFLAGS += ['-Wno-multichar']

3
media/omx-plugin/gb/moz.build
View File

@ -20,3 +20,6 @@ LOCAL_INCLUDES += [
# Don't use STL wrappers; this isn't Gecko code
DISABLE_STL_WRAPPING = True
# Suppress warnings in third-party code.
CXXFLAGS += ['-Wno-multichar']

3
media/omx-plugin/gb235/moz.build
View File

@ -20,3 +20,6 @@ LOCAL_INCLUDES += [
# Don't use STL wrappers; this isn't Gecko code
DISABLE_STL_WRAPPING = True
# Suppress warnings in third-party code.
CXXFLAGS += ['-Wno-multichar']

3
media/omx-plugin/hc/moz.build
View File

@ -20,3 +20,6 @@ LOCAL_INCLUDES += [
# Don't use STL wrappers; this isn't Gecko code
DISABLE_STL_WRAPPING = True
# Suppress warnings in third-party code.
CXXFLAGS += ['-Wno-multichar']

3
media/omx-plugin/kk/moz.build
View File

@ -20,3 +20,6 @@ LOCAL_INCLUDES += [
# Don't use STL wrappers; this isn't Gecko code
DISABLE_STL_WRAPPING = True
# Suppress warnings in third-party code.
CXXFLAGS += ['-Wno-multichar']