[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] mp4/video/renderer dllumakefil, 1.8.8.2,
From: kliu () helixcommunity ! org
Date: 2011-04-29 2:22:23
Message-ID: 201104290222.p3T2MFF6011512 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/mp4/video/renderer
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16398/video/renderer
Modified Files:
Tag: hxclient_3_6_5_atlas
dllumakefil libumakefil mp4vdec.cpp mp4vdfmt.cpp mp4video.cpp
Log Message:
Modified by: kliu@real.com
Date: 04/29/2011
Project: RealPlayer for LephoneTD
Synopsis: Porting MPEG1/2 TS support to 365 from HEAD
Overview: Porting files for MPEG1/2 TS support to 365 from HEAD based on Jamie's \
recommendations. Files were gathered based on the following commited \
CR's:
CR: mpeg-1/2 video TS support in producer
CR: add log 4cc for MPEG video
CR: MPEG-1/2 video in TS streams and files
CR: MPEG-1/2 video depacketizer
Files Added:
datatype/mpg/common/pub/mpgvidcommon.h
datatype/mpg/common/mpgvidcommon.cpp
datatype/mpg/payload/mpvespyld.cpp
datatype/mpg/payload/Umakefil
datatype/mpg/payload/pub/mpvespyld.h
datatype/mpeg2ts/demuxer/payload/mpvpayload.cpp
datatype/mpeg2ts/demuxer/pub/mpvpayload.h
datatype/mpeg2ts/stream/guids.cpp
datatype/mpeg2ts/stream/tsstreamff.cpp
datatype/mpeg2ts/stream/tsstreamff.ver
datatype/mpeg2ts/stream/Umakefil
datatype/mpeg2ts/stream/pub
datatype/mpeg2ts/stream/pub/tsstreamff.h
Files Modified:
datatype/mp4/video/renderer/dllumakefil
datatype/mp4/video/renderer/libumakefil
datatype/mp4/video/renderer/mp4vdec.cpp
datatype/mp4/video/renderer/mp4vdfmt.cpp
datatype/mp4/video/renderer/mp4video.cpp
datatype/mpeg2ts/demuxer/payload/aacpayload.cpp
datatype/mpeg2ts/demuxer/payload/h264payload.cpp
datatype/mpeg2ts/demuxer/pub/aacpayload.h
datatype/mpeg2ts/demuxer/pub/h264payload.h
datatype/mpeg2ts/demuxer/pub/tsdemuxer.h
datatype/mpeg2ts/demuxer/tsdemuxer.cpp
datatype/mpeg2ts/demuxer/Umakefil
datatype/mpeg2ts/fileformat/tsfformat.cpp
datatype/mpeg2ts/fileformat/Umakefil
common/include/ihxtlogsystem.h
client/build/BIF/hxclient_3_6_5_atlas.bif
Image Size and Heap Use impact (Client -Only):
None
Platforms and Profiles Affected:
Platform: android-2.3-arm-smdk_c110
Profile: helix-client-android-full
Distribution Libraries Affected:
None
Distribution library impact and planned action:
None
Platforms and Profiles Build Verified:
Platform: android-2.3-arm-smdk_c110
Profile: helix-client-android-full
Platforms and Profiles Functionality verified:
Platform: android-2.3-arm-smdk_c110
Profile: helix-client-android-full
Branch: 365atlas
Copyright assignment: I am a RealNetworks employee or contractor
Index: mp4vdec.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/mp4vdec.cpp,v
retrieving revision 1.8.8.20
retrieving revision 1.8.8.20.4.1
diff -u -d -r1.8.8.20 -r1.8.8.20.4.1
--- mp4vdec.cpp 12 Jan 2011 06:19:10 -0000 1.8.8.20
+++ mp4vdec.cpp 29 Apr 2011 02:22:20 -0000 1.8.8.20.4.1
@@ -503,9 +503,6 @@
memcpy(pMofIn->data,
m_pVideoFormat->GetBitstreamHeader(),
m_pVideoFormat->GetBitstreamHeaderSize());
- }else
- {
- pMofIn->cbLength = 0;
}
}
Index: mp4vdfmt.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/mp4vdfmt.cpp,v
retrieving revision 1.18.8.31.4.2
retrieving revision 1.18.8.31.4.3
diff -u -d -r1.18.8.31.4.2 -r1.18.8.31.4.3
--- mp4vdfmt.cpp 31 Mar 2011 08:33:45 -0000 1.18.8.31.4.2
+++ mp4vdfmt.cpp 29 Apr 2011 02:22:20 -0000 1.18.8.31.4.3
@@ -99,6 +99,9 @@
#if defined(HELIX_FEATURE_VIDEO_CODEC_VP6)
#include "flvpyld.h"
#endif //HELIX_FEATURE_VIDEO_CODEC_VP6
+#ifdef HELIX_FEATURE_PAYLOAD_MPEG_VIDEO
+#include "mpvespyld.h"
+#endif //HELIX_FEATURE_PAYLOAD_MPEG_VIDEO
#include "hxurl.h"
/****************************************************************************
* Locals
@@ -198,7 +201,7 @@
// Loop through all possible codec IDs tha tthe depacketizer knows about
while (retVal == HXR_REQUEST_UPGRADE)
{
- retVal = m_pDecoder->Init(m_pMP4VideoRenderer->GetContext(),
+ retVal = m_pDecoder->Init(m_pMP4VideoRenderer->GetContext(),
this,
NULL,
m_pInputAllocator,
@@ -1635,6 +1638,9 @@
#if defined(HELIX_FEATURE_VIDEO_CODEC_VP6)
m_fmtFactory.RegisterBuilder(&CHXFLVPayloadFormat::Build);
#endif
+#ifdef HELIX_FEATURE_PAYLOAD_MPEG_VIDEO
+ m_fmtFactory.RegisterBuilder(&MPEGESPayloadFormat::Build);
+#endif
}
HXBOOL CMP4VideoFormat::DecodeFrame(UINT32 ulMaxExtraFrames)
Index: libumakefil
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/libumakefil,v
retrieving revision 1.4.8.1.32.1
retrieving revision 1.4.8.1.32.2
diff -u -d -r1.4.8.1.32.1 -r1.4.8.1.32.2
--- libumakefil 28 Mar 2011 08:53:34 -0000 1.4.8.1.32.1
+++ libumakefil 29 Apr 2011 02:22:20 -0000 1.4.8.1.32.2
@@ -37,6 +37,9 @@
"mp4vdfmt.cpp",
"mp4vdec.cpp")
+if project.IsDefined("HELIX_FEATURE_PAYLOAD_MPEG_VIDEO"):
+ project.AddModuleIncludes("datatype/mpg/payload/pub")
+
LibraryTarget('mp4vrenderlib')
DependTarget()
Index: dllumakefil
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/dllumakefil,v
retrieving revision 1.8.8.2
retrieving revision 1.8.8.2.12.1
diff -u -d -r1.8.8.2 -r1.8.8.2.12.1
--- dllumakefil 10 Jun 2010 06:58:07 -0000 1.8.8.2
+++ dllumakefil 29 Apr 2011 02:22:20 -0000 1.8.8.2.12.1
@@ -32,6 +32,9 @@
project.AddLibraries(GetSDKPath("rmvidcom_lib"))
+if project.IsDefined("HELIX_FEATURE_PAYLOAD_MPEG_VIDEO"):
+ project.AddModuleLibraries("datatype/mpg/payload[mpegpyld]")
+
project.ExportFunction("RMACreateInstance",
"IUnknown** ppObj",
"common/include",
Index: mp4video.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/video/renderer/mp4video.cpp,v
retrieving revision 1.13.8.6
retrieving revision 1.13.8.6.4.1
diff -u -d -r1.13.8.6 -r1.13.8.6.4.1
--- mp4video.cpp 11 Jan 2011 05:29:24 -0000 1.13.8.6
+++ mp4video.cpp 29 Apr 2011 02:22:20 -0000 1.13.8.6.4.1
@@ -1,3 +1,36 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: RCSL 1.0 and Exhibits.
+ * REALNETWORKS CONFIDENTIAL--NOT FOR DISTRIBUTION IN SOURCE CODE FORM
+ * Portions Copyright (c) 1995-2002 RealNetworks, Inc.
+ * All Rights Reserved.
+ *
+ * The contents of this file, and the files included with this file, are
+ * subject to the current version of the RealNetworks Community Source
+ * License Version 1.0 (the "RCSL"), including Attachments A though H,
+ * all available at http://www.helixcommunity.org/content/rcsl.
+ * You may also obtain the license terms directly from RealNetworks.
+ * You may not use this file except in compliance with the RCSL and
+ * its Attachments. There are no redistribution rights for the source
+ * code of this file. Please see the applicable RCSL for the rights,
+ * obligations and limitations governing use of the contents of the file.
+ *
+ * This file is part of the Helix DNA Technology. RealNetworks is the
+ * developer of the Original Code and owns the copyrights in the portions
+ * it created.
+ *
+ * This file, and the files included with this file, is distributed and made
+ * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ *
+ * Technology Compatibility Kit Test Suite(s) Location:
+ * https://rarvcode-tck.helixcommunity.org
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK ***** */
+
/****************************************************************************
*
* QuickTime Renderer for RealMedia Architecture.
@@ -74,6 +107,10 @@
#ifdef HELIX_FEATURE_VIDEO_CODEC_VP6
"video/x-hx-flv",
#endif
+#ifdef HELIX_FEATURE_PAYLOAD_MPEG_VIDEO
+ "video/x-hx-mp1v-es",
+ "video/x-hx-mp2v-es",
+#endif
NULL
};
@@ -148,38 +185,6 @@
}
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: RCSL 1.0 and Exhibits.
- * REALNETWORKS CONFIDENTIAL--NOT FOR DISTRIBUTION IN SOURCE CODE FORM
- * Portions Copyright (c) 1995-2002 RealNetworks, Inc.
- * All Rights Reserved.
- *
- * The contents of this file, and the files included with this file, are
- * subject to the current version of the RealNetworks Community Source
- * License Version 1.0 (the "RCSL"), including Attachments A though H,
- * all available at http://www.helixcommunity.org/content/rcsl.
- * You may also obtain the license terms directly from RealNetworks.
- * You may not use this file except in compliance with the RCSL and
- * its Attachments. There are no redistribution rights for the source
- * code of this file. Please see the applicable RCSL for the rights,
- * obligations and limitations governing use of the contents of the file.
- *
- * This file is part of the Helix DNA Technology. RealNetworks is the
- * developer of the Original Code and owns the copyrights in the portions
- * it created.
- *
- * This file, and the files included with this file, is distributed and made
- * available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- *
- * Technology Compatibility Kit Test Suite(s) Location:
- * https://rarvcode-tck.helixcommunity.org
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
/************************************************************************
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic