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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mkv/fileformat mkv_file_format.cpp,
From:       zlin () helixcommunity ! org
Date:       2011-03-30 10:13:10
Message-ID: 201103301012.p2UACsSL019913 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/mkv/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25036

Modified Files:
      Tag: hxclient_3_6_5_atlas
	mkv_file_format.cpp 
Log Message:
Project: RealPlayer for Android Smartphones

Synopsis: Per customer's request, add below specified error code as user code in \
report function, which will be reported to Android framework. 1. HXR_FMT_AC3_IN_MKV \
(AC3 stream in MKV) 2. HXR_FMT_DTS_IN_MKV (DTS stream in MKV)
3. HXR_FMT_AC3_IN_AVI (AC3 stream in AVI)
4. HXR_FMT_MPEG2 (MPEG2 codec)
5. HXR_FMT_MULTI_CHANNEL (Multi-channel audio in aac/mp3)

Files Modified:
avistrm.cpp
hxaudply.cpp
hxresult.h
mkv_file_format.cpp
mkv_file_format_dll.cpp
rmpgff.cpp

Platforms and Profiles Affected:
Platform: hxclient_3_6_2_atlas
Profile: helix-client-android-ful


Index: mkv_file_format.cpp
===================================================================
RCS file: /cvsroot/datatype/mkv/fileformat/mkv_file_format.cpp,v
retrieving revision 1.1.1.1.2.1.6.3.4.2
retrieving revision 1.1.1.1.2.1.6.3.4.3
diff -u -d -r1.1.1.1.2.1.6.3.4.2 -r1.1.1.1.2.1.6.3.4.3
--- mkv_file_format.cpp	1 Mar 2011 10:03:29 -0000	1.1.1.1.2.1.6.3.4.2
+++ mkv_file_format.cpp	30 Mar 2011 10:13:07 -0000	1.1.1.1.2.1.6.3.4.3
@@ -54,6 +54,9 @@
 
 #include "hxheap.h"
 #include "hxprefutil.h"
+#ifdef HELIX_PRODUCT_LENOVO_LEPHONE_TD                       
+#include "hxerror.h"
+#endif
 
 #ifdef _DEBUG
 #undef HX_THIS_FILE
@@ -74,6 +77,7 @@
 #define MKV_AAC_MIMETYPE "A_AAC"
 #define MKV_AAC3_MIMETYPE "A_AC3"
 #define HELIX_AAC_MIMETYPE "audio/X-HX-AAC-GENERIC"
+#define MKV_ADTS_MIMETYPE "A_DTS"
 
 
 #define DEFAULT_RTP_SAMPLES 90000
@@ -406,6 +410,27 @@
 
 	if (trk)
 	{
+#ifdef HELIX_PRODUCT_LENOVO_LEPHONE_TD                       
+                if(!strncmp(trk->pszCodec, MKV_AAC3_MIMETYPE, \
strlen(MKV_AAC3_MIMETYPE)) || +                   !strncmp(trk->pszCodec, \
MKV_ADTS_MIMETYPE, strlen(MKV_ADTS_MIMETYPE))) +                {
+                    IHXErrorMessages* pErrorMessages = NULL;
+                    HX_RESULT ret = m_pContext->QueryInterface(IID_IHXErrorMessages, \
(void **) &pErrorMessages); +                    if (SUCCEEDED(ret))
+                    {
+                        if (!strncmp(trk->pszCodec, MKV_AAC3_MIMETYPE, \
strlen(MKV_AAC3_MIMETYPE))) +                        {
+                            pErrorMessages->Report(HXLOG_ERR, HXR_UNSUPPORTED_VIDEO, \
HXR_FMT_AC3_IN_MKV, NULL, NULL); +                        }
+                        else if (!strncmp(trk->pszCodec, MKV_ADTS_MIMETYPE, \
strlen(MKV_ADTS_MIMETYPE))) +                        {
+                            pErrorMessages->Report(HXLOG_ERR, HXR_UNSUPPORTED_VIDEO, \
HXR_FMT_DTS_IN_MKV, NULL, NULL); +                        }
+                    }
+                    HX_RELEASE(pErrorMessages);
+                    return HXR_UNSUPPORTED_VIDEO;
+                }
+#endif
 		// Create an IHXValues header
 		IHXValues* pHdr = NULL;
 		retVal = CreateValuesCCF(pHdr, m_pContext);
@@ -431,7 +456,7 @@
 			{
 			    pszMimeType = MkvUnknownMimeType[trk->type];
 			}
-			
+
 			SetCStringPropertyCCF(pHdr, "MimeType", pszMimeType , m_pContext);
 
 			SetTypeSpecificProperties(pHdr, trk);
@@ -886,6 +911,14 @@
 
 	UINT64 uTimeCode = 0;
 	HXBOOL bKey = FALSE;
+
+	if(m_pMKVHandle->NonSeekable())
+	{
+		//no cues for thumbnail seek issue
+		m_pFormatResponse->SeekDone(HXR_OK);
+		return HXR_OK;
+	}
+
 	FlushQ();
 	m_bStreamDone = false;
 	m_ulAdjustedPresentationVideoTime = 0;
@@ -1041,7 +1074,7 @@
 	if (!strncmp(mT, MkvToHelixMimeTypeMap[0][0], strlen(MkvToHelixMimeTypeMap[0][0])))
 	{
 		pExtraData += 16; // Skip until codec info available.
-		char msType[4];
+                char msType[32]={0};
 		memcpy (msType, pExtraData, 4);
 
 		for (UINT8 i = 0; i < SizeOfMSMimeTypeMap; i++)


_______________________________________________
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]