[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-dev
Subject: [datatype-dev] RESEND: [Android-port-dev] CR: H.263 HW
From: "Charles Chen" <cchen () real ! com>
Date: 2009-08-19 8:48:40
Message-ID: 03F1295D566849D98E0231B8FB2CBA99 () corp ! real ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Request review from Qiang, Sheldon, Christina.
Synopsis:
Added support for H.263 HW decoder on Qualcomm 8x50 surf board for
Android platform
Summary:
Integrated Helix player on Qualcomm's Android Donut build with H.263
hardware decoder.
Branch:
Head, hxclient_3_1_0_atlas
Platform:
Android Donut
Files modified:
datatype/h263/renderer/umakedll
datatype/h263/renderer/umakelib
datatype/h263/renderer/pub/h263vidfmt.h
datatype/h263/renderer/pub/h263dec.h
datatype/h263/renderer/h263dec.cpp
datatype/h263/renderer/h263video.cpp
datatype/h263/renderer/h263vidfmt.cpp
datatype/h263/codec/h263vdec.h
datatype/omx/video/decoder/hxdec.cpp
datatype/common/container/pub/mdpkt.h
Diffs:
Index: umakedll
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/umakedll,v
retrieving revision 1.8
diff -u -r1.8 umakedll
--- umakedll 6 Jul 2007 22:00:34 -0000 1.8
+++ umakedll 14 Aug 2009 09:02:41 -0000
@@ -58,6 +58,8 @@
"datatype/common/container/pub",
"datatype/common/util/pub",
"datatype/common/vidrend/pub",
+ "datatype/rm/include",
+ "datatype/rm/common/pub",
"datatype/h263/payload/pub",
"datatype/h263/codec");
@@ -72,6 +74,7 @@
"video/vidutil[vidutillib]",
"datatype/common/vidrend",
"datatype/common/util[dtutillib]",
+ "datatype/rm/common[rmcommonlib]",
"common/log/logutil[logutillib]",
"datatype/h263/payload[h263pyldlib]")
Index: umakelib
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/umakelib,v
retrieving revision 1.5
diff -u -r1.5 umakelib
--- umakelib 6 Jul 2007 22:00:34 -0000 1.5
+++ umakelib 14 Aug 2009 09:11:37 -0000
@@ -70,6 +70,8 @@
"datatype/common/container/pub",
"datatype/common/util/pub",
"datatype/common/vidrend/pub",
+ "datatype/rm/include",
+ "datatype/rm/common/pub",
"datatype/h263/payload/pub",
"datatype/h263/codec");
Index: h263vidfmt.h
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/pub/h263vidfmt.h,v
retrieving revision 1.8
diff -u -r1.8 h263vidfmt.h
--- h263vidfmt.h 6 Jul 2007 22:00:35 -0000 1.8
+++ h263vidfmt.h 14 Aug 2009 09:12:55 -0000
@@ -101,6 +101,9 @@
virtual HXBOOL IsBitmapFormatChanged(HXBitmapInfoHeader
&BitmapInfoHeader,
CMediaPacket* pVideoPacket);
+
+ virtual void OnDecodedPacketRelease(CMediaPacket* &pPacket);
+
class H263DecSpecStruct
{
public:
@@ -141,6 +144,7 @@
};
static void KillH263ampleDesc(void* pSampleDesc, void* pUserData);
+ static void KillOutputBuffer(void* pOutputBuffer, void* pUserData);
void _Reset(void);
Index: h263dec.h
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/pub/h263dec.h,v
retrieving revision 1.5
diff -u -r1.5 h263dec.h
--- h263dec.h 6 Jul 2007 22:00:35 -0000 1.5
+++ h263dec.h 14 Aug 2009 09:13:47 -0000
@@ -74,6 +74,7 @@
HXxSize* pFrameDims = NULL);
HX_RESULT CloseDecoder();
+ void ReleaseBuffer(void *pBuffer);
protected:
virtual HXBOOL OS_BuildLibName(char *pLibName,
@@ -90,6 +91,7 @@
FPTRANSFORMINIT m_fpH263Init;
FPTRANSFORMFREE m_fpH263Free;
+ FPTRANSFORMFREEBUFFER m_fpH263FreeBuffer;
FPTRANSFORMHXV10TOYUV m_fpH263Transform;
IUnknown* m_pContext;
Index: h263dec.cpp
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/h263dec.cpp,v
retrieving revision 1.15.2.1
diff -u -r1.15.2.1 h263dec.cpp
--- h263dec.cpp 16 Apr 2009 14:46:17 -0000 1.15.2.1
+++ h263dec.cpp 14 Aug 2009 09:14:35 -0000
@@ -67,6 +67,10 @@
#include "h263vidfmt.h"
#include "hxstrutl.h"
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+#include "OMX_Core.h"
+#endif
+
#include "hxheap.h"
#ifdef _DEBUG
#undef HX_THIS_FILE
@@ -83,6 +87,7 @@
: m_ulPreviousFrameType(0)
, m_fpH263Init(0)
, m_fpH263Free(0)
+ , m_fpH263FreeBuffer(0)
, m_fpH263Transform(0)
, m_pContext(pContext)
, m_pCodecAccess(NULL)
@@ -114,6 +119,7 @@
m_fpH263Init = NULL;
m_fpH263Free = NULL;
m_fpH263Transform = NULL;
+ m_fpH263FreeBuffer = NULL;
HX_DELETE(m_pCodecAccess);
return HXR_OK;
@@ -181,6 +187,7 @@
m_fpH263Init = NULL;
m_fpH263Free = NULL;
m_fpH263Transform = NULL;
+ m_fpH263FreeBuffer = NULL;
}
}
@@ -242,6 +249,13 @@
{
m_ulPreviousFrameType = FRAME_TYPE_I;
}
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+ else if(OutputParams.notes == QCOM_HW_REFERENCE_POINTER)
+ {
+ // Do nothing
+ //LOGD("Got QCOM_HW_REFERENCE_POINTER");
+ }
+#endif
else
{
if (OutputParams.notes & RV_DECODE_B_FRAME)
@@ -354,6 +368,15 @@
return rtn;
}
+void CH263Decoder::ReleaseBuffer(void* pBuffer)
+{
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+ if (m_fpH263FreeBuffer && pBuffer)
+ {
+ m_fpH263FreeBuffer(pBuffer, m_pDecoderState);
+ }
+#endif
+}
HXBOOL CH263Decoder::LoadCodecFunctions()
{
@@ -386,6 +409,10 @@
{
m_fpH263Transform = (FPTRANSFORMHXV10TOYUV)
m_pCodecAccess->getSymbol("HXVtoYUV420Transform");
}
+ if (!m_fpH263FreeBuffer)
+ {
+ m_fpH263FreeBuffer = (FPTRANSFORMFREEBUFFER)
m_pCodecAccess->getSymbol("HXVtoYUV420FreeBuffer");
+ }
if (m_fpH263Init == NULL ||
m_fpH263Free == NULL ||
Index: h263video.cpp
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/h263video.cpp,v
retrieving revision 1.11
diff -u -r1.11 h263video.cpp
--- h263video.cpp 6 Jul 2007 22:00:34 -0000 1.11
+++ h263video.cpp 14 Aug 2009 09:16:00 -0000
@@ -261,7 +261,11 @@
// Now update any H.263-specific defaults. We only need
// to update the bitcount, compression, and image size.
bitmapInfoHeader.biBitCount = H263_PIXEL_SIZE;
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+ bitmapInfoHeader.biCompression = HX_OMXV;
+#else
bitmapInfoHeader.biCompression = H263_PIXEL_FORMAT;
+#endif
bitmapInfoHeader.biSizeImage = (bitmapInfoHeader.biWidth *
bitmapInfoHeader.biHeight *
bitmapInfoHeader.biBitCount + 7) / 8;
Index: h263vidfmt.cpp
===================================================================
RCS file: /cvsroot/datatype/h263/renderer/h263vidfmt.cpp,v
retrieving revision 1.16
diff -u -r1.16 h263vidfmt.cpp
--- h263vidfmt.cpp 6 Jul 2007 22:00:34 -0000 1.16
+++ h263vidfmt.cpp 14 Aug 2009 09:16:58 -0000
@@ -645,6 +645,11 @@
delete pFrameToDecode;
}
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+ pDecodedFrame->SetBufferKiller(KillOutputBuffer);
+ pDecodedFrame->m_pUserData = m_pDecoder;
+#endif
+
return pDecodedFrame;
}
@@ -791,3 +796,30 @@
delete pFrameDims;
}
}
+
+/**************************************************************************
**
+ * Method:
+ * CH263VideoFormat::KillOutputBuffer
+ *
+ */
+void CH263VideoFormat::KillOutputBuffer(void* pOutputBuffer, void*
pUserData)
+{
+ if (pOutputBuffer && pUserData)
+ {
+ CH263Decoder* pDec = (CH263Decoder*)pUserData;
+ pDec->ReleaseBuffer(pOutputBuffer);
+ }
+}
+
+/**************************************************************************
**
+ * Method:
+ * CH263VideoFormat::OnDecodedPacketRelease
+ *
+ */
+void CH263VideoFormat::OnDecodedPacketRelease(CMediaPacket* &pPacket)
+{
+ pPacket->KillBuffer();
+
+ CVideoFormat::OnDecodedPacketRelease(pPacket);
+}
+
Index: h263vdec.h
===================================================================
RCS file: /cvsroot/datatype/h263/codec/h263vdec.h,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 h263vdec.h
--- h263vdec.h 16 Apr 2009 14:43:30 -0000 1.4.2.1
+++ h263vdec.h 14 Aug 2009 09:17:52 -0000
@@ -90,6 +90,13 @@
// Indicates that the decompressed image is a B frame.
// At most one of PIA_DDN_KEY_FRAME and PIA_DDN_B_FRAME will be set.
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+#define QCOM_HW_REFERENCE_POINTER 0x00000010
+ // indicates that the decoded image is from Qualcomm HW
+ // decoder. We will pass the reference pointer back instead of
+ // memcpy to a new buffer
+#endif
+
#ifndef TAG_HXCODEC_SEGMENTINFO
#define TAG_HXCODEC_SEGMENTINFO
typedef struct tag_HXCODEC_SEGMENTINFO
@@ -183,6 +190,7 @@
typedef HX_RESULT (HXEXPORT_PTR FPTRANSFORMINIT)(void * pH263Init,void
**global);
typedef HX_RESULT (HXEXPORT_PTR FPTRANSFORMFREE)(void *global);
+typedef HX_RESULT (HXEXPORT_PTR FPTRANSFORMFREEBUFFER)(void* pBuffer, void
*global);
typedef HX_RESULT (HXEXPORT_PTR FPTRANSFORMHXV10TOYUV)(UCHAR *pH263Packets,
UCHAR *pDecodedFrameBuffer, void *pInputParams,
void *pOutputParams,void *global);
@@ -193,7 +201,7 @@
void *pOutputParams,void *global);
HX_RESULT HXEXPORT ENTRYPOINT(HXVtoYUV420Init) (HXV10_INIT *
pHxv10Init,void **global);
HX_RESULT HXEXPORT ENTRYPOINT(HXVtoYUV420Free) (void *global);
-
+HX_RESULT HXEXPORT ENTRYPOINT(HXVtoYUV420FreeBuffer) (void *pBuffer, void
*global);
#ifdef __cplusplus
} /* Assume C declarations for C++ */
Index: hxdec.cpp
===================================================================
RCS file: /cvsroot/datatype/omx/video/decoder/hxdec.cpp,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 hxdec.cpp
--- hxdec.cpp 26 May 2009 19:52:28 -0000 1.1.2.2
+++ hxdec.cpp 14 Aug 2009 09:18:51 -0000
@@ -58,6 +58,8 @@
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
+#define LOG_TAG "hxdec.cpp"
+#include <utils/Log.h>
#include "hxthread.h"
#include "hxslist.h"
@@ -65,7 +67,7 @@
#include "hxcodec.h"
#include "CBaseOmxDec.h"
#include "COmxVideoDec.h"
-
+#include "hxvsurf.h"
HX_RESULT HXEXPORT
ENTRYPOINT(HXVtoYUV420Init) (HXV10_INIT *pHxvInit, void **decoderState)
@@ -93,6 +95,18 @@
}
HX_RESULT HXEXPORT
+ENTRYPOINT(HXVtoYUV420FreeBuffer) (void* pBuffer, void *global)
+{
+ if (global && pBuffer)
+ {
+LOGD("HXVtoYUV420FreeBuffer(pBuffer=%p)", pBuffer);
+ COMXVideoDec* pDec = ((COMXVideoDec *)(global));
+ pDec->ReUse(pBuffer);
+ }
+ return HXR_OK;
+}
+
+HX_RESULT HXEXPORT
ENTRYPOINT(HXVtoYUV420Free) (void *global)
{
COMXVideoDec* pDec = ((COMXVideoDec *)(global));
@@ -132,33 +146,47 @@
{
if (pBuffer->nFilledLen > 0 && pDecodedFrameBuffer)
{
- if (decFlt->GetOutputFormat() == OMX_COLOR_FormatYUV420Planar)
+ switch (decFlt->GetOutputFormat())
{
+ case OMX_COLOR_FormatYUV420Planar:
memcpy(pDecodedFrameBuffer, pBuffer->pBuffer +
pBuffer->nOffset, pBuffer->nFilledLen);
+ break;
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+ case 0x7fa30c00:
+ // Reference pointer from HW decoder
+ pH263Out->notes = QCOM_HW_REFERENCE_POINTER;
+ *((UINT32*)pDecodedFrameBuffer) = 0x7fa30c00;
+
*((OMX_BUFFERHEADERTYPE**)(pDecodedFrameBuffer+sizeof(UINT32))) = pBuffer;
+ break;
+#endif
+ default:
+ // All other formats are not supported
+ pH263Out->notes = RV_DECODE_DONT_DRAW;
+ break;
}
}
}
if(pBuffer)
{
+ pH263Out->timestamp = pBuffer->nTimeStamp;
decFlt->ReUse(pBuffer);
}
- if(ps!=HXR_OK)
- {
- pH263Out->numFrames = 1;
- pH263Out->notes |= RV_DECODE_DONT_DRAW;
- pH263Out->width = decFlt->m_mofYUV.uiWidth;
- pH263Out->height = decFlt->m_mofYUV.uiHeight;
- // Assign the presentation time for the display frame
- pH263Out->timestamp = pH263In->timestamp++;
- return HXR_OK;
- }
- // Assign the number of frames out
+ if(ps!=HXR_OK)
+ {
+ pH263Out->numFrames = 1;
+ pH263Out->notes |= RV_DECODE_DONT_DRAW;
+ pH263Out->width = decFlt->m_mofYUV.uiWidth;
+ pH263Out->height = decFlt->m_mofYUV.uiHeight;
+ // Assign the presentation time for the display frame
+ pH263Out->timestamp = pH263In->timestamp++;
+ return HXR_OK;
+ }
+
+ // Assign the presentation time for the display frame
pH263Out->numFrames = 1;
- pH263Out->notes = 0;
- pH263Out->width = decFlt->m_mofYUV.uiWidth;
- pH263Out->height = decFlt->m_mofYUV.uiHeight;
- // Assign the presentation time for the display frame
- pH263Out->timestamp = pBuffer->nTimeStamp;
+ pH263Out->width = decFlt->m_mofYUV.uiWidth;
+ pH263Out->height = decFlt->m_mofYUV.uiHeight;
+
return HXR_OK;
}
Index: mdpkt.h
===================================================================
RCS file: /cvsroot/datatype/common/container/pub/mdpkt.h,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 mdpkt.h
--- mdpkt.h 13 Feb 2009 15:29:34 -0000 1.7.2.1
+++ mdpkt.h 14 Aug 2009 09:19:48 -0000
@@ -57,6 +57,9 @@
#include "hxresult.h"
#include "hxassert.h"
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+#include "OMX_Core.h"
+#endif
/***************************************************************************
*
* Globals
@@ -273,6 +276,17 @@
m_fpBufferKiller = fpBufferKiller;
}
+ void KillBuffer()
+ {
+ if (m_fpBufferKiller)
+ {
+#ifdef ANDROID_PRODUCT_qsd8250_surf
+ OMX_BUFFERHEADERTYPE* pOMXBuffer =
*((OMX_BUFFERHEADERTYPE**)(m_pData+sizeof(UINT32)));
+ (*m_fpBufferKiller)(pOMXBuffer, m_pUserData);
+#endif
+ }
+ }
+
static ULONG32 GetBufferSize(CMediaPacket* pPacket)
{
return pPacket->m_ulBufferSize;
No virus found in this incoming message.
Checked by AVG - www.avg.com
Version: 8.5.392 / Virus Database: 270.13.57/2303 - Release Date: 08/14/09
18:10:00
No virus found in this incoming message.
Checked by AVG - www.avg.com
Version: 8.5.392 / Virus Database: 270.13.59/2310 - Release Date: 08/17/09
18:04:00
[Attachment #5 (text/html)]
<html xmlns:v="urn:schemas-microsoft-com:vml" \
xmlns:o="urn:schemas-microsoft-com:office:office" \
xmlns:w="urn:schemas-microsoft-com:office:word" \
xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
<meta name=Generator content="Microsoft Word 11 (filtered medium)">
<style>
<!--
/* Font Definitions */
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"\@SimSun";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman";}
a:link, span.MsoHyperlink
{color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal;
font-family:Arial;
color:windowtext;}
span.EmailStyle18
{mso-style-type:personal;
font-family:Arial;
color:navy;}
span.EmailStyle19
{mso-style-type:personal-reply;
font-family:Arial;
color:navy;}
@page Section1
{size:8.5in 11.0in;
margin:1.0in 1.25in 1.0in 1.25in;}
div.Section1
{page:Section1;}
-->
</style>
<!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=EN-US link=blue vlink=purple>
<div class=Section1>
<p class=MsoNormal><font size=2 color=navy face=Arial><span style='font-size:
10.0pt;font-family:Arial;color:navy'>Request review from Qiang, Sheldon,
Christina.<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 color=navy face=Arial><span style='font-size:
10.0pt;font-family:Arial;color:navy'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 color=navy face=Arial><span style='font-size:
10.0pt;font-family:Arial;color:navy'>Synopsis:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> Added support for
H.263 HW decoder on Qualcomm 8x50 surf board for Android \
platform<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Summary:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> Integrated Helix
player on Qualcomm’s Android Donut build with H.263 hardware \
decoder.<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Branch:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> Head,
hxclient_3_1_0_atlas<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Platform:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> Android \
Donut<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Files modified:<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/renderer/umakedll<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/renderer/umakelib<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/renderer/pub/h263vidfmt.h<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/renderer/pub/h263dec.h<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/renderer/h263dec.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/renderer/h263video.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/renderer/h263vidfmt.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/h263/codec/h263vdec.h<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/omx/video/decoder/hxdec.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal style='margin-left:.5in'><font size=2 face="Courier New"><span
style='font-size:10.0pt;font-family:"Courier \
New"'>datatype/common/container/pub/mdpkt.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Diffs:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: umakedll<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file: \
/cvsroot/datatype/h263/renderer/umakedll,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.8<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.8 umakedll<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- umakedll 6 Jul 2007 22:00:34
-0000 1.8<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ umakedll 14 Aug 2009 09:02:41
-0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -58,6 +58,8 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/container/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/util/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/vidrend/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
"datatype/rm/include",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
"datatype/rm/common/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/h263/payload/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/h263/codec");<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -72,6 +74,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"video/vidutil[vidutillib]",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/vidrend",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/util[dtutillib]",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
"datatype/rm/common[rmcommonlib]",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> &n \
bsp;
"common/log/logutil[logutillib]",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/h263/payload[h263pyldlib]")<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: umakelib<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file: \
/cvsroot/datatype/h263/renderer/umakelib,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.5<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.5 umakelib<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- umakelib 6 Jul 2007 22:00:34
-0000 1.5<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ umakelib 14 Aug 2009 09:11:37
-0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -70,6 +70,8 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/container/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/util/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/common/vidrend/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
"datatype/rm/include",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
"datatype/rm/common/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/h263/payload/pub",<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
"datatype/h263/codec");<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: h263vidfmt.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file:
/cvsroot/datatype/h263/renderer/pub/h263vidfmt.h,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.8<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.8 h263vidfmt.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>---
h263vidfmt.h 6 Jul 2007 22:00:35
-0000 1.8<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++
h263vidfmt.h 14 Aug 2009 09:12:55
-0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -101,6 +101,9 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> virtual HXBOOL
IsBitmapFormatChanged(HXBitmapInfoHeader \
&BitmapInfoHeader,<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> &n \
bsp;
CMediaPacket* pVideoPacket);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ virtual void
OnDecodedPacketRelease(CMediaPacket* &pPacket);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> class \
H263DecSpecStruct<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
public:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -141,6 +144,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> };<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> static void
KillH263ampleDesc(void* pSampleDesc, void* pUserData);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ static void
KillOutputBuffer(void* pOutputBuffer, void* pUserData);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> void \
_Reset(void);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: h263dec.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file:
/cvsroot/datatype/h263/renderer/pub/h263dec.h,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.5<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.5 h263dec.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- h263dec.h 6 Jul 2007 22:00:35
-0000 1.5<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ h263dec.h 14 Aug 2009 09:13:47 \
-0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -74,6 +74,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
HXxSize* pFrameDims = NULL);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> HX_RESULT \
CloseDecoder();<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ void ReleaseBuffer(void
*pBuffer);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> protected:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> virtual HXBOOL
OS_BuildLibName(char *pLibName,<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -90,6 +91,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
FPTRANSFORMINIT
m_fpH263Init;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
FPTRANSFORMFREE
m_fpH263Free;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
FPTRANSFORMFREEBUFFER \
m_fpH263FreeBuffer;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
FPTRANSFORMHXV10TOYUV \
m_fpH263Transform;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
IUnknown*
m_pContext;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: h263dec.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file:
/cvsroot/datatype/h263/renderer/h263dec.cpp,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.15.2.1<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.15.2.1 \
h263dec.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- h263dec.cpp 16 Apr 2009 14:46:17
-0000 1.15.2.1<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ h263dec.cpp 14 Aug 2009 09:14:35 \
-0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -67,6 +67,10 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"h263vidfmt.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"hxstrutl.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#include \
"OMX_Core.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"hxheap.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #ifdef _DEBUG<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #undef HX_THIS_FILE<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -83,6 +87,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> : \
m_ulPreviousFrameType(0)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> , \
m_fpH263Init(0)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> , \
m_fpH263Free(0)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ , \
m_fpH263FreeBuffer(0)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> , \
m_fpH263Transform(0)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> , \
m_pContext(pContext)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> , \
m_pCodecAccess(NULL)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -114,6 +119,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> m_fpH263Init = \
NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> m_fpH263Free = \
NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> m_fpH263Transform = \
NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ m_fpH263FreeBuffer = \
NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
HX_DELETE(m_pCodecAccess);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> return \
HXR_OK;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -181,6 +187,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
m_fpH263Init = NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
m_fpH263Free = \
NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
m_fpH263Transform = NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
m_fpH263FreeBuffer = NULL;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -242,6 +249,13 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
m_ulPreviousFrameType = FRAME_TYPE_I;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ else \
if(OutputParams.notes == QCOM_HW_REFERENCE_POINTER)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ \
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
// Do nothing<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
//LOGD("Got QCOM_HW_REFERENCE_POINTER");<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
else<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> if
(OutputParams.notes & RV_DECODE_B_FRAME)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -354,6 +368,15 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> return \
rtn;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+void CH263Decoder::ReleaseBuffer(void* \
pBuffer)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ if (m_fpH263FreeBuffer
&& pBuffer)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ \
m_fpH263FreeBuffer(pBuffer, m_pDecoderState);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> HXBOOL \
CH263Decoder::LoadCodecFunctions()<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -386,6 +409,10 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> \
m_fpH263Transform = (FPTRANSFORMHXV10TOYUV) \
m_pCodecAccess->getSymbol("HXVtoYUV420Transform");<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ if
(!m_fpH263FreeBuffer)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ \
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ \
m_fpH263FreeBuffer = (FPTRANSFORMFREEBUFFER) \
m_pCodecAccess->getSymbol("HXVtoYUV420FreeBuffer");<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> if
(m_fpH263Init == NULL ||<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> \
m_fpH263Free == NULL ||<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: h263video.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file:
/cvsroot/datatype/h263/renderer/h263video.cpp,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.11<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.11 h263video.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>---
h263video.cpp 6 Jul 2007 22:00:34
-0000 1.11<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ h263video.cpp
14 Aug 2009 09:16:00 -0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -261,7 +261,11 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> // Now update any
H.263-specific defaults. We only need<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> // to update the bitcount,
compression, and image size.<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
bitmapInfoHeader.biBitCount = \
H263_PIXEL_SIZE;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ bitmapInfoHeader.biCompression =
HX_OMXV;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#else<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
bitmapInfoHeader.biCompression = H263_PIXEL_FORMAT;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
bitmapInfoHeader.biSizeImage = (bitmapInfoHeader.biWidth \
*<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> &n \
bsp;
bitmapInfoHeader.biHeight *<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> &n \
bsp;
bitmapInfoHeader.biBitCount + 7) / 8;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: h263vidfmt.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file:
/cvsroot/datatype/h263/renderer/h263vidfmt.cpp,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.16<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.16 h263vidfmt.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- h263vidfmt.cpp 6
Jul 2007 22:00:34 -0000 1.16<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ h263vidfmt.cpp 14
Aug 2009 09:16:58 -0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -645,6 +645,11 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> delete
pFrameToDecode;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pDecodedFrame->SetBufferKiller(KillOutputBuffer);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ pDecodedFrame->m_pUserData =
m_pDecoder;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> return \
pDecodedFrame;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -791,3 +796,30 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> delete \
pFrameDims;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+/****************************************************************************<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ * Method:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ *
CH263VideoFormat::KillOutputBuffer<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ *<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ */<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+void CH263VideoFormat::KillOutputBuffer(void*
pOutputBuffer, void* pUserData)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ if (pOutputBuffer &&
pUserData)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
CH263Decoder* pDec = (CH263Decoder*)pUserData;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pDec->ReleaseBuffer(pOutputBuffer);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+/****************************************************************************<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ * Method:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ *
CH263VideoFormat::OnDecodedPacketRelease<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ *<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ */<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+void \
CH263VideoFormat::OnDecodedPacketRelease(CMediaPacket* \
&pPacket)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ \
pPacket->KillBuffer();<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
CVideoFormat::OnDecodedPacketRelease(pPacket);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: h263vdec.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file: \
/cvsroot/datatype/h263/codec/h263vdec.h,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.4.2.1<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.4.2.1 h263vdec.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- h263vdec.h 16 Apr 2009 14:43:30
-0000 1.4.2.1<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ h263vdec.h 14 Aug 2009 09:17:52 \
-0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -90,6 +90,13 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> // Indicates that the
decompressed image is a B frame.<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> // At most one of
PIA_DDN_KEY_FRAME and PIA_DDN_B_FRAME will be set.<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#define
QCOM_HW_REFERENCE_POINTER
0x00000010<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ // indicates that the decoded
image is from Qualcomm HW<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ // decoder. We will pass the
reference pointer back instead of<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ // memcpy to a new \
buffer<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #ifndef \
TAG_HXCODEC_SEGMENTINFO<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #define \
TAG_HXCODEC_SEGMENTINFO<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> typedef struct \
tag_HXCODEC_SEGMENTINFO<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -183,6 +190,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> typedef HX_RESULT (HXEXPORT_PTR
FPTRANSFORMINIT)(void * pH263Init,void **global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> typedef HX_RESULT (HXEXPORT_PTR
FPTRANSFORMFREE)(void *global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+typedef HX_RESULT (HXEXPORT_PTR
FPTRANSFORMFREEBUFFER)(void* pBuffer, void *global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> typedef HX_RESULT (HXEXPORT_PTR
FPTRANSFORMHXV10TOYUV)(UCHAR *pH263Packets,<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> UCHAR
*pDecodedFrameBuffer, void *pInputParams,<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> void
*pOutputParams,void *global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -193,7 +201,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> void
*pOutputParams,void *global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> HX_RESULT HXEXPORT ENTRYPOINT(HXVtoYUV420Init)
(HXV10_INIT * pHxv10Init,void **global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> HX_RESULT HXEXPORT ENTRYPOINT(HXVtoYUV420Free)
(void *global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>-<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+HX_RESULT HXEXPORT
ENTRYPOINT(HXVtoYUV420FreeBuffer) (void *pBuffer, void \
*global);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #ifdef __cplusplus<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> } /* Assume C
declarations for C++ */<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: hxdec.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file:
/cvsroot/datatype/omx/video/decoder/hxdec.cpp,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.1.2.2<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.1.2.2 hxdec.cpp<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- hxdec.cpp 26 May 2009 19:52:28
-0000 1.1.2.2<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ hxdec.cpp 14 Aug 2009 09:18:51 \
-0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -58,6 +58,8 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> * Contributor(s):<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> *<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> * ***** END LICENSE BLOCK ***** \
*/<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#define LOG_TAG \
"hxdec.cpp"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#include <utils/Log.h><o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"hxthread.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"hxslist.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -65,7 +67,7 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"hxcodec.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"CBaseOmxDec.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"COmxVideoDec.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>-<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#include \
"hxvsurf.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> HX_RESULT HXEXPORT<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> ENTRYPOINT(HXVtoYUV420Init) (HXV10_INIT
*pHxvInit, void **decoderState)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -93,6 +95,18 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> HX_RESULT HXEXPORT<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ENTRYPOINT(HXVtoYUV420FreeBuffer) (void* pBuffer,
void *global)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ if (global && \
pBuffer)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+LOGD("HXVtoYUV420FreeBuffer(pBuffer=%p)",
pBuffer);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
COMXVideoDec* pDec = ((COMXVideoDec *)(global));<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pDec->ReUse(pBuffer);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ return \
HXR_OK;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+HX_RESULT HXEXPORT<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> ENTRYPOINT(HXVtoYUV420Free) (void \
*global)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> COMXVideoDec* pDec =
((COMXVideoDec *)(global));<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -132,33 +146,47 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> if
(pBuffer->nFilledLen > 0 && \
pDecodedFrameBuffer)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>- if \
(decFlt->GetOutputFormat() == \
OMX_COLOR_FormatYUV420Planar)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ switch \
(decFlt->GetOutputFormat())<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> \
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ case \
OMX_COLOR_FormatYUV420Planar:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>
memcpy(pDecodedFrameBuffer, pBuffer->pBuffer + pBuffer->nOffset,
pBuffer->nFilledLen);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
break;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ case \
0x7fa30c00:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ \
// Reference pointer from HW decoder<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
pH263Out->notes = QCOM_HW_REFERENCE_POINTER;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
*((UINT32*)pDecodedFrameBuffer) = 0x7fa30c00;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
*((OMX_BUFFERHEADERTYPE**)(pDecodedFrameBuffer+sizeof(UINT32))) = \
pBuffer;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
break;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ \
default:<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
// All other formats are not supported<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
pH263Out->notes = RV_DECODE_DONT_DRAW;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
break;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> \
if(pBuffer)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pH263Out->timestamp = pBuffer->nTimeStamp;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>
decFlt->ReUse(pBuffer);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- \
if(ps!=HXR_OK)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>-
pH263Out->numFrames = 1;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>-
pH263Out->notes |= RV_DECODE_DONT_DRAW;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>-
pH263Out->width = decFlt->m_mofYUV.uiWidth;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>-
pH263Out->height = decFlt->m_mofYUV.uiHeight;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- // Assign the
presentation time for the display frame<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>-
pH263Out->timestamp = pH263In->timestamp++;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- return \
HXR_OK;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- // Assign the number of
frames out<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ \
if(ps!=HXR_OK)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+
pH263Out->numFrames = 1;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pH263Out->notes |= RV_DECODE_DONT_DRAW;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pH263Out->width = decFlt->m_mofYUV.uiWidth;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pH263Out->height = decFlt->m_mofYUV.uiHeight;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ //
Assign the presentation time for the display frame<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+
pH263Out->timestamp = pH263In->timestamp++;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ return
HXR_OK;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ // Assign the presentation time for
the display frame<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> pH263Out->numFrames = \
1;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- pH263Out->notes = \
0;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- pH263Out->width =
decFlt->m_mofYUV.uiWidth;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- pH263Out->height =
decFlt->m_mofYUV.uiHeight;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- // Assign the presentation
time for the display frame<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>- pH263Out->timestamp =
pBuffer->nTimeStamp;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ pH263Out->width =
decFlt->m_mofYUV.uiWidth;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ pH263Out->height =
decFlt->m_mofYUV.uiHeight;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> return \
HXR_OK;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>Index: mdpkt.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>===================================================================<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>RCS file: \
/cvsroot/datatype/common/container/pub/mdpkt.h,v<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>retrieving revision 1.7.2.1<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>diff -u -r1.7.2.1 mdpkt.h<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>--- mdpkt.h 13 Feb 2009
15:29:34 -0000 1.7.2.1<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+++ mdpkt.h 14 Aug 2009
09:19:48 -0000<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -57,6 +57,9 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"hxresult.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> #include \
"hxassert.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#include \
"OMX_Core.h"<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'> /****************************************************************************<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> * Globals<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>@@ -273,6 +276,17 @@<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> m_fpBufferKiller =
fpBufferKiller;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ void \
KillBuffer()<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ if
(m_fpBufferKiller)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ \
{<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#ifdef \
ANDROID_PRODUCT_qsd8250_surf<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ \
OMX_BUFFERHEADERTYPE* pOMXBuffer =
*((OMX_BUFFERHEADERTYPE**)(m_pData+sizeof(UINT32)));<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier \
New"'>+ \
(*m_fpBufferKiller)(pOMXBuffer, m_pUserData);<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+#endif<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ \
}<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+ }<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'>+<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> static ULONG32
GetBufferSize(CMediaPacket* pPacket)<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> {<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face="Courier New"><span style='font-size:10.0pt;
font-family:"Courier New"'> return
pPacket->m_ulBufferSize;<o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 face=Arial><span style='font-size:10.0pt;
font-family:Arial'><o:p> </o:p></span></font></p>
</div>
</body>
</html>
<P><FONT SIZE=2 FACE="Arial">No virus found in this incoming message.<BR>
Checked by AVG - www.avg.com<BR>
Version: 8.5.392 / Virus Database: 270.13.57/2303 - Release Date: 08/14/09 \
18:10:00<BR> </FONT></P>
<P><FONT SIZE=2 FACE="Arial"> </FONT> </P>
<P><FONT SIZE=2 FACE="Arial">No virus found in this incoming message.<BR>
Checked by AVG - www.avg.com<BR>
Version: 8.5.392 / Virus Database: 270.13.59/2310 - Release Date: 08/17/09 \
18:04:00<BR> </FONT></P>
<P><FONT SIZE=2 FACE="Arial"> </FONT> </P>
_______________________________________________
Datatype-dev mailing list
Datatype-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic