]>
git.sesse.net Git - casparcg/log
Helge Norberg [Fri, 20 Feb 2015 20:22:27 +0000 (21:22 +0100)]
Refactored to use non-static data member initializers where it makes sense. Mixes well with ordinary member initializer lists.
Helge Norberg [Tue, 17 Feb 2015 12:43:42 +0000 (13:43 +0100)]
* Refactored to use enum class instead of enum_class.
* Fixed all warnings in psd project and enabled treat warnings as errors
Helge Norberg [Fri, 13 Feb 2015 16:49:27 +0000 (17:49 +0100)]
* started using final keyword on classes where previously sealed or commented final
* removed some lambda workarounds no longer required.
Helge Norberg [Fri, 13 Feb 2015 15:00:53 +0000 (16:00 +0100)]
Refactored to use range based for instead of BOOST_FOREACH
Helge Norberg [Fri, 13 Feb 2015 14:14:56 +0000 (15:14 +0100)]
Refactored to use initializer lists and uniform initialization in appropriate places.
Helge Norberg [Fri, 13 Feb 2015 09:34:03 +0000 (10:34 +0100)]
Used raw string literals for shader code and regexes.
TODO: timed waiting on deferred futures does not work.
Helge Norberg [Thu, 12 Feb 2015 15:52:55 +0000 (16:52 +0100)]
* Upgraded to Visual Studio 2013
* Notable changes needed because of boost upgrade:
- custom async implementation removed in favor of std::async. (boost::async still does not have support for deferred launch policy).
- std::future instead of boost::future throughout the code because of above change.
- std::future requires default constructibility, so for example caspar::array has been affected. spl::shared_ptr has been changed to std::shared_ptr in cases where required.
- boost.log changes adopted from 2.0.7.
* Fixed bugs where some OpenGL resources was not destructed on ogl thread.
* Fixed audio cadence issues in ffmpeg producer.
Helge Norberg [Wed, 11 Feb 2015 11:55:39 +0000 (12:55 +0100)]
Updated some libraries to newer versions and/or versions compiled for vc12 (freeimage, gtest, sfml and tbb). The changes in our code will come in a separate commit for easier viewing of changes.
Helge Norberg [Wed, 11 Feb 2015 10:21:37 +0000 (11:21 +0100)]
Updated boost. Separate commit from the code changes. (So this revision will not compile, but it will be easier to view the actual code changes in the separate commit)
Helge Norberg [Tue, 21 Oct 2014 12:22:10 +0000 (14:22 +0200)]
Updated to ffmpeg version 2.2.3
Helge Norberg [Tue, 21 Oct 2014 10:41:45 +0000 (12:41 +0200)]
Checked in missing dependencies accidentally ignored by .gitignore
Helge Norberg [Tue, 21 Oct 2014 10:30:13 +0000 (12:30 +0200)]
Manually merged #223
Helge Norberg [Tue, 21 Oct 2014 08:48:02 +0000 (10:48 +0200)]
Unpacked dependencies64
Helge Norberg [Fri, 25 Oct 2013 15:32:58 +0000 (17:32 +0200)]
Merged most recent OSC changes
Helge Norberg [Fri, 25 Oct 2013 11:46:34 +0000 (13:46 +0200)]
manually merged
1a9ecbd00e from master
Helge Norberg [Fri, 25 Oct 2013 09:12:52 +0000 (11:12 +0200)]
manually merged
4a2171b from master
Helge Norberg [Wed, 23 Oct 2013 13:46:12 +0000 (15:46 +0200)]
Fixed bug with monitor subject lifetime
Helge Norberg [Wed, 23 Oct 2013 13:12:00 +0000 (15:12 +0200)]
Fixed problem in image_producer when used inside scene
Helge Norberg [Wed, 16 Oct 2013 09:53:09 +0000 (11:53 +0200)]
Updated unit-tests.
Helge Norberg [Fri, 11 Oct 2013 15:09:38 +0000 (17:09 +0200)]
More unit-tests added.
Helge Norberg [Thu, 10 Oct 2013 12:55:11 +0000 (14:55 +0200)]
Initial unit tests using google test
niklaspandersson [Wed, 9 Oct 2013 08:21:14 +0000 (10:21 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
core/consumer/output.h
core/monitor/monitor.h
core/producer/layer.h
core/producer/stage.h
core/video_channel.h
core/video_format.cpp
shell/server.h
niklaspandersson [Wed, 9 Oct 2013 07:57:59 +0000 (09:57 +0200)]
manually merged
a72be89 from master
Helge Norberg [Fri, 27 Sep 2013 10:03:34 +0000 (12:03 +0200)]
Changes after feedback by Robert Nagy
Helge Norberg [Thu, 26 Sep 2013 18:28:43 +0000 (20:28 +0200)]
Misc modifications to fix problems found by static code analysis and some simplifications, like removal of copy constructors and copy assignment operators where the default would do the same. Also some resource handling improvements
Helge Norberg [Thu, 26 Sep 2013 11:52:32 +0000 (13:52 +0200)]
Finished support for CHANNEL_GRID in 2.1.0
Helge Norberg [Thu, 26 Sep 2013 11:10:37 +0000 (13:10 +0200)]
Remove .plist files after clang-analyse
Helge Norberg [Wed, 25 Sep 2013 17:52:49 +0000 (19:52 +0200)]
Fixed some issues detected by clang static analysis, also created bat file that launches clang analysis on each cpp file
Helge Norberg [Wed, 25 Sep 2013 16:25:39 +0000 (18:25 +0200)]
Changed use of microsoft specific sealed keyword to /* final */ to indicate intent
Helge Norberg [Wed, 25 Sep 2013 16:15:44 +0000 (18:15 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Helge Norberg [Wed, 25 Sep 2013 13:01:26 +0000 (15:01 +0200)]
Misc changes
U-Peter-PC\Peter [Fri, 20 Sep 2013 11:14:00 +0000 (13:14 +0200)]
Changed permission.
niklaspandersson [Tue, 3 Sep 2013 08:08:17 +0000 (10:08 +0200)]
manually merged
4a2171b from master
manually merged
0c06544 from master
manually merged
8d99a50 from master
niklaspandersson [Mon, 2 Sep 2013 07:49:59 +0000 (09:49 +0200)]
manually merged
44a5538 from master
niklaspandersson [Fri, 30 Aug 2013 11:54:46 +0000 (13:54 +0200)]
Manually merged
fe983d5 from master
niklaspandersson [Fri, 30 Aug 2013 10:21:13 +0000 (12:21 +0200)]
manually merged
d21afbd from master
manually merged
483ca71 from master
niklaspandersson [Fri, 30 Aug 2013 10:14:42 +0000 (12:14 +0200)]
manually merged
f1e09f6 from master
niklaspandersson [Fri, 30 Aug 2013 10:07:16 +0000 (12:07 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Fri, 30 Aug 2013 09:54:14 +0000 (11:54 +0200)]
Manually merged
77fbc02 from master
Manually merged
597805e from master
Manually merged
78c8a30 from master
Manually merged
306459b from master
Manually merged
55a287b from master
Manually merged
50fa7a3 from master
Manually merged
0f3ee44 from master
Manually merged
1cdee8b from master
(all have to do with 4k support)
niklaspandersson [Fri, 30 Aug 2013 09:54:14 +0000 (11:54 +0200)]
Manually merged
77fbc02 from master
Manually merged
597805e from master
Manually merged
78c8a30 from master
Manually merged
306459b from master
Manually merged
55a287b from master
Manually merged
50fa7a3 from master
Manually merged
0f3ee44 from master
Manually merged
1cdee8b from master
(all have to do with 4k support)
niklaspandersson [Fri, 30 Aug 2013 08:33:37 +0000 (10:33 +0200)]
Manually merged
9e597f6 from master
niklaspandersson [Fri, 30 Aug 2013 08:17:45 +0000 (10:17 +0200)]
Manually merged
44adc50 from master
niklaspandersson [Thu, 29 Aug 2013 14:59:29 +0000 (16:59 +0200)]
* added dependencies64/freetype to gitignore
* fixed lib-path in psd-test
* removed psd-test from solution build
niklaspandersson [Thu, 29 Aug 2013 13:49:04 +0000 (15:49 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
modules/image/producer/image_producer.cpp
niklaspandersson [Thu, 29 Aug 2013 13:39:56 +0000 (15:39 +0200)]
Manually merged
0edf4e5 (excluding changes to ffmpeg) from master
Helge Norberg [Thu, 29 Aug 2013 09:35:59 +0000 (11:35 +0200)]
Added basic support for image sequences.
Helge Norberg [Mon, 26 Aug 2013 15:42:52 +0000 (17:42 +0200)]
Fixed merge error in core.vcxproj.filters
Helge Norberg [Fri, 23 Aug 2013 20:10:28 +0000 (22:10 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
core/core.vcxproj.filters
Helge Norberg [Fri, 23 Aug 2013 20:00:31 +0000 (22:00 +0200)]
Advanced expression parsing for creating runtime bindings based on a textual representation.
niklaspandersson [Tue, 20 Aug 2013 12:12:20 +0000 (14:12 +0200)]
* psd: added support for scaling and tracking in text-producer
niklaspandersson [Tue, 20 Aug 2013 08:39:04 +0000 (10:39 +0200)]
* psd: support for scaling text-layers
niklaspandersson [Tue, 20 Aug 2013 08:15:32 +0000 (10:15 +0200)]
* psd: support for extracting scaling-data of text-layer, and extracting sheet-color meta-data
niklaspandersson [Mon, 19 Aug 2013 08:17:30 +0000 (10:17 +0200)]
* new way of mapping font-name to font-file. Using postscript font-name instead of the mapping found i the registry.
* extracting unicode layer-name from psd-files.
niklaspandersson [Fri, 16 Aug 2013 14:34:16 +0000 (16:34 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
modules/psd/psd_scene_producer.cpp
* added support for solid colors in scene_producer factory
niklaspandersson [Fri, 16 Aug 2013 13:10:50 +0000 (15:10 +0200)]
* some refactoring i psd + support for rectangular vector-masks
niklaspandersson [Fri, 16 Aug 2013 13:10:08 +0000 (15:10 +0200)]
* support for clearing/overriding a channel lock
Helge Norberg [Fri, 16 Aug 2013 12:26:38 +0000 (14:26 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Helge Norberg [Fri, 16 Aug 2013 12:26:24 +0000 (14:26 +0200)]
Initial XML format for scenes and timeline support for PSD
niklaspandersson [Wed, 14 Aug 2013 10:56:23 +0000 (12:56 +0200)]
* AsyncEventServer: implemented send-queue and protected socket->async_write_some from concurrent calls
niklaspandersson [Wed, 14 Aug 2013 09:04:30 +0000 (11:04 +0200)]
* psd-importer: fixed support for new descriptor value-type
niklaspandersson [Wed, 14 Aug 2013 08:00:28 +0000 (10:00 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Wed, 14 Aug 2013 07:58:20 +0000 (09:58 +0200)]
* the psd-importer now extracts timeline-data
Helge Norberg [Tue, 13 Aug 2013 09:25:42 +0000 (11:25 +0200)]
Added basic timeline/keyframe support in scene_producer
Helge Norberg [Tue, 13 Aug 2013 09:24:58 +0000 (11:24 +0200)]
Additional font metrics and correct height calculation
niklaspandersson [Tue, 13 Aug 2013 07:48:52 +0000 (09:48 +0200)]
* made lifecycle_bound_objects_ thread-safe
niklaspandersson [Mon, 12 Aug 2013 16:16:57 +0000 (18:16 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Helge Norberg [Mon, 12 Aug 2013 16:14:21 +0000 (18:14 +0200)]
Added missing files
niklaspandersson [Mon, 12 Aug 2013 16:04:37 +0000 (18:04 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
protocol/amcp/AMCPProtocolStrategy.cpp
niklaspandersson [Mon, 12 Aug 2013 16:01:35 +0000 (18:01 +0200)]
* refactoring of AMCPProtocolStrategy::Parse and the AMCPCommands
* implemented LOCK-command to protect a channel from accidental access
Helge Norberg [Fri, 9 Aug 2013 15:56:55 +0000 (17:56 +0200)]
Added support for psd placeholder layer
Helge Norberg [Fri, 9 Aug 2013 13:02:36 +0000 (15:02 +0200)]
Allow for a scene_producer to expose parameters updateable via CALL
niklaspandersson [Thu, 8 Aug 2013 15:03:13 +0000 (17:03 +0200)]
* implemented lifecycle-bound functions in caspar::io::connection
* refactored caspar::io::connection to avoid circular references
* moved delimiter-chunking logic out from AMCPProtocolStrategy and CIIProtocolStrategy. They now depend on being wrapped by a delimiter_based_chunking_strategy
niklaspandersson [Thu, 8 Aug 2013 08:18:54 +0000 (10:18 +0200)]
* added factory-parameters for font, size and color to text-producer
niklaspandersson [Thu, 8 Aug 2013 07:36:00 +0000 (09:36 +0200)]
* renamed psd.h/cpp to psd_scene_producer.h/cpp
niklaspandersson [Thu, 8 Aug 2013 07:22:39 +0000 (09:22 +0200)]
* exposed function bool try_get_color(const std::wstring& str, uint32_t& value) from color_producer.h
niklaspandersson [Wed, 7 Aug 2013 14:42:00 +0000 (16:42 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Wed, 7 Aug 2013 14:35:51 +0000 (16:35 +0200)]
* fixed fontname-to-file mapping
niklaspandersson [Wed, 7 Aug 2013 12:28:27 +0000 (14:28 +0200)]
made all producers-factories able to handle non-uppercased params
niklaspandersson [Wed, 7 Aug 2013 12:28:27 +0000 (14:28 +0200)]
made all producers-factories able to handle non-uppercased params
niklaspandersson [Wed, 7 Aug 2013 10:45:47 +0000 (12:45 +0200)]
simplified the handling of parameters
niklaspandersson [Wed, 7 Aug 2013 08:25:14 +0000 (10:25 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Wed, 7 Aug 2013 08:25:04 +0000 (10:25 +0200)]
disabled GL_DEPTH_TEST to prevent z-fighting in text-producer
niklaspandersson [Wed, 7 Aug 2013 08:03:51 +0000 (10:03 +0200)]
* made it optional to normalize coordinates of a text-producer in order for it to work both standalone and in a scene
Helge Norberg [Wed, 7 Aug 2013 08:01:30 +0000 (10:01 +0200)]
Changed CALL params to vector of strings
niklaspandersson [Tue, 6 Aug 2013 12:51:35 +0000 (14:51 +0200)]
binding between linked layers in psd-import/scene-producer
niklaspandersson [Tue, 6 Aug 2013 07:20:24 +0000 (09:20 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Mon, 5 Aug 2013 06:33:14 +0000 (08:33 +0200)]
added freetype to dependencies
niklaspandersson [Mon, 5 Aug 2013 06:33:14 +0000 (08:33 +0200)]
added freetype to dependencies
niklaspandersson [Thu, 1 Aug 2013 08:03:20 +0000 (10:03 +0200)]
* added geometry to frames for custom rendering
* new text-producer using freetype
* new photoshop-parser for the scene-producer
niklaspandersson [Wed, 24 Jul 2013 09:33:56 +0000 (11:33 +0200)]
* added parsing of text-layer data
niklaspandersson [Wed, 24 Jul 2013 09:32:36 +0000 (11:32 +0200)]
preparing for allowing producers to supply own geometry:
* moved generation of texture coordinates for background-texture to vertex-shader
* using modelview-matrix for translations and scaling instead of manually multiplying coordinates
niklaspandersson [Thu, 11 Jul 2013 10:55:17 +0000 (12:55 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
Conflicts:
modules/image/util/image_algorithms.cpp
niklaspandersson [Thu, 11 Jul 2013 10:52:57 +0000 (12:52 +0200)]
added a pdf-parser for the psd-import
cosmetic changes to psd-import module
Helge Norberg [Fri, 5 Jul 2013 13:45:53 +0000 (15:45 +0200)]
Support for ternary operator equivalent for bindings
niklaspandersson [Fri, 5 Jul 2013 07:15:00 +0000 (09:15 +0200)]
added missing files for psd
niklaspandersson [Fri, 5 Jul 2013 07:06:15 +0000 (09:06 +0200)]
added missing files for psd
Helge Norberg [Thu, 4 Jul 2013 18:03:21 +0000 (20:03 +0200)]
More binding functionality
niklaspandersson [Thu, 4 Jul 2013 14:13:11 +0000 (16:13 +0200)]
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
niklaspandersson [Thu, 4 Jul 2013 14:12:19 +0000 (16:12 +0200)]
psd::producer_factory
Helge Norberg [Thu, 4 Jul 2013 12:17:36 +0000 (14:17 +0200)]
work in progress changes