summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Dodd <atd7@cornell.edu>2013-01-03 23:16:44 -0500
committerAndrew Dodd <atd7@cornell.edu>2013-01-04 17:38:17 -0500
commitab11255629afb4c80ad31b23668c1a091243ee6a (patch)
treea18e1e051b09feb5c4ff0f4e3f517a65a886dfb6
parent2fa0f79025df3193bc4353a82206baf4bd3e6e9f (diff)
downloadframeworks_av-ab11255629afb4c80ad31b23668c1a091243ee6a.zip
frameworks_av-ab11255629afb4c80ad31b23668c1a091243ee6a.tar.gz
frameworks_av-ab11255629afb4c80ad31b23668c1a091243ee6a.tar.bz2
exynos4: Part of Netflix fix
codeworkx pulled the Samsung colorformat patch from Insignal's exynos-jb branch, which is an invalid source for exynos4 patches. It was checking for an OMX codec name that didn't exist. This still doesn't stop Netflix JPlayer failing in 10.1, but does fix Netflix failing if you disable JPlayer by convincing it that it's on an older Android version. Change-Id: Ia55878dc08f81e2900307558e35c4e0c5b9cac2f
-rw-r--r--media/libstagefright/ACodec.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 37b2271..20bdc32 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -673,7 +673,8 @@ status_t ACodec::allocateOutputBuffersFromNativeWindow() {
void ACodec::setNativeWindowColorFormat(OMX_COLOR_FORMATTYPE &eNativeColorFormat)
{
// In case of Samsung decoders, we set proper native color format for the Native Window
- if (!strcasecmp(mComponentName.c_str(), "OMX.Exynos.AVC.Decoder")) {
+ if (!strcasecmp(mComponentName.c_str(), "OMX.SEC.AVC.Decoder")
+ || !strcasecmp(mComponentName.c_str(), "OMX.SEC.FP.AVC.Decoder")) {
switch (eNativeColorFormat) {
case OMX_COLOR_FormatYUV420SemiPlanar:
eNativeColorFormat = (OMX_COLOR_FORMATTYPE)HAL_PIXEL_FORMAT_YCbCr_420_SP;