f9315ea984
ffserver_config: Check for failure to allocate FFServerIPAddressACL
Fixes CID1396537
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
606702ea34
ffsrever: Make the status page bitexact if any stream is bitexact
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
472fee91bc
ffserver_config: Setup codecpar in add_codec()
fixes segfault in the status page code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
75b436d8b6
ffserver: Remove use of AVStream as a intermediate to store parameters
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
f67d22f0fd
ffserver: Throw ffm.h out its not used except for a constant that is part of the format
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
2ac5a1a28e
ffserver: NoVideo and NoAudio flags weren't cleared between streams.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
4c8ca76965
ffserver_config: check for INT_MIN before doing FFABS
FFABS(INT_MIN) is not safe. Alternative of using FFNABS is not as
readable.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
10 years ago
1175bbd14f
ffserver: fix line wrapping on function decls
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
086718e8f7
ffserver: drop unneeded branching
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
83411d7331
ffserver: drop error counting when parsing ACL row
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
5c1acf0a09
ffserver: rm whitespace c&p leftovers from macro
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
7a30f51446
ffserver: remove useless assignment leftover
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
eb613877bf
ffserver: break early on _parse_acl_row()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
7e12a54251
ffserver: use -b instead of -ab for setting audio bitrate.
10 years ago
3b89a67315
ffserver: Use singlejpeg muxer for jpeg
Fixes Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
720dffb843
ffserver_config: reflow add_codec()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
b4c69b7ea8
ffserver_config: break lines at 80 chars
Add braces when needed and drop redundant parethesis while at it.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
b28d587782
ffserver_config: improve error/warning messages
Fix grammar and quote user-supplied values.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
f95cfff077
ffserver_config: check strchr() return for NULL
Should fix FFmpeg Coverity Scan issue #1257013
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
7cdc99707b
ffserver_config: fix line width on fwd declarations
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
ac896f0cd1
ffserver_config: reflow _get_arg()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
da95fe4ef8
ffserver_config: reflow _parse_ffconfig()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
302ed9c43f
ffserver_config: print warning when using default value
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>
11 years ago
2f4233614a
ffserver_config: set defaults basing on absence of set value
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>
11 years ago
c8ac46e924
ffserver_config: remove useless defaults
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>
11 years ago
3cb0bec687
ffserver: dont leak child arguments
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
ec6e035b8b
ffserver: export recommented encoder configuration
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
aaf6cc925f
ffserver: allow skip setting defaults
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
6c2ed67c2f
ffserver_config: remove ffserver_apply_stream_config function
This function became very short and can be logically merged with add_codec().
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
f61cb6453d
ffserver_config: map ffserver options to AVOptions
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
d57a6d2087
ffserver_config: cosmetic: move line_num into FFServerConfig
Moving line_num into FFServerConfig as parser state,
saves many passes of it aside of FFServerConfig pointer.
11 years ago
e98aced699
ffserver_config: cosmetic: simplify functions calls.
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>
11 years ago
3f07dd6e39
ffserver_config: fix possible crash
Fixes CID #1254662
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
1a054bd187
ffserver_config: do not store preset name
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>
11 years ago
a38e06c1aa
ffserver_config: handle codec private options
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>
11 years ago
5aed6f56d9
ffserver_config: report not closed last tag
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
758a66dc16
ffserver_config: drop requirement video size being multiple of 16
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>
11 years ago
33aacb7750
ffserver_config: add fixme on buffer_aggressivity/eq deprecation
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
17cc78505c
ffserver_config: simplify some if true conditions
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
200270cc8b
ffserver_config: fix line lengths
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
9c097f1cfc
ffserver_config: improve AVOption handing
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>
11 years ago
2121e3e130
ffserver_config: improve error handling
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>
11 years ago
e9899ca3dd
ffserver_config: dont pass pointer to enum as pointer to int
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
d2d97b34a0
ffserver_config: fix compilation warning
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
ed1f8915da
ffserver_config: postpone codec context creation
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
11 years ago
27c61c32ce
ffserver_conf: factorize parse function per config tag
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
d2f8ca4959
ffserver_config: clean up variable initialization
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
f524d2e47c
ffserver: move configuration code to separate file
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>
11 years ago
Michael Niedermayer
Zalewa
Ganesh Ajjanagadde
Reynaldo H. Verdejo Pinochet
Ronald S. Bultje
Caligula useraccount
Lukasz Marek