Bug 797225 - Part 1: Add an OmxPlugin namespace so we can add local definitions of OMX_COLOR enums that are only defined by some toolchains. r=doublec

--HG--
extra : rebase_source : 5d001667b86b4d5f35928b9997d3672b1beb6ba5
This commit is contained in:
Chris Peterson 2012-09-24 12:31:29 -07:00
parent a54c38a647
commit 272a937e19

View File

@ -104,6 +104,11 @@ status_t MediaStreamSource::getSize(off64_t *size)
using namespace android;
namespace OmxPlugin {
const int OMX_QCOM_COLOR_FormatYVU420PackedSemiPlanar32m4ka = 0x7FA30C01;
const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00;
class OmxDecoder {
PluginHost *mPluginHost;
Decoder *mDecoder;
@ -590,9 +595,6 @@ void OmxDecoder::ToVideoFrame_YVU420PackedSemiPlanar32m4ka(VideoFrame *aFrame, i
}
bool OmxDecoder::ToVideoFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00;
const int OMX_QCOM_COLOR_FormatYVU420PackedSemiPlanar32m4ka = 0x7FA30C01;
switch (mVideoColorFormat) {
case OMX_COLOR_FormatYUV420Planar: // e.g. Asus Transformer, Stagefright's software decoder
ToVideoFrame_YUV420Planar(aFrame, aTimeUs, aData, aSize, aKeyFrame);
@ -831,8 +833,10 @@ static bool CreateDecoder(PluginHost *aPluginHost, Decoder *aDecoder, const char
return true;
}
} // namespace OmxPlugin
// Export the manifest so MPAPI can find our entry points.
Manifest MOZ_EXPORT_DATA(MPAPI_MANIFEST) {
CanDecode,
CreateDecoder
OmxPlugin::CanDecode,
OmxPlugin::CreateDecoder
};