]>
git.sesse.net Git - casparcg/log
cambell [Sat, 15 Jun 2013 03:31:44 +0000 (10:31 +0700)]
ffmpeg: Add support for arbitrary ffmpeg options in ffmpeg_producer
Helge Norberg [Tue, 11 Jun 2013 14:31:55 +0000 (16:31 +0200)]
Experimental support for switching output between premultiplied / straight alpha
Use
MIXER 1 STRAIGHT_ALPHA_OUTPUT 1
to turn on straight alpha output on channel 1 or configure it in casparcg.config under the <straight-alpha-output /> element for the channel
The default is to not use straight alpha output
#50
Helge Norberg [Tue, 11 Jun 2013 12:14:25 +0000 (14:14 +0200)]
Made ffmpeg producer output relative path (to media folder) via OSC instead of absolute path
Helge Norberg [Mon, 10 Jun 2013 14:49:05 +0000 (16:49 +0200)]
Return by const reference instead of by value in parameters class.
Helge Norberg [Mon, 10 Jun 2013 13:01:11 +0000 (15:01 +0200)]
Fixed bug where protocol splitting didn't require :// but any of :, / or /
Helge Norberg [Wed, 5 Jun 2013 16:06:23 +0000 (18:06 +0200)]
Make ffmpeg producer send osc messages while at eof.
Helge Norberg [Wed, 5 Jun 2013 15:00:16 +0000 (17:00 +0200)]
Added support for mixer commands to return current values
#141
Helge Norberg [Tue, 4 Jun 2013 15:27:52 +0000 (17:27 +0200)]
Consider a layer paused only if explicitly paused
Helge Norberg [Tue, 4 Jun 2013 15:26:44 +0000 (17:26 +0200)]
straighten alpha before applying contrast-saturation-brightness when contrast is less than 1 and remultiply afterwards to prevent rgb values from rising above alpha value for each pixel.
#140
Helge Norberg [Tue, 4 Jun 2013 11:39:35 +0000 (13:39 +0200)]
Introduced paused OSC message for a layer
Helge Norberg [Mon, 3 Jun 2013 16:23:03 +0000 (18:23 +0200)]
Updated CHANGES.txt
niklaspandersson [Mon, 3 Jun 2013 15:31:05 +0000 (17:31 +0200)]
fixes an issue with negative scale in mixer fill commands. it now does what one expects, namely reflects the image.
Helge Norberg [Fri, 31 May 2013 18:28:55 +0000 (20:28 +0200)]
Misc refactoring and fixes
Helge Norberg [Fri, 31 May 2013 15:12:58 +0000 (17:12 +0200)]
Some refactoring based on the new parameters class
Helge Norberg [Fri, 31 May 2013 12:20:06 +0000 (14:20 +0200)]
Merge branch 'master' of https://github.com/CasparCG/Server
Helge Norberg [Fri, 31 May 2013 12:19:57 +0000 (14:19 +0200)]
Misc changes
HellGore [Fri, 31 May 2013 12:18:56 +0000 (05:18 -0700)]
Merge pull request #138 from cambell-prince/master_parameters1
Rebase parameters branch on current master.
cambell [Fri, 31 May 2013 02:01:53 +0000 (09:01 +0700)]
Rebase parameters branch on current master.
* Change parameters const& to const parameters& for coding style.
* Update thumbnail producer to use parameters class.
* Update some methods to use params.get(...) rather than get_params.
Conflicts:
core/core.vcxproj
HellGore [Thu, 30 May 2013 13:38:11 +0000 (06:38 -0700)]
Merge pull request #134 from cambell-prince/master_dshow
ffmpeg dshow: Fix packet life preserver in video_decoder
Helge Norberg [Thu, 30 May 2013 13:35:10 +0000 (15:35 +0200)]
Changed copyright header in all files, and added it in some files where it was missing.
#132
Helge Norberg [Thu, 30 May 2013 12:15:10 +0000 (14:15 +0200)]
Statically link against SFML instead of dynamically
#117
Helge Norberg [Thu, 30 May 2013 08:42:24 +0000 (10:42 +0200)]
Merge branch 'master' of https://github.com/CasparCG/Server
HellGore [Thu, 30 May 2013 08:42:23 +0000 (01:42 -0700)]
Merge pull request #136 from cambell-prince/master_chroma
chroma feature: MIXER 1-1 CHROMA GREEN|BLUE 0.10 0.04
Helge Norberg [Wed, 29 May 2013 07:53:25 +0000 (09:53 +0200)]
Fixed problem in audio_mixer where a default constructed channel_layout was used. Also fixed so that default constructed channel_layout and mix_config instances doesn't have uninitialized members
Helge Norberg [Wed, 29 May 2013 07:51:04 +0000 (09:51 +0200)]
Removed unnecessary exception throwing for absent template-hosts element in config file.
Helge Norberg [Wed, 29 May 2013 07:46:43 +0000 (09:46 +0200)]
changed term prenumeration to subscription in OSC implementation
cambell [Tue, 28 May 2013 19:03:45 +0000 (02:03 +0700)]
chroma feature: MIXER 1-1 CHROMA GREEN|BLUE 0.10 0.04
Helge Norberg [Tue, 28 May 2013 17:46:31 +0000 (19:46 +0200)]
Modifications to OSC support after discussions with Robert Nagy
cambell [Tue, 28 May 2013 14:09:42 +0000 (21:09 +0700)]
ffmpeg dshow: Fix packet life preserver in video_decoder and revert move of packet pop.
Helge Norberg [Tue, 28 May 2013 12:39:04 +0000 (14:39 +0200)]
Modifications of audio config xml.
Helge Norberg [Tue, 28 May 2013 10:30:45 +0000 (12:30 +0200)]
removed include
Helge Norberg [Mon, 27 May 2013 18:23:42 +0000 (20:23 +0200)]
Modified OSC support so that whenever an AMCP connection is established an OSC client is started against the AMCP client ip using a default udp port configurable in casparcg.config. The OSC client will follow the lifycycle of the AMCP connection. A <osc><predefined-clients></predefined-clients></osc> element is provided to setup persistent OSC clients just as today.
Helge Norberg [Mon, 27 May 2013 09:14:09 +0000 (11:14 +0200)]
Fixed bug in OSC implementation where the little endian byte order was used in values sent. Big endian byte order should be used according to spec.
Helge Norberg [Mon, 27 May 2013 08:39:15 +0000 (10:39 +0200)]
Added missing library when linking in release, develop and profile configuration
HellGore [Mon, 27 May 2013 08:15:02 +0000 (01:15 -0700)]
Merge pull request #131 from Julusian/master
ffmpeg streams/devices support
Julian Waller [Thu, 23 May 2013 17:41:21 +0000 (18:41 +0100)]
Dshow filter input (webcam, firewire dv) and live stream playback support.
Based on https://github.com/CasparCG/Server/pull/120 by cambell-prince
Peter Karlsson [Tue, 21 May 2013 07:01:25 +0000 (09:01 +0200)]
Changed the default port for OSC protocol when parsing the config.
Helge Norberg [Mon, 20 May 2013 13:23:52 +0000 (15:23 +0200)]
Modified default OSC port
Helge Norberg [Wed, 15 May 2013 14:33:35 +0000 (16:33 +0200)]
Fixed followup bug in output.cpp where iterator incrementation happened although the iterator was already placed on the next element.
Thanks to Robert Nagy for reporting the original bug and spotting the followup bug.
Helge Norberg [Wed, 15 May 2013 09:34:53 +0000 (11:34 +0200)]
Fixed bug in output.cpp where an invalidated iterator was iterated
Jonas Hummelstrand [Thu, 2 May 2013 11:27:27 +0000 (14:27 +0300)]
Update README.txt
Helge Norberg [Tue, 30 Apr 2013 16:31:40 +0000 (18:31 +0200)]
Added support for custom audio channel layout in decklink consumer via AMCP as well as via config file.
#61
Helge Norberg [Tue, 30 Apr 2013 15:05:45 +0000 (17:05 +0200)]
Added support for more than 2 audio channels
#61
niklaspandersson [Fri, 19 Apr 2013 10:49:58 +0000 (12:49 +0200)]
Reduced use of temporaries and minor optimizations in AMCPProtocolStrategy::Parse in order to address #113
also increased buffersize in SocketInfo to be more efficient
Helge Norberg [Wed, 17 Apr 2013 12:19:05 +0000 (14:19 +0200)]
Added RESTART AMCP command and batch file to perform the relaunch
Start via casarcg_auto_restart.bat to make the RESTART command work as expected
#112
Helge Norberg [Tue, 16 Apr 2013 16:35:03 +0000 (18:35 +0200)]
Merge branch 'master' of https://github.com/CasparCG/Server
Helge Norberg [Tue, 16 Apr 2013 16:34:22 +0000 (18:34 +0200)]
Made audio_candence sequences mean the number of samples per channel instead of the number of samples for *both* channels
#6
Fixed bug where we give too few samples to the decklink driver each time RenderAudioSamples() is called (constant rate of 50 calls per second) when the video format has a frame rate > 50 like 59.94 and 60
#22
Jonas Hummelstrand [Mon, 15 Apr 2013 14:55:07 +0000 (17:55 +0300)]
Updated the part about turning off Aero and ClearType
Helge Norberg [Mon, 15 Apr 2013 11:26:45 +0000 (13:26 +0200)]
Merge branch 'master' of https://github.com/CasparCG/Server
Helge Norberg [Mon, 15 Apr 2013 10:58:24 +0000 (12:58 +0200)]
Merge pull request #104 from ronag/master
Helge Norberg [Mon, 15 Apr 2013 10:58:24 +0000 (12:58 +0200)]
Merge branch 'master' of https://github.com/ronag/Server into master
Helge Norberg [Mon, 15 Apr 2013 10:19:57 +0000 (12:19 +0200)]
Merge branch 'master' of https://github.com/ronag/Server into master
Helge Norberg [Fri, 12 Apr 2013 18:39:59 +0000 (20:39 +0200)]
Merge branch 'master' of https://github.com/CasparCG/Server
Helge Norberg [Fri, 12 Apr 2013 18:39:44 +0000 (20:39 +0200)]
#102
Add support for submitting base64 encoded png data to image_consumer
Helge Norberg [Fri, 12 Apr 2013 07:28:17 +0000 (09:28 +0200)]
Add support for loading png from memory
niklaspandersson [Thu, 11 Apr 2013 14:41:12 +0000 (16:41 +0200)]
added code to ensure that environment-paths (log, data, media, etc) always end with a backslash
niklaspandersson [Thu, 11 Apr 2013 14:21:35 +0000 (16:21 +0200)]
issue #97
ready for test
HellGore [Tue, 9 Apr 2013 07:37:31 +0000 (00:37 -0700)]
Merge pull request #98 from CasparCG/git-scp
Changed source control provider.
Peter Karlsson [Tue, 9 Apr 2013 06:54:48 +0000 (08:54 +0200)]
Changed source control provider.
nirklas [Fri, 5 Apr 2013 13:29:52 +0000 (13:29 +0000)]
Fixed issue #23 concerning alpha in PNG-images
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3801
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
HellGore [Mon, 8 Apr 2013 12:34:06 +0000 (05:34 -0700)]
Merge pull request #93 from CasparCG/4k-support
Initial support for 4k.
Helge Norberg [Mon, 8 Apr 2013 12:30:58 +0000 (14:30 +0200)]
Reverted default video mode to PAL
Peter Karlsson [Mon, 8 Apr 2013 12:08:26 +0000 (14:08 +0200)]
Merge branch 'master' of https://github.com/CasparCG/Server into 4k-support
HellGore [Mon, 8 Apr 2013 11:43:48 +0000 (04:43 -0700)]
Merge pull request #89 from CasparCG/feature_gitrev2
A better git revision tagging scheme.
Peter Karlsson [Thu, 4 Apr 2013 12:22:57 +0000 (14:22 +0200)]
Removed files.
Peter Karlsson [Thu, 4 Apr 2013 10:43:45 +0000 (12:43 +0200)]
Added missing files.
Peter Karlsson [Thu, 4 Apr 2013 10:39:01 +0000 (12:39 +0200)]
Updated the DeckLink API to compile using 4k* display modes.
Peter Karlsson [Thu, 4 Apr 2013 07:01:24 +0000 (09:01 +0200)]
Added missing display modes.
Peter Karlsson [Wed, 3 Apr 2013 18:09:53 +0000 (20:09 +0200)]
Initial support for 4k.
TK3 [Thu, 28 Mar 2013 06:11:23 +0000 (02:11 -0400)]
A better git revision tagging scheme. This marks the file manifest properly via shell.rc. This method only tags with the 7 digit revision hash and does not use any git tag information.
Here is an example of what will in title of server console window:
CasparCG Server 2.0.4.
0f063d7 STABLE
TomKaltz [Tue, 26 Mar 2013 20:17:54 +0000 (17:17 -0300)]
Update CHANGES.txt
Fixed typo.
Jonas Hummelstrand [Tue, 26 Mar 2013 15:54:34 +0000 (16:54 +0100)]
Update README.txt
Removed email addresses, to avoid spam.
TK3 [Tue, 26 Mar 2013 15:23:55 +0000 (11:23 -0400)]
Initial subtree merge was performed incorrectly. Move files to correct folder
nirklas [Mon, 25 Mar 2013 14:51:49 +0000 (14:51 +0000)]
Linefeeds in data returned from DATA RETRIEVE is now sent as a linefeed char (0x0a) instead of beeing encoded as "\n".
This is the way xml is returned from the info-command already, all xml returned from caspar is now serialized in the same way.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3787
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
TK3 [Sun, 24 Mar 2013 22:37:53 +0000 (18:37 -0400)]
Import of svn ignores. This needs to be cleaned at some point. Subversion had an ignore property for each directory. Git has one per repository.
This is a generic ignore file that I will commit to all current branches. I did my best to make sure all cases in the current branches are covered.
TK3 [Sun, 24 Mar 2013 15:23:08 +0000 (11:23 -0400)]
Subtree merge of old SVN "docs" folder into the "master" git branch. You can see revision history and do subsequent subtree merges for legacy server branches from the "docs_subtree" git tag. If you need to work on a server revision previous to this commit…DO NOT PERFORM A CONVENTIONAL MERGE. You must use a subtree merge with --prefix=dependencies/ so that these files get put into the correct subdirectory. This is a limitation of the transfer from svn.
TK3 [Sun, 24 Mar 2013 14:48:05 +0000 (10:48 -0400)]
Subtree merge of old SVN "dependencies" folder into the "master" git branch. You can see revision history and do subsequent subtree merges for legacy server branches from the "dependencies_subtree" git tag. If you need to work on a server revision previous to this commit…DO NOT PERFORM A CONVENTIONAL MERGE. You must use a subtree merge with --prefix=dependencies/ so that these files get put into the correct subdirectory. This is a limitation of the transfer from svn.
hellgore [Tue, 19 Mar 2013 15:29:51 +0000 (15:29 +0000)]
3563178 : Added KILL command to shutdown the server without console access.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3783
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
Zebiolo [Mon, 18 Mar 2013 13:35:08 +0000 (13:35 +0000)]
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3782
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 14 Mar 2013 17:09:51 +0000 (17:09 +0000)]
Updated documentation
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3773
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 14 Mar 2013 09:21:20 +0000 (09:21 +0000)]
3607983 : Added support for generating thumbnails
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3772
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Wed, 27 Feb 2013 12:37:47 +0000 (12:37 +0000)]
3606130 : testing code (command line only, not via AMCP over TCP) could cause entire server to crash.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3760
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Wed, 13 Feb 2013 15:39:05 +0000 (15:39 +0000)]
3572363 : Modified title of screen consumer windows
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3754
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Wed, 13 Feb 2013 14:03:13 +0000 (14:03 +0000)]
Modified image_consumer to write to the media folder instead of data folder and to support custom filename instead of default timestamp-based filename
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3753
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Tue, 12 Feb 2013 14:21:25 +0000 (14:21 +0000)]
Added support for setting a mastervolume for a channel. Examples:
MIXER 1 MASTERVOLUME 1
MIXER 1 MASTERVOLUME 0.5
MIXER 1 MASTERVOLUME 0
MIXER 1 MASTERVOLUME 1.1
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3748
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Wed, 6 Feb 2013 12:45:47 +0000 (12:45 +0000)]
Changed date format in logging and added millisecond
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3734
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Mon, 28 Jan 2013 12:58:59 +0000 (12:58 +0000)]
Allow calls to destination producer during transitions
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3719
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 24 Jan 2013 09:52:13 +0000 (09:52 +0000)]
3560321 : Merged patch from Robert Nagy, but haven't been able to play any swf myself. I have tried different versions of the flash player but no luck. Committing anyway because the changes should not impact anything else.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3706
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Fri, 18 Jan 2013 18:17:13 +0000 (18:17 +0000)]
3601399 : Added support for creating two separate files -- one for fill and one for key when recording with the ffmpeg consumer.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3693
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Fri, 18 Jan 2013 13:34:13 +0000 (13:34 +0000)]
3560201 : An attempt to improve delayed frame writing when the ffmpeg consumer is deinitilized.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3690
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Fri, 18 Jan 2013 10:14:02 +0000 (10:14 +0000)]
3601360 : Ensure that the ffmpeg consumer cannot block the channel output thread if the previous frame is still being encoded when a new one arrives. The ffmpeg consumer will instead drop the new frame, ensuring that the channel is otherwise unaffected by the performance problems in the ffmpeg consumer.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3689
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 17 Jan 2013 14:26:32 +0000 (14:26 +0000)]
Simplified bluefish_consumer
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3683
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 17 Jan 2013 13:58:22 +0000 (13:58 +0000)]
Simplified bluefish_consumer
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3682
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 17 Jan 2013 13:22:51 +0000 (13:22 +0000)]
Fixed bug in retry_task
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3678
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
ronag [Mon, 7 Jan 2013 16:49:21 +0000 (16:49 +0000)]
basic_frame/disable_audio: Just forward empty frames.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3645
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
ronag [Fri, 28 Dec 2012 20:37:50 +0000 (20:37 +0000)]
layer: Fixed a problem where first frame was not always shown @ load.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3644
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
ronag [Thu, 6 Dec 2012 16:24:23 +0000 (16:24 +0000)]
Updated README.
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3604
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Tue, 4 Dec 2012 13:29:47 +0000 (13:29 +0000)]
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3590
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 29 Nov 2012 13:46:19 +0000 (13:46 +0000)]
Applied patch which adds support for creating directories that does not exist with DATA STORE and a new DATA REMOVE command
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3585
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d
hellgore [Thu, 29 Nov 2012 10:49:55 +0000 (10:49 +0000)]
Updated documents
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3584
362d55ac -95cf-4e76-9f9a-
cbaa9c17b72d