[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] mpeg2ts/stream Umakefil,1.4,1.4.52.1
From: henryxing () helixcommunity ! org
Date: 2013-07-15 5:35:41
[Download RAW message or body]
Update of /cvsroot/datatype/mpeg2ts/stream
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25797
Modified Files:
Tag: Cobra_MVP
Umakefil
Log Message:
Project
=====
Cobra(Server)
Overview
========
Merge the hls live broadcast server from helix mobile server into cobra, ts stream \
is ingress, hls stream is the output. 1 merge some macros this feature related from \
helix mobile server, add two extra macro to control the configuration item and plugin \
in cobra installer program, if this macro was not defined, mp2tslivepln.so \
mpeg2tsplin.so m3ugenfsys.so and hls live related configuration item will not appear \
in installer; HELIX_FEATURE_SERVER_HLSLIVE_M3UGEN for m3ugen module, \
HELIX_FEATURE_SERVER_HLSLIVE_TSINGRESS for this whole hls live server feature 2 add \
the mpeg2ts recv module, it monitor input port, and depacketize ts stream, ts file \
demux/stream module was used ; 3 update the logic in mpeg2ts module, receive the \
packet from core, generate ts file and m3u8 playlist, ts file writer module was used \
in handling; 4 m3ugen module was used to trigger the process of producing ts segment \
file and playlist file if the corresponding playlist/segment ts file was not exit in \
that time, it is valid to local file and live input steaming 5 add three plugins \
to enable this feature: mp2tslivepln.so mpeg2tsplin.so m3ugenfsys.so
Branch: Cobra_MVP
added file:
server/common/util/pub/mp2tsdebug.h
server/common/util/mp2tsdebug.cpp
datatype/mp4/payload/nullpayload.cpp
datatype/mp4/payload/pub/nullpayload.h
common/include/hxidrframe.h
datatype/mpeg2ts/demuxer/payload/aacapayload.cpp
datatype/mpeg2ts/demuxer/pub/aacapayload.h
datatype/mpeg2ts/stream/libumakefil
datatype/mpeg2ts/stream/dllumakefil
server-restricted/protocol/http-ctrl/drmhttpapi_handler.cpp
server-restricted/protocol/http-ctrl/hlstimeshiftutil.cpp
server-restricted/protocol/http-ctrl/pub/hlstimeshift.h
server-restricted/protocol/http-ctrl/pub/drmhttpapi_handler.h
server-restricted/protocol/http-ctrl/hlstimeshiftutil.h
server_rn/appext/m3ugen/hlstshandler.cpp
server_rn/appext/m3ugen/pub/hlstshandler.h
modified files:
/home/helixprvt/server_rn/nucleus/installer/Attic/make_tempdir
/home/helixprvt/server_rn/nucleus/installer/Attic/nucleus_inst.cpp
/cvsroot/datatype/mpeg2ts/demuxer/Umakefil
/cvsroot/datatype/mpeg2ts/demuxer/tsdemuxer.cpp
/cvsroot/datatype/mpeg2ts/demuxer/payload/aacpayload.cpp
/cvsroot/datatype/mpeg2ts/demuxer/payload/h264payload.cpp
/cvsroot/datatype/mpeg2ts/demuxer/payload/mpapayload.cpp
/cvsroot/datatype/mpeg2ts/demuxer/payload/mpvpayload.cpp
/cvsroot/datatype/mpeg2ts/demuxer/pub/aacpayload.h
/cvsroot/datatype/mpeg2ts/demuxer/pub/h264payload.h
/cvsroot/datatype/mpeg2ts/demuxer/pub/mpapayload.h
/cvsroot/datatype/mpeg2ts/demuxer/pub/mpvpayload.h
/cvsroot/datatype/mpeg2ts/demuxer/pub/tsdemuxer.h
/cvsroot/datatype/mpeg2ts/stream/Umakefil
/cvsroot/datatype/mpeg2ts/stream/tsstreamff.cpp
/cvsroot/datatype/mpeg2ts/stream/pub/tsstreamff.h
/home/helixprvt/datatype_rn/mpeg2/ts/filewriter/Umakefil
/home/helixprvt/datatype_rn/mpeg2/ts/filewriter/ctsarchiver.cpp
/home/helixprvt/datatype_rn/mpeg2/ts/filewriter/mpeg2tsfwrtr.cpp
/home/helixprvt/datatype_rn/mpeg2/ts/filewriter/playlistgen.cpp
/home/helixprvt/datatype_rn/mpeg2/ts/filewriter/pub/ctsarchiver.h
/home/helixprvt/datatype_rn/mpeg2/ts/filewriter/pub/mpeg2tsfwrtr.h
/home/helixprvt/datatype_rn/mpeg2/ts/filewriter/pub/playlistgen.h
/cvsroot/server/common/util/make_lib
/cvsroot/server/common/util/pub/bcast_defs.h
/home/helixprvt/server_rn/common/util/datfilehandler.cpp
/home/helixprvt/server_rn/common/util/m3uutil.cpp
/home/helixprvt/server_rn/common/util/pub/datfilehandler.h
/home/helixprvt/server_rn/common/util/pub/m3uutil.h
/home/helixprvt/server_rn/common/util/pub/mpeg2ts_config_names.h
/home/helixprvt/server_rn/datatype/mpeg2ts/Umakefil
/home/helixprvt/server_rn/datatype/mpeg2ts/mpeg2tsplin.cpp
/home/helixprvt/server_rn/datatype/mpeg2ts/streamhandler.cpp
/home/helixprvt/server_rn/datatype/mpeg2ts/pub/mpeg2tsplin.h
/home/helixprvt/server_rn/datatype/mpeg2ts/pub/streamhandler.h
/cvsroot/common/include/defslice.h
/cvsroot/datatype/mp4/payload/Umakefil
build/umakepf/cobra-server.pf
build/BIF/Cobra_MVP.bif
server_rn/nucleus/installer/files/Attic/nucleus_prototype.lic
server_rn/common/util/pub/m3uutil.h
server_rn/appext/m3ugen/Umakefil
server_rn/appext/m3ugen/hpllivewriter.cpp
server_rn/appext/m3ugen/hplodwriter.cpp
server_rn/appext/m3ugen/iphoneplaylistparser.cpp
server_rn/appext/m3ugen/m3ugenfsys.cpp
server_rn/appext/m3ugen/readm3u8.cpp
server_rn/appext/m3ugen/pub/hpllivewriter.h
server_rn/appext/m3ugen/pub/hplodwriter.h
server_rn/appext/m3ugen/pub/iphoneplaylistparser.h
server_rn/appext/m3ugen/pub/m3ugenfsys.h
server_rn/appext/m3ugen/pub/readm3u8.h
server/include/hxm3u.h
server/include/server_piids.h
server-restricted/protocol/http-ctrl/Umakefil
Index: Umakefil
===================================================================
RCS file: /cvsroot/datatype/mpeg2ts/stream/Umakefil,v
retrieving revision 1.4
retrieving revision 1.4.52.1
diff -u -d -r1.4 -r1.4.52.1
--- Umakefil 19 May 2011 00:37:36 -0000 1.4
+++ Umakefil 15 Jul 2013 05:35:34 -0000 1.4.52.1
@@ -1,83 +1,46 @@
#
-# ***** BEGIN LICENSE BLOCK *****
-# Source last modified: $Id$
-#
-# Portions Copyright (c) 1995-2004 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 (the "RPSL") available at
-# http://www.helixcommunity.org/content/rpsl unless you have licensed
-# the file under the current version of the RealNetworks Community
-# Source License (the "RCSL") available at
-# http://www.helixcommunity.org/content/rcsl, in which case the RCSL
-# will apply. You may also obtain the license terms directly from
-# RealNetworks. You may not use this file except in compliance with
-# the RPSL or, if you have a valid RCSL with RealNetworks applicable
-# to this file, the RCSL. Please see the applicable RPSL or RCSL for
-# the rights, obligations and limitations governing use of the
-# contents of the file.
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 (the
-# "GPL") in which case the provisions of the GPL are applicable
-# instead of those above. If you wish to allow use of your version of
-# this file only under the terms of the GPL, and not to allow others
-# to use your version of this file under the terms of either the RPSL
-# or RCSL, indicate your decision by deleting the provisions above
-# and replace them with the notice and other provisions required by
-# the GPL. If you do not delete the provisions above, a recipient may
-# use your version of this file under the terms of any one of the
-# RPSL, the RCSL or the GPL.
-#
-# 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:
-# http://www.helixcommunity.org/content/tck
+# ***** BEGIN LICENSE BLOCK *****
+# Version: RCSL 1.0/RPSL 1.0
+#
+# Portions Copyright (c) 1995-2012 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,
+# in which case the RCSL will apply. You may also obtain the license terms
+# directly from RealNetworks. You may not use this file except in
+# compliance with the RPSL or, if you have a valid RCSL with RealNetworks
+# applicable to this file, the RCSL. Please see the applicable RPSL or
+# 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.
#
-# Contributor(s):
+# Technology Compatibility Kit Test Suite(s) Location:
+# http://www.helixcommunity.org/content/tck
#
-# ***** END LICENSE BLOCK *****
+# Contributor(s):
+#
+# ***** END LICENSE BLOCK *****
#
-UmakefileVersion(2,2)
-
-project.AddModuleIncludes("common/include")
-
-
-project.AddSources("tsstreamff.cpp",
- "guids.cpp")
+UmakefileVersion(2,1)
-project.AddModuleLibraries("common/container[contlib]",
- "common/dbgtool[debuglib]",
- "common/fileio[fileiolib]",
- "common/runtime[runtlib]",
- "common/system[syslib]",
- "common/util[utillib]",
- "common/log/logutil[logutillib]",
- "common/netio[netiolib]",
- "datatype/mpeg2ts/demuxer[tsdemuxerlib]",
- "datatype/mpg/common[mpgcommon]",
- "datatype/mp3/common[mp3lib]",
- "datatype/ac3/common[ac3lib]")
-
-project.ExportFunction("RMACreateInstance",
- "IUnknown** ppObj",
- "common/include",
- "hxcom.h")
-
-project.ExportFunction("CanUnload", "void")
-project.ExportFunction("RMAShutdown", "void")
+if project.IsDefined("HELIX_FEATURE_SERVER"):
+ MultiTargetMake("libumakefil")
+else:
+ MultiTargetMake("libumakefil",
+ "dllumakefil")
-DLLTarget("tsstream")
-DependTarget()
_______________________________________________
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