[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] omx/common/android/4.0 CBaseOmxDec_TI_4.0.cpp, 1.1.2.1, 1.1.2.1.4.1
From:       shuohuang () helixcommunity ! org
Date:       2012-03-29 9:49:17
[Download RAW message or body]

Update of /cvsroot/datatype/omx/common/android/4.0
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16602/datatype/omx/common/android/4.0

Modified Files:
      Tag: hxclient_3_6_1_raja
	CBaseOmxDec_TI_4.0.cpp 
Log Message:
Synopsis: checkin local patch files for 361 raja branch.
Bug 14812:              Checkin local patch files to 361_raja branch

File added:
    common/fileio/fdbufdataf.cpp
    common/fileio/fdbufdataf.h
    common/include/platform.h
    datatype/ape/renderer/aperend.cpp
    datatype/avi/fileformat/aviffpln.cpp
    datatype/avi/fileformat/avistrm.cpp
    datatype/avi/fileformat/pub/aviffpln.h
    datatype/flac/renderer/flacrend.cpp
    datatype/flash/flv/fileformat/flv_file_format.cpp
    datatype/h261/renderer/config.h
    datatype/mkv/fileformat/mkv_file_format.cpp
    datatype/mkv/libmatroska/Matroska.cpp
    datatype/mkv/libmatroska/libebml/src/EbmlUnicodeString.cpp
    datatype/mp4/fileformat/qtatmmgs.cpp
    datatype/mp4/fileformat/qttrack.cpp
    datatype/mp4/fileformat/pub/qtatoms.h
    datatype/mp4/video/renderer/mp4vdfmt.cpp
    datatype/mpg/common/xmdplugincommon.h
    datatype/mpg/fileformat/Umakefil
    datatype/mpg/fileformat/rmpgff.cpp
    datatype/mpg/fileformat/rmpgff.h
    datatype/mpg/fileformat/xmddemuxer.cpp
    datatype/mpg/fileformat/xmddemuxer.h
    datatype/mpg/renderer/mpgvideo.cpp
    datatype/mpg/renderer/mpgvideo.h
    datatype/mpg/renderer/mpgvidfmt.cpp
    datatype/null/renderer/nullrend.cpp
    datatype/omx/common/android/4.0/CBaseOmxDec_TI_4.0.cpp
    datatype/omx/video/decoder/COmxVideoDec.cpp
    datatype/omx/video/decoder/COmxVideoDec.h
    filesystem/local/full/smplfsys.cpp
    player/kit/android/hxplatformobj.cpp
    player/kit/android/hxplatformobj.h
    player/kit/android/4.0/MetaDataDriver.cpp
    player/kit/android/4.0/PlayerDriver.cpp
    player/kit/android/4.0/mediascanner.cpp
    video/sitelib/platform/unix/android/4.0/miniandroidsurf_4.cpp



Index: CBaseOmxDec_TI_4.0.cpp
===================================================================
RCS file: /cvsroot/datatype/omx/common/android/4.0/Attic/CBaseOmxDec_TI_4.0.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.4.1
diff -u -d -r1.1.2.1 -r1.1.2.1.4.1
--- CBaseOmxDec_TI_4.0.cpp	16 Feb 2012 19:05:15 -0000	1.1.2.1
+++ CBaseOmxDec_TI_4.0.cpp	29 Mar 2012 09:49:14 -0000	1.1.2.1.4.1
@@ -67,6 +67,8 @@
 #include "HardwareAPI.h"
 #include <surfaceflinger/Surface.h>
 
+#include "hxprefs.h"
+#include "hxcore.h"
 
 #define LOG_TAG "OMXV"
 #include "utils/Log.h"
@@ -489,6 +491,18 @@
     m_pContext = pUnknown;
     m_pContext->AddRef();
 
+    IHXPreferences* pPreferences = NULL;
+    m_pContext->QueryInterface(IID_IHXPreferences, (void **)&pPreferences);
+    if( NULL != pPreferences )
+    {
+        IHXBuffer* pBuffer = NULL;
+        if (HXR_OK == CreateAndSetBufferCCF(pBuffer, (UCHAR*)"1", 2, m_pContext))
+        {
+            pPreferences->WritePref("OMXV",pBuffer);
+        }
+        HX_RELEASE(pBuffer);
+    }
+
     m_pContext->QueryInterface(IID_IHXCommonClassFactory, (void**)&m_pCCF);
     CheckError(m_pContext)
 
@@ -562,7 +576,14 @@
         {
             void* pSurface = NULL;
             pSurfaceQuery->GetVideoSurface((void**)&pSurface);
+			if(pSurface)
             m_spNativeWindow = (SurfaceTextureClient*)pSurface;
+			else
+			{
+					HX_RELEASE(pSurfaceQuery);
+					HX_RELEASE(pSiteSupplier);
+					return HXR_FAIL;
+			}
         }
         HX_RELEASE(pSurfaceQuery);
     }


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]