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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] tools/minicntx minicntx.cpp,1.37.10.7,1.37.10.7.8.1
From:       gwang () helixcommunity ! org
Date:       2013-08-07 2:42:05
[Download RAW message or body]

Update of /cvsroot/datatype/tools/minicntx
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv28385

Modified Files:
      Tag: PRODUCER_14_0_9
	minicntx.cpp 
Log Message:
Synopsis
========
This CR fixing Helix Producer Linux version. Compile passed and support input
(AVI (raw data),MP4(h264,aac)) codec(h.264,mpeg4,aac),output(mp4)

Branch : PRODUCER_14_0_9

reviewed by : Xiaocheng,Yuxin

My Fix:
   using _LINUX macro when there is diffrence between two versions.Now the
Chinese charactor support is shut dnow in this versions.
     

Files affected:
===============
/client/encodesvc/common/utilhelper/hxccfhelperwithtransform.cpp
/client/encodesvc/common/xmltransformer/xmlimporthelper.cpp
/client_rn/encodesvc/engine/encsession/licensemanager.cpp
/client_rn/encodesvc/engine/encsession/licensemanager.h
/client_rn/encodesvc/plugins/input/dtdrreader/hxdtdrobinfo.cpp
/client_rn/encodesvc/plugins/input/dtdrreader/hxdtdrreader.cpp
/client_rn/encodesvc/plugins/input/dtdrreader/unix.pcf
/client_rn/encodesvc/plugins/transform/h263/encfilter/h263filter.cpp
/client_rn/encodesvc/plugins/transform/h264/encfilter/h264encoder.cpp
/client_rn/encodesvc/plugins/transform/h264/encfilter/unix.pcf
/common/dbgtool/hxassert.cpp
/datatype/mp4/audio/aacdepacketizer/Umakefil
/datatype/mp4/audio/mp4gdepacketizer/Umakefil
/datatype/mpeg2ts/stream/tsstreamff.cpp
/datatype_rn/mpeg2/ts/hlsfilewriter/unix.pcf
/datatype/tools/dtdriver/decoder/video/vdecoder.cpp
/datatype/tools/dtdriver/dtdrplin/datatypedr.cpp
/datatype/tools/dtdriver/engine/ffdriver.cpp
/datatype/tools/minicntx/minicntx.cpp
/rarvcode-mpeg2/codec/platform/unix/mpgx86decoder.cpp
/producerapps/cmdproducer/session.cpp
/producerapps_rn/installer/producer/copyfiles_unix.py
/producerapps_rn/installer/producer/make_tempdir
/protocol/rtsp/rtspclnt.cpp
/server_rn/common/util/m3uutil.cpp

Files added:
============
/datatype_rn/h264/codec/sdk9_7

Testing Performed:
=================


Unit Tests: 
   1 avi input mp4 output(h.264,aac)
   2 mp4 input mp4 output,codec(h.264,mpeg4,aac).

   The all works well

Leak Tests: None
Performance Tests: N/A

Platforms Tested: linux-2.6-i686

QA Hints
no


Index: minicntx.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/minicntx/minicntx.cpp,v
retrieving revision 1.37.10.7
retrieving revision 1.37.10.7.8.1
diff -u -d -r1.37.10.7 -r1.37.10.7.8.1
--- minicntx.cpp	30 May 2013 05:34:43 -0000	1.37.10.7
+++ minicntx.cpp	7 Aug 2013 02:41:57 -0000	1.37.10.7.8.1
@@ -1,41 +1,41 @@
 /* ***** BEGIN LICENSE BLOCK ***** 
- * Version: RCSL 1.0/RPSL 1.0 
- *  
- * 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 Public Source License 
- * Version 1.0 (the "RPSL") available at 
- * http://www.helixcommunity.org/content/rpsl unless you have licensed 
- * the file under the RealNetworks Community Source License Version 1.0 
- * (the "RCSL") available at http://www.helixcommunity.org/content/rcsl, 
[...2223 lines suppressed...]
     else if (m_pClientContext &&
-             m_pClientContext->QueryInterface(riid, ppvObj) == HXR_OK)
+        m_pClientContext->QueryInterface(riid, ppvObj) == HXR_OK)
     {
-    	return HXR_OK;
+        return HXR_OK;
     }
 
     *ppvObj = NULL;
@@ -2018,8 +2047,8 @@
 
 
 /*
- *  IUnknown methods
- */
+*  IUnknown methods
+*/
 STDMETHODIMP MiniContext::QueryInterface(REFIID riid, void** ppvObj)
 {
     return CUnknownIMP::QueryInterface(riid, ppvObj);


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