]> git.sesse.net Git - casparcg/commit
* Merged layer_producer and channel_producer from 2.0 to the reroute module (replacin...
authorHelge Norberg <helge.norberg@svt.se>
Thu, 18 Jun 2015 17:34:46 +0000 (19:34 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Thu, 18 Jun 2015 17:34:46 +0000 (19:34 +0200)
commit25653bd421820028817375db3a4537d553f757df
treedd28c08d7673159ce793e0eb34535acf0580a48a
parent33e70c3ae0ca930c637f2b961df60f38a1ce187c
* Merged layer_producer and channel_producer from 2.0 to the reroute module (replacing the existing implementation).
* In order to support route:// without the same intrusive changes in AMCPCommandsImpl.cpp from 2.0, refactored so that every producer factory gets a list of channels.
* Refactored so that frame_factory and video_format_desc is now part of a type called frame_producer_dependencies. The list of channels needed by reroute producer was also added to this class. Future dependencies will not need a change in the signature of every producer factory.
* Fixed possible race condition in stage.cpp where std::map could be modified from multiple threads
51 files changed:
core/CMakeLists.txt
core/consumer/write_frame_consumer.h [new file with mode: 0644]
core/fwd.h
core/producer/cg_proxy.cpp
core/producer/cg_proxy.h
core/producer/frame_producer.cpp
core/producer/frame_producer.h
core/producer/scene/scene_producer.cpp
core/producer/scene/scene_producer.h
core/producer/scene/xml_scene_producer.cpp
core/producer/scene/xml_scene_producer.h
core/producer/stage.cpp
core/producer/stage.h
core/producer/text/text_producer.cpp
core/producer/text/text_producer.h
core/thumbnail_generator.cpp
core/video_channel.cpp
modules/decklink/producer/decklink_producer.cpp
modules/decklink/producer/decklink_producer.h
modules/ffmpeg/producer/ffmpeg_producer.cpp
modules/ffmpeg/producer/ffmpeg_producer.h
modules/flash/flash.cpp
modules/flash/producer/flash_producer.cpp
modules/flash/producer/flash_producer.h
modules/html/html.cpp
modules/html/producer/html_producer.cpp
modules/html/producer/html_producer.h
modules/image/producer/image_producer.cpp
modules/image/producer/image_producer.h
modules/image/producer/image_scroll_producer.cpp
modules/image/producer/image_scroll_producer.h
modules/psd/psd_scene_producer.cpp
modules/reroute/CMakeLists.txt
modules/reroute/producer/channel_producer.cpp [new file with mode: 0644]
modules/reroute/producer/channel_producer.h [new file with mode: 0644]
modules/reroute/producer/layer_producer.cpp [new file with mode: 0644]
modules/reroute/producer/layer_producer.h [new file with mode: 0644]
modules/reroute/producer/reroute_producer.cpp
modules/reroute/producer/reroute_producer.h
modules/reroute/reroute.cpp [new file with mode: 0644]
modules/reroute/reroute.h [new file with mode: 0644]
protocol/amcp/AMCPCommand.h
protocol/amcp/AMCPCommandsImpl.cpp
protocol/amcp/AMCPCommandsImpl.h
protocol/amcp/AMCPProtocolStrategy.cpp
protocol/cii/CIICommandsImpl.cpp
protocol/cii/CIIProtocolStrategy.cpp
protocol/cii/CIIProtocolStrategy.h
protocol/clk/CLKProtocolStrategy.cpp
protocol/clk/clk_commands.cpp
protocol/clk/clk_commands.h