From: <mat...@us...> - 2007-05-17 22:16:37
|
Revision: 3075 http://svn.sourceforge.net/kamaelia/?rev=3075&view=rev Author: matth_rd Date: 2007-05-17 15:16:36 -0700 (Thu, 17 May 2007) Log Message: ----------- Updating date on copyright notices and fixing a few docstrings and imports. Matt Modified Paths: -------------- branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Kamaelia.Support.Optimised.MpegTsDemux.pyx branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.ComputeMeanAbsDiff.pyx branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.PixFormatConvert.pyx branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/_PixFormatConvertCore.c branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Carousel.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Seq.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/WAV.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/YUV4MPEG.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Device/DVB/SoftDemux.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Experimental/Chassis.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/MaxSpeedFileReader.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/UnixProcess2.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RTP/RTP.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RecoverOrder.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/SDP.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/UI/Pygame/VideoSurface.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Collate.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/FirstOnly.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Max.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/OneShot.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/PromptedTurnstile.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RangeFilter.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RateChunker.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Sync.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TagWithSequenceNumber.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TwoWaySplitter.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/CropAndScale.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/PixFormatConversion.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/SimpleXMLParser.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/__init__.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoPlayer.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/EDL.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/MobileReframe.xsd branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/StopSelector.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/VideoReframer.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/DetectedShotChanges.xsd branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/ShotChangeDetector.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/StopSelector.py branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/setup.py branches/private_MH_20070429_newcomponents/Tests/Python/Kamaelia/Chassis/test_Carousel.py Modified: branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Kamaelia.Support.Optimised.MpegTsDemux.pyx =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Kamaelia.Support.Optimised.MpegTsDemux.pyx 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Kamaelia.Support.Optimised.MpegTsDemux.pyx 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,3 +1,23 @@ +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) +# All Rights Reserved. +# +# You may only modify and redistribute this under the terms of any of the +# following licenses(2): Mozilla Public License, V1.1, GNU General +# Public License, V2.0, GNU Lesser General Public License, V2.1 +# +# (1) Kamaelia Contributors are listed in the AUTHORS file and at +# http://kamaelia.sourceforge.net/AUTHORS - please extend this file, +# not this notice. +# (2) Reproduced in the COPYING file, and at: +# http://kamaelia.sourceforge.net/COPYING +# Under section 3.5 of the MPL, we are using this text since we deem the MPL +# notice inappropriate for this file. As per MPL/GPL/LGPL removal of this +# notice is prohibited. +# +# Please contact us via: kam...@li... +# to discuss alternative licensing. +# ------------------------------------------------------------------------- +# # software demultiplexing of transport stream packets # implemented here for efficiency Modified: branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.ComputeMeanAbsDiff.pyx =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.ComputeMeanAbsDiff.pyx 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.ComputeMeanAbsDiff.pyx 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,4 +1,4 @@ -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.PixFormatConvert.pyx =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.PixFormatConvert.pyx 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/Kamaelia.Support.Optimised.Video.PixFormatConvert.pyx 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,4 +1,4 @@ -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/_PixFormatConvertCore.c =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/_PixFormatConvertCore.c 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Bindings/SupportCode/Kamaelia/Support/Optimised/Video/_PixFormatConvertCore.c 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,5 +1,25 @@ -/** Pixel type conversion routines **/ +/** Pixel type conversion routines +(C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) + All Rights Reserved. + +You may only modify and redistribute this under the terms of any of the +following licenses(2): Mozilla Public License, V1.1, GNU General +Public License, V2.0, GNU Lesser General Public License, V2.1 + +(1) Kamaelia Contributors are listed in the AUTHORS file and at + http://kamaelia.sourceforge.net/AUTHORS - please extend this file, + not this notice. +(2) Reproduced in the COPYING file, and at: + http://kamaelia.sourceforge.net/COPYING +Under section 3.5 of the MPL, we are using this text since we deem the MPL +notice inappropriate for this file. As per MPL/GPL/LGPL removal of this +notice is prohibited. + +Please contact us via: kam...@li... +to discuss alternative licensing. +**/ + #include <stdlib.h> int RGB_to_YUV420(unsigned char *rgb_input, Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Carousel.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Carousel.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Carousel.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Seq.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Seq.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Chassis/Seq.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2005 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the @@ -152,7 +152,7 @@ if __name__=="__main__": from Kamaelia.Chassis.Pipeline import Pipeline - from OneShot import OneShot + from Kamaelia.Util.OneShot import OneShot from Kamaelia.Util.Console import ConsoleEchoer Pipeline( Seq( "BEGIN SEQUENCE", Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/WAV.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/WAV.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/WAV.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/YUV4MPEG.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/YUV4MPEG.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Codec/YUV4MPEG.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Device/DVB/SoftDemux.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Device/DVB/SoftDemux.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Device/DVB/SoftDemux.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,4 +1,24 @@ #!/usr/bin/env python +# +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) +# All Rights Reserved. +# +# You may only modify and redistribute this under the terms of any of the +# following licenses(2): Mozilla Public License, V1.1, GNU General +# Public License, V2.0, GNU Lesser General Public License, V2.1 +# +# (1) Kamaelia Contributors are listed in the AUTHORS file and at +# http://kamaelia.sourceforge.net/AUTHORS - please extend this file, +# not this notice. +# (2) Reproduced in the COPYING file, and at: +# http://kamaelia.sourceforge.net/COPYING +# Under section 3.5 of the MPL, we are using this text since we deem the MPL +# notice inappropriate for this file. As per MPL/GPL/LGPL removal of this +# notice is prohibited. +# +# Please contact us via: kam...@li... +# to discuss alternative licensing. +# ------------------------------------------------------------------------- #import dvb3.soft_dmx from Kamaelia.Support.Optimised.MpegTsDemux import MpegTsDemux Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Experimental/Chassis.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Experimental/Chassis.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Experimental/Chassis.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2005 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/MaxSpeedFileReader.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/MaxSpeedFileReader.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/MaxSpeedFileReader.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/UnixProcess2.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/UnixProcess2.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/File/UnixProcess2.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RTP/RTP.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RTP/RTP.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RTP/RTP.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RecoverOrder.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RecoverOrder.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/RecoverOrder.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/SDP.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/SDP.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Protocol/SDP.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/UI/Pygame/VideoSurface.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/UI/Pygame/VideoSurface.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/UI/Pygame/VideoSurface.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2005 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Collate.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Collate.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Collate.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/FirstOnly.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/FirstOnly.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/FirstOnly.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Max.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Max.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Max.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/OneShot.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/OneShot.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/OneShot.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/PromptedTurnstile.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/PromptedTurnstile.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/PromptedTurnstile.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RangeFilter.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RangeFilter.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RangeFilter.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2005 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RateChunker.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RateChunker.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/RateChunker.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Sync.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Sync.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/Sync.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TagWithSequenceNumber.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TagWithSequenceNumber.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TagWithSequenceNumber.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TwoWaySplitter.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TwoWaySplitter.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Util/TwoWaySplitter.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the @@ -161,7 +161,7 @@ if __name__ == "__main__": - from Chassis import Graphline,Pipeline + from Kamaelia.Experimental.Chassis import Graphline,Pipeline from Kamaelia.Util.DataSource import DataSource from Kamaelia.Util.RateFilter import MessageRateLimit from Kamaelia.Util.Console import ConsoleEchoer Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/CropAndScale.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/CropAndScale.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/CropAndScale.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the @@ -40,9 +40,9 @@ Pipeline( RateControlledFileReader("input.yuv4mpeg", ... ), YUV4MPEGToFrame(), - YUVtoRGB(), + ToRGB_interleaved(), CropAndScale(newsize=(720,576), cropbounds=(100,100,400,300)), - RGBtoYUV(), + ToYUV420_planar(), FrameToYUV4MPEG(), SimpleFileWriter("cropped_and_scaled.yuv4mpeg"), ).run() Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/PixFormatConversion.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/PixFormatConversion.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/Video/PixFormatConversion.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2005 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/SimpleXMLParser.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/SimpleXMLParser.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/SimpleXMLParser.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2005 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the @@ -288,10 +288,10 @@ if __name__ == "__main__": - from Chassis import Pipeline - from Chassis import Graphline + from Kamaelia.Experimental.Chassis import Pipeline + from Kamaelia.Experimental.Chassis import Graphline from Kamaelia.Util.Console import ConsoleEchoer - from MaxSpeedFileReader import MaxSpeedFileReader + from Kamaelia.File.MaxSpeedFileReader import MaxSpeedFileReader from Axon.ThreadedComponent import threadedcomponent import time Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/__init__.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/__init__.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Kamaelia/XML/__init__.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoPlayer.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoPlayer.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoPlayer.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/EDL.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/EDL.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/EDL.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,4 +1,24 @@ #!/usr/bin/python +# +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) +# All Rights Reserved. +# +# You may only modify and redistribute this under the terms of any of the +# following licenses(2): Mozilla Public License, V1.1, GNU General +# Public License, V2.0, GNU Lesser General Public License, V2.1 +# +# (1) Kamaelia Contributors are listed in the AUTHORS file and at +# http://kamaelia.sourceforge.net/AUTHORS - please extend this file, +# not this notice. +# (2) Reproduced in the COPYING file, and at: +# http://kamaelia.sourceforge.net/COPYING +# Under section 3.5 of the MPL, we are using this text since we deem the MPL +# notice inappropriate for this file. As per MPL/GPL/LGPL removal of this +# notice is prohibited. +# +# Please contact us via: kam...@li... +# to discuss alternative licensing. +# ------------------------------------------------------------------------- from Axon.Component import component from Axon.Ipc import WaitComplete @@ -17,6 +37,14 @@ Parse output from SAX parser into EDL items """ + Inboxes = { "inbox" : "Messages from Kamaelia.XML.SimpleXMLParser", + "control" : "Shutdown signalling", + } + + Outboxes = { "outbox" : "Edit decisions", + "signal" : "Shutdown signalling", + } + def shutdown(self): while self.dataReady("control"): msg = self.recv("control") Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/MobileReframe.xsd =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/MobileReframe.xsd 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/MobileReframe.xsd 2007-05-17 22:16:36 UTC (rev 3075) @@ -3,9 +3,29 @@ <!-- Document : MobileReframe.xsd Created on : 13 September 2006, 12:00 - Author : Steve Jolly + Author : Steve Jolly, British Broadcasting Corporation Description: An Edit Decision List document for mobile reframing. + License : + (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) + All Rights Reserved. + + You may only modify and redistribute this under the terms of any of the + following licenses(2): Mozilla Public License, V1.1, GNU General + Public License, V2.0, GNU Lesser General Public License, V2.1 + + (1) Kamaelia Contributors are listed in the AUTHORS file and at + http://kamaelia.sourceforge.net/AUTHORS - please extend this file, + not this notice. + (2) Reproduced in the COPYING file, and at: + http://kamaelia.sourceforge.net/COPYING + Under section 3.5 of the MPL, we are using this text since we deem the MPL + notice inappropriate for this file. As per MPL/GPL/LGPL removal of this + notice is prohibited. + + Please contact us via: kam...@li... + to discuss alternative licensing. + --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/StopSelector.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/StopSelector.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/StopSelector.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/VideoReframer.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/VideoReframer.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoReframer/VideoReframer.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/DetectedShotChanges.xsd =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/DetectedShotChanges.xsd 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/DetectedShotChanges.xsd 2007-05-17 22:16:36 UTC (rev 3075) @@ -3,9 +3,28 @@ <!-- Document : DetectedCuts.xsd Created on : 13 September 2006, 12:00 - Author : Matt Hammond + Author : Matt Hammond, British Broadcasting Corporation Description: An list of detected cuts in a video sequence. + License : + (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) + All Rights Reserved. + + You may only modify and redistribute this under the terms of any of the + following licenses(2): Mozilla Public License, V1.1, GNU General + Public License, V2.0, GNU Lesser General Public License, V2.1 + + (1) Kamaelia Contributors are listed in the AUTHORS file and at + http://kamaelia.sourceforge.net/AUTHORS - please extend this file, + not this notice. + (2) Reproduced in the COPYING file, and at: + http://kamaelia.sourceforge.net/COPYING + Under section 3.5 of the MPL, we are using this text since we deem the MPL + notice inappropriate for this file. As per MPL/GPL/LGPL removal of this + notice is prohibited. + + Please contact us via: kam...@li... + to discuss alternative licensing. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/ShotChangeDetector.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/ShotChangeDetector.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/ShotChangeDetector.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python -# (C) 2006 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/StopSelector.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/StopSelector.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/Tools/VideoShotChangeDetector/StopSelector.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/setup.py =================================================================== --- branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/setup.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Code/Python/Kamaelia/setup.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the Modified: branches/private_MH_20070429_newcomponents/Tests/Python/Kamaelia/Chassis/test_Carousel.py =================================================================== --- branches/private_MH_20070429_newcomponents/Tests/Python/Kamaelia/Chassis/test_Carousel.py 2007-05-17 20:33:52 UTC (rev 3074) +++ branches/private_MH_20070429_newcomponents/Tests/Python/Kamaelia/Chassis/test_Carousel.py 2007-05-17 22:16:36 UTC (rev 3075) @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# (C) 2004 British Broadcasting Corporation and Kamaelia Contributors(1) +# (C) 2007 British Broadcasting Corporation and Kamaelia Contributors(1) # All Rights Reserved. # # You may only modify and redistribute this under the terms of any of the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |