summaryrefslogtreecommitdiffstats
path: root/ffserver_config.c
Commit message (Collapse)AuthorAgeFilesLines
* ffserver_config: reflow add_codec()Reynaldo H. Verdejo Pinochet2014-12-091-24/+28
| | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: break lines at 80 charsReynaldo H. Verdejo Pinochet2014-12-091-63/+105
| | | | | | Add braces when needed and drop redundant parethesis while at it. Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: improve error/warning messagesReynaldo H. Verdejo Pinochet2014-12-091-35/+36
| | | | | | Fix grammar and quote user-supplied values. Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: check strchr() return for NULLReynaldo H. Verdejo Pinochet2014-12-091-1/+7
| | | | | | Should fix FFmpeg Coverity Scan issue #1257013 Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: fix line width on fwd declarationsReynaldo H. Verdejo Pinochet2014-12-061-4/+6
| | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: reflow _get_arg()Reynaldo H. Verdejo Pinochet2014-12-061-12/+8
| | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: reflow _parse_ffconfig()Reynaldo H. Verdejo Pinochet2014-12-061-12/+14
| | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: print warning when using default valueLukasz Marek2014-12-021-3/+35
| | | | | | | Some of the defaults may be harmful (like buffer size). It is good user is aware of that. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: set defaults basing on absence of set valueLukasz Marek2014-12-021-10/+10
| | | | | | | This prevents the situation when user set option to 0 and ffserver threats it as not set value, so applies the default. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: remove useless defaultsLukasz Marek2014-12-021-45/+0
| | | | | | | | | Options are already set to its defaults by AVOption API. The only difference is for qmin, new default is 2, ffserver set to 3. It is dead code because if condition is not meet unless user set option to 0. Meeting condition would mean that ffserver overwrites explicity set option. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver: dont leak child argumentsLukasz Marek2014-11-261-2/+18
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver: export recommented encoder configurationLukasz Marek2014-11-261-18/+59
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver: allow skip setting defaultsLukasz Marek2014-11-261-0/+35
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: remove ffserver_apply_stream_config functionLukasz Marek2014-11-261-13/+13
| | | | | | This function became very short and can be logically merged with add_codec(). Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: map ffserver options to AVOptionsLukasz Marek2014-11-261-168/+70
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: cosmetic: move line_num into FFServerConfigLukasz Marek2014-11-261-57/+57
| | | | | Moving line_num into FFServerConfig as parser state, saves many passes of it aside of FFServerConfig pointer.
* ffserver_config: cosmetic: simplify functions calls.Lukasz Marek2014-11-261-46/+45
| | | | | | | | ffserver_save_avoption() and ffserver_opt_preset() have redundant arguments. They can be obtained basing on media type. This simplifies uses and reduce chance for a mistake. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: fix possible crashLukasz Marek2014-11-171-3/+3
| | | | | | Fixes CID #1254662 Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: do not store preset nameLukasz Marek2014-11-171-13/+2
| | | | | | | | | Preset are translated to AVOptions. It is not required to reparse anymore. Fixes CID #1254667 Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: handle codec private optionsLukasz Marek2014-11-161-80/+147
| | | | | | | This commit allows to set codec's private option. As side effect, it also improves preset support. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: report not closed last tagLukasz Marek2014-11-121-0/+2
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: drop requirement video size being multiple of 16Lukasz Marek2014-11-111-2/+2
| | | | | | | Such strong requirement constraint doesn't allow to use 360p. Changed to warning when video size is not being multiple of 2. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: add fixme on buffer_aggressivity/eq deprecationReynaldo H. Verdejo Pinochet2014-11-021-0/+2
| | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: simplify some if true conditionsReynaldo H. Verdejo Pinochet2014-11-021-6/+6
| | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: fix line lengthsReynaldo H. Verdejo Pinochet2014-11-021-63/+127
| | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* ffserver_config: improve AVOption handingLukasz Marek2014-11-031-17/+35
| | | | | | | | | | | | AVOption are checked right after found in config file. It allows to report exact line in config file. Options provided more than once are threated as errors. It also fixes flag options handing. Flags may occur more than once in config file. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: improve error handlingLukasz Marek2014-11-021-21/+26
| | | | | | | | Replace atoi with more advanced parsing routine. Set maximum port value to 65535 (not 65536). Other checks. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: dont pass pointer to enum as pointer to intLukasz Marek2014-11-021-2/+5
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: fix compilation warningLukasz Marek2014-11-011-1/+1
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: postpone codec context creationLukasz Marek2014-11-011-95/+291
| | | | | | | | | So far AVCodecContext was created without codec specified. This causes internal data to not be initialized to defaults. This commit postpone context creation until all information is gathered. Partially fixes #1275
* ffserver_conf: factorize parse function per config tagLukasz Marek2014-10-221-585/+539
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: clean up variable initializationLukasz Marek2014-10-221-11/+5
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver: move configuration code to separate fileLukasz Marek2014-10-221-0/+986
This commit doesn't change any existing logic. It moves ffserver configuration related code to separate file. It intends to make maintaining easier. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
OpenPOWER on IntegriCloud