summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-01-04 14:42:56 -0800
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2013-01-04 14:42:56 -0800
commit8143dbcc451e127400e50296fa78e0e2171d41d9 (patch)
treeab59a062f79e11fe2593b66796dab01ae64e0b67
parentd54fa82a944f1977fd7ba05e4a875e0d58437ec4 (diff)
parentab11255629afb4c80ad31b23668c1a091243ee6a (diff)
downloadframeworks_av-8143dbcc451e127400e50296fa78e0e2171d41d9.zip
frameworks_av-8143dbcc451e127400e50296fa78e0e2171d41d9.tar.gz
frameworks_av-8143dbcc451e127400e50296fa78e0e2171d41d9.tar.bz2
Merge "exynos4: Part of Netflix fix" into cm-10.1
-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;