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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] aac/fileformat aacff.cpp,1.33.2.2,1.33.2.2.4.1
From:       yuanzhang () helixcommunity ! org
Date:       2012-08-21 3:02:56
[Download RAW message or body]

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

Modified Files:
      Tag: macrealplayer_cartwheel_rpspgold
	aacff.cpp 
Log Message:
fix bug macrp 406828


Index: aacff.cpp
===================================================================
RCS file: /cvsroot/datatype/aac/fileformat/aacff.cpp,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.2.4.1
diff -u -d -r1.33.2.2 -r1.33.2.2.4.1
--- aacff.cpp	14 Oct 2009 16:41:41 -0000	1.33.2.2
+++ aacff.cpp	21 Aug 2012 03:02:48 -0000	1.33.2.2.4.1
@@ -37,6 +37,7 @@
  */
 #include "hxtypes.h"
 #include "hxcom.h"
+#include "hxerror.h"
 #include "hxplugn.h"
 #include "ihxpckts.h"
 #include "hxformt.h"
@@ -753,8 +754,32 @@
                 }
                 else 
                 {
-		    HXLOGL2(HXLOG_AACF, "PacketReady status=HXR_INVALID_FILE");
-                    retVal = m_pFormatResponse->PacketReady(HXR_INVALID_FILE, NULL);
+					//files ripped as aac from CDs sometimes have "APE" Tag tacked at the end of file.
+					if ((m_pHeader[0] == 0x41) && (m_pHeader[1] == 0x50) && (m_pHeader[2] == 0x45))
+					{
+						HXLOGL2(HXLOG_AACF, "StreamDone stream=0");
+						retVal = m_pFormatResponse->StreamDone(0);
+					}
+					else
+					{
+						HXLOGL2(HXLOG_AACF, "PacketReady status=HXR_INVALID_FILE");
+						retVal = m_pFormatResponse->PacketReady(HXR_INVALID_FILE, NULL);
+						retVal = m_pFormatResponse->StreamDone(0);
+
+						/*if (m_pContext)
+						{
+							// QI for IHXErrorMessages
+							IHXErrorMessages* pErrMsg = NULL;
+							HX_RESULT rv = m_pContext->QueryInterface(IID_IHXErrorMessages, (void**) &pErrMsg);
+							if (SUCCEEDED(rv))
+							{
+								// Report the error
+								pErrMsg->Report(HXLOG_ERR, HXR_INVALID_FILE, 0, NULL, NULL);
+							}
+							HX_RELEASE(pErrMsg);
+						}*/
+
+					}
                 }
                 break;
             }


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