]> git.sesse.net Git - casparcg/log
casparcg
10 years agoInitial unit tests using google test
Helge Norberg [Thu, 10 Oct 2013 12:55:11 +0000 (14:55 +0200)]
Initial unit tests using google test

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agomanually merged a72be89 from master
niklaspandersson [Wed, 9 Oct 2013 07:57:59 +0000 (09:57 +0200)]
manually merged a72be89 from master

10 years agoChanges after feedback by Robert Nagy
Helge Norberg [Fri, 27 Sep 2013 10:03:34 +0000 (12:03 +0200)]
Changes after feedback by Robert Nagy

10 years agoMisc modifications to fix problems found by static code analysis and some simplificat...
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

10 years agoFinished support for CHANNEL_GRID in 2.1.0
Helge Norberg [Thu, 26 Sep 2013 11:52:32 +0000 (13:52 +0200)]
Finished support for CHANNEL_GRID in 2.1.0

10 years agoRemove .plist files after clang-analyse
Helge Norberg [Thu, 26 Sep 2013 11:10:37 +0000 (13:10 +0200)]
Remove .plist files after clang-analyse

10 years agoFixed some issues detected by clang static analysis, also created bat file that launc...
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

10 years agoChanged use of microsoft specific sealed keyword to /* final */ to indicate intent
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

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoMisc changes
Helge Norberg [Wed, 25 Sep 2013 13:01:26 +0000 (15:01 +0200)]
Misc changes

10 years agoChanged permission.
U-Peter-PC\Peter [Fri, 20 Sep 2013 11:14:00 +0000 (13:14 +0200)]
Changed permission.

10 years agomanually merged 4a2171b from master
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

10 years agomanually merged 44a5538 from master
niklaspandersson [Mon, 2 Sep 2013 07:49:59 +0000 (09:49 +0200)]
manually merged 44a5538 from master

10 years agoManually merged fe983d5 from master
niklaspandersson [Fri, 30 Aug 2013 11:54:46 +0000 (13:54 +0200)]
Manually merged fe983d5 from master

10 years agomanually merged d21afbd from master
niklaspandersson [Fri, 30 Aug 2013 10:21:13 +0000 (12:21 +0200)]
manually merged d21afbd from master
manually merged 483ca71 from master

10 years agomanually merged f1e09f6 from master
niklaspandersson [Fri, 30 Aug 2013 10:14:42 +0000 (12:14 +0200)]
manually merged f1e09f6 from master

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoManually merged 77fbc02 from master
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)

10 years agoManually merged 77fbc02 from master
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)

10 years agoManually merged 9e597f6 from master
niklaspandersson [Fri, 30 Aug 2013 08:33:37 +0000 (10:33 +0200)]
Manually merged 9e597f6 from master

10 years agoManually merged 44adc50 from master
niklaspandersson [Fri, 30 Aug 2013 08:17:45 +0000 (10:17 +0200)]
Manually merged 44adc50 from master

10 years ago* added dependencies64/freetype to gitignore
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

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoManually merged 0edf4e5 (excluding changes to ffmpeg) from master
niklaspandersson [Thu, 29 Aug 2013 13:39:56 +0000 (15:39 +0200)]
Manually merged 0edf4e5 (excluding changes to ffmpeg) from master

10 years agoAdded basic support for image sequences.
Helge Norberg [Thu, 29 Aug 2013 09:35:59 +0000 (11:35 +0200)]
Added basic support for image sequences.

10 years agoFixed merge error in core.vcxproj.filters
Helge Norberg [Mon, 26 Aug 2013 15:42:52 +0000 (17:42 +0200)]
Fixed merge error in core.vcxproj.filters

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoAdvanced expression parsing for creating runtime bindings based on a textual represen...
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.

10 years ago* psd: added support for scaling and tracking in text-producer
niklaspandersson [Tue, 20 Aug 2013 12:12:20 +0000 (14:12 +0200)]
* psd: added support for scaling and tracking in text-producer

10 years ago* psd: support for scaling text-layers
niklaspandersson [Tue, 20 Aug 2013 08:39:04 +0000 (10:39 +0200)]
* psd: support for scaling text-layers

10 years ago* psd: support for extracting scaling-data of text-layer, and extracting sheet-color...
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

10 years ago* new way of mapping font-name to font-file. Using postscript font-name instead of...
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.

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years ago* some refactoring i psd + support for rectangular vector-masks
niklaspandersson [Fri, 16 Aug 2013 13:10:50 +0000 (15:10 +0200)]
* some refactoring i psd + support for rectangular vector-masks

10 years ago* support for clearing/overriding a channel lock
niklaspandersson [Fri, 16 Aug 2013 13:10:08 +0000 (15:10 +0200)]
* support for clearing/overriding a channel lock

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoInitial XML format for scenes and timeline support for PSD
Helge Norberg [Fri, 16 Aug 2013 12:26:24 +0000 (14:26 +0200)]
Initial XML format for scenes and timeline support for PSD

10 years ago* AsyncEventServer: implemented send-queue and protected socket->async_write_some...
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

10 years ago* psd-importer: fixed support for new descriptor value-type
niklaspandersson [Wed, 14 Aug 2013 09:04:30 +0000 (11:04 +0200)]
* psd-importer: fixed support for new descriptor value-type

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years ago* the psd-importer now extracts timeline-data
niklaspandersson [Wed, 14 Aug 2013 07:58:20 +0000 (09:58 +0200)]
* the psd-importer now extracts timeline-data

10 years agoAdded basic timeline/keyframe support in scene_producer
Helge Norberg [Tue, 13 Aug 2013 09:25:42 +0000 (11:25 +0200)]
Added basic timeline/keyframe support in scene_producer

10 years agoAdditional font metrics and correct height calculation
Helge Norberg [Tue, 13 Aug 2013 09:24:58 +0000 (11:24 +0200)]
Additional font metrics and correct height calculation

10 years ago* made lifecycle_bound_objects_ thread-safe
niklaspandersson [Tue, 13 Aug 2013 07:48:52 +0000 (09:48 +0200)]
* made lifecycle_bound_objects_ thread-safe

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoAdded missing files
Helge Norberg [Mon, 12 Aug 2013 16:14:21 +0000 (18:14 +0200)]
Added missing files

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years ago* refactoring of AMCPProtocolStrategy::Parse and the AMCPCommands
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

10 years agoAdded support for psd placeholder layer
Helge Norberg [Fri, 9 Aug 2013 15:56:55 +0000 (17:56 +0200)]
Added support for psd placeholder layer

10 years agoAllow for a scene_producer to expose parameters updateable via CALL
Helge Norberg [Fri, 9 Aug 2013 13:02:36 +0000 (15:02 +0200)]
Allow for a scene_producer to expose parameters updateable via CALL

10 years ago* implemented lifecycle-bound functions in caspar::io::connection
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

10 years ago* added factory-parameters for font, size and color to text-producer
niklaspandersson [Thu, 8 Aug 2013 08:18:54 +0000 (10:18 +0200)]
* added factory-parameters for font, size and color to text-producer

10 years ago* renamed psd.h/cpp to psd_scene_producer.h/cpp
niklaspandersson [Thu, 8 Aug 2013 07:36:00 +0000 (09:36 +0200)]
* renamed psd.h/cpp to psd_scene_producer.h/cpp

10 years ago* exposed function bool try_get_color(const std::wstring& str, uint32_t& value) from...
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

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years ago* fixed fontname-to-file mapping
niklaspandersson [Wed, 7 Aug 2013 14:35:51 +0000 (16:35 +0200)]
* fixed fontname-to-file mapping

10 years agomade 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

10 years agomade 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

10 years agosimplified the handling of parameters
niklaspandersson [Wed, 7 Aug 2013 10:45:47 +0000 (12:45 +0200)]
simplified the handling of parameters

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agodisabled GL_DEPTH_TEST to prevent z-fighting in text-producer
niklaspandersson [Wed, 7 Aug 2013 08:25:04 +0000 (10:25 +0200)]
disabled GL_DEPTH_TEST to prevent z-fighting in text-producer

10 years ago* made it optional to normalize coordinates of a text-producer in order for it to...
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

10 years agoChanged CALL params to vector of strings
Helge Norberg [Wed, 7 Aug 2013 08:01:30 +0000 (10:01 +0200)]
Changed CALL params to vector of strings

10 years agobinding between linked layers in psd-import/scene-producer
niklaspandersson [Tue, 6 Aug 2013 12:51:35 +0000 (14:51 +0200)]
binding between linked layers in psd-import/scene-producer

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoadded freetype to dependencies
niklaspandersson [Mon, 5 Aug 2013 06:33:14 +0000 (08:33 +0200)]
added freetype to dependencies

10 years agoadded freetype to dependencies
niklaspandersson [Mon, 5 Aug 2013 06:33:14 +0000 (08:33 +0200)]
added freetype to dependencies

10 years ago* added geometry to frames for custom rendering
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

10 years ago* added parsing of text-layer data
niklaspandersson [Wed, 24 Jul 2013 09:33:56 +0000 (11:33 +0200)]
* added parsing of text-layer data

10 years agopreparing for allowing producers to supply own geometry:
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

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agoadded a pdf-parser for the psd-import
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

10 years agoSupport for ternary operator equivalent for bindings
Helge Norberg [Fri, 5 Jul 2013 13:45:53 +0000 (15:45 +0200)]
Support for ternary operator equivalent for bindings

10 years agoadded missing files for psd
niklaspandersson [Fri, 5 Jul 2013 07:15:00 +0000 (09:15 +0200)]
added missing files for psd

10 years agoadded missing files for psd
niklaspandersson [Fri, 5 Jul 2013 07:06:15 +0000 (09:06 +0200)]
added missing files for psd

10 years agoMore binding functionality
Helge Norberg [Thu, 4 Jul 2013 18:03:21 +0000 (20:03 +0200)]
More binding functionality

10 years agoMerge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
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

10 years agopsd::producer_factory
niklaspandersson [Thu, 4 Jul 2013 14:12:19 +0000 (16:12 +0200)]
psd::producer_factory

10 years agowork in progress changes
Helge Norberg [Thu, 4 Jul 2013 12:17:36 +0000 (14:17 +0200)]
work in progress changes

10 years agoconst_producer for psd producer
Helge Norberg [Thu, 4 Jul 2013 11:57:12 +0000 (13:57 +0200)]
const_producer for psd producer

10 years agopsd project-filter file
niklaspandersson [Thu, 4 Jul 2013 11:42:30 +0000 (13:42 +0200)]
psd project-filter file

10 years agoprimal psd-file reading
niklaspandersson [Thu, 4 Jul 2013 10:50:27 +0000 (12:50 +0200)]
primal psd-file reading

10 years agoDraft of interaction with producers and scene_producer
Helge Norberg [Thu, 4 Jul 2013 09:11:00 +0000 (11:11 +0200)]
Draft of interaction with producers and scene_producer

10 years agoDraft of interaction with producers and scene_producer
Helge Norberg [Wed, 3 Jul 2013 15:09:25 +0000 (17:09 +0200)]
Draft of interaction with producers and scene_producer

11 years agoManually merged a05b9884a5fc567f69543bec533a85741d96abc0 from master
Helge Norberg [Wed, 10 Apr 2013 09:33:28 +0000 (11:33 +0200)]
Manually merged a05b9884a5fc567f69543bec533a85741d96abc0 from master

11 years agoManually merged 4ed9d84d4c06b5a7d8c9f6673134057bff74105e from master
Helge Norberg [Wed, 10 Apr 2013 09:20:33 +0000 (11:20 +0200)]
Manually merged 4ed9d84d4c06b5a7d8c9f6673134057bff74105e from master

11 years agoManually merged 5af7ffa2fd90fc8910504505a1427784205348b1 from master
Helge Norberg [Wed, 10 Apr 2013 09:15:29 +0000 (11:15 +0200)]
Manually merged 5af7ffa2fd90fc8910504505a1427784205348b1 from master

11 years agoManually merged a8cbbe3ea46850ad53c25a8e75194c5c1ecbb029 from master
Helge Norberg [Wed, 10 Apr 2013 09:05:01 +0000 (11:05 +0200)]
Manually merged a8cbbe3ea46850ad53c25a8e75194c5c1ecbb029 from master

11 years agoManually merged 0471dfe74a9f61e2fc2c03a963d71ba2bb68adc3 from master
Helge Norberg [Wed, 10 Apr 2013 08:33:09 +0000 (10:33 +0200)]
Manually merged 0471dfe74a9f61e2fc2c03a963d71ba2bb68adc3 from master

11 years agoManually merged 678223b9ae0cc2299f2251c9a3029ed6cf8e441e from master
Helge Norberg [Wed, 10 Apr 2013 08:26:24 +0000 (10:26 +0200)]
Manually merged 678223b9ae0cc2299f2251c9a3029ed6cf8e441e from master

11 years agoManually merged 8339b349b586ea704f9a6e0b4e9321b1264dbeab from master
Helge Norberg [Tue, 9 Apr 2013 16:26:54 +0000 (18:26 +0200)]
Manually merged 8339b349b586ea704f9a6e0b4e9321b1264dbeab from master

11 years agoManually merged f669fb3d7a3be5d8e14777531489285dd0d836c4 from master
Helge Norberg [Tue, 9 Apr 2013 15:17:14 +0000 (17:17 +0200)]
Manually merged f669fb3d7a3be5d8e14777531489285dd0d836c4 from master

11 years agoManually merged d9e90d7048a3598924f929540702fbf950524af0 from master
Helge Norberg [Tue, 9 Apr 2013 09:09:45 +0000 (11:09 +0200)]
Manually merged d9e90d7048a3598924f929540702fbf950524af0 from master

11 years agoManually merged 742c071697acf2c0f729d21a7ed02890816b88d5 from master
Helge Norberg [Tue, 9 Apr 2013 08:43:23 +0000 (10:43 +0200)]
Manually merged 742c071697acf2c0f729d21a7ed02890816b88d5 from master

11 years agoManually merged 471ad36afabf567676979759b63e853e8299e086 from master
Helge Norberg [Tue, 9 Apr 2013 08:42:24 +0000 (10:42 +0200)]
Manually merged 471ad36afabf567676979759b63e853e8299e086 from master

11 years agoManually merged f97b5779e4d44205f49ef090ac23c7f0783e4793 from master
Helge Norberg [Tue, 9 Apr 2013 08:41:17 +0000 (10:41 +0200)]
Manually merged f97b5779e4d44205f49ef090ac23c7f0783e4793 from master

11 years agoManually merged ddb7e4a8a12a270d184a7d811f3bd0fe9ff9b937 from master
Helge Norberg [Tue, 9 Apr 2013 08:29:18 +0000 (10:29 +0200)]
Manually merged ddb7e4a8a12a270d184a7d811f3bd0fe9ff9b937 from master

11 years agoManually merged 45dd48d9a175e06bed60e1848b24722f955bd98c from master
Helge Norberg [Tue, 9 Apr 2013 08:12:42 +0000 (10:12 +0200)]
Manually merged 45dd48d9a175e06bed60e1848b24722f955bd98c from master

11 years agoManually merged 1e8f06f8dbd1f5c4f447c1bc60a60e600ad1b942 from master
Helge Norberg [Tue, 9 Apr 2013 08:10:44 +0000 (10:10 +0200)]
Manually merged 1e8f06f8dbd1f5c4f447c1bc60a60e600ad1b942 from master