har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,536 Commits 2 Branches 401 Tags
Commit Graph

43 Commits

Author SHA1 Message Date
Zalewa
2ac5a1a28e ffserver: NoVideo and NoAudio flags weren't cleared between streams. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-21 22:29:15 +01:00
Ganesh Ajjanagadde
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>
 2015-10-13 19:40:09 -04:00
Reynaldo H. Verdejo Pinochet
1175bbd14f ffserver: fix line wrapping on function decls 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-10-04 15:58:35 -07:00
Reynaldo H. Verdejo Pinochet
086718e8f7 ffserver: drop unneeded branching 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-25 17:12:25 -07:00
Reynaldo H. Verdejo Pinochet
83411d7331 ffserver: drop error counting when parsing ACL row 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-25 17:12:25 -07:00
Reynaldo H. Verdejo Pinochet
5c1acf0a09 ffserver: rm whitespace c&p leftovers from macro 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-25 17:12:25 -07:00
Reynaldo H. Verdejo Pinochet
7a30f51446 ffserver: remove useless assignment leftover 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-18 16:24:39 -07:00
Reynaldo H. Verdejo Pinochet
eb613877bf ffserver: break early on _parse_acl_row() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-18 16:24:39 -07:00
Ronald S. Bultje
7e12a54251 ffserver: use -b instead of -ab for setting audio bitrate. 2015-08-28 14:59:58 -04:00
Caligula useraccount
3b89a67315 ffserver: Use singlejpeg muxer for jpeg 
Fixes Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 03:36:22 +02:00
Reynaldo H. Verdejo Pinochet
720dffb843 ffserver_config: reflow add_codec() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-09 01:03:01 -03:00
Reynaldo H. Verdejo Pinochet
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>
 2014-12-09 01:03:01 -03:00
Reynaldo H. Verdejo Pinochet
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>
 2014-12-09 01:03:01 -03:00
Reynaldo H. Verdejo Pinochet
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>
 2014-12-09 01:03:01 -03:00
Reynaldo H. Verdejo Pinochet
7cdc99707b ffserver_config: fix line width on fwd declarations 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-06 02:24:53 -03:00
Reynaldo H. Verdejo Pinochet
ac896f0cd1 ffserver_config: reflow _get_arg() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-06 02:24:53 -03:00
Reynaldo H. Verdejo Pinochet
da95fe4ef8 ffserver_config: reflow _parse_ffconfig() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-12-06 02:24:53 -03:00
Lukasz Marek
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>
 2014-12-02 21:58:35 +01:00
Lukasz Marek
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>
 2014-12-02 21:58:34 +01:00
Lukasz Marek
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>
 2014-12-02 21:58:34 +01:00
Lukasz Marek
3cb0bec687 ffserver: dont leak child arguments 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:33 +01:00
Lukasz Marek
ec6e035b8b ffserver: export recommented encoder configuration 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:33 +01:00
Lukasz Marek
aaf6cc925f ffserver: allow skip setting defaults 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:33 +01:00
Lukasz Marek
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>
 2014-11-26 23:32:33 +01:00
Lukasz Marek
f61cb6453d ffserver_config: map ffserver options to AVOptions 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-26 23:32:29 +01:00
Lukasz Marek
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.
 2014-11-26 23:19:24 +01:00
Lukasz Marek
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>
 2014-11-26 23:19:24 +01:00
Lukasz Marek
3f07dd6e39 ffserver_config: fix possible crash 
Fixes CID #1254662

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-17 00:27:25 +01:00
Lukasz Marek
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>
 2014-11-17 00:27:25 +01:00
Lukasz Marek
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>
 2014-11-16 01:13:38 +01:00
Lukasz Marek
5aed6f56d9 ffserver_config: report not closed last tag 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-12 23:33:08 +01:00
Lukasz Marek
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>
 2014-11-11 01:04:59 +01:00
Reynaldo H. Verdejo Pinochet
33aacb7750 ffserver_config: add fixme on buffer_aggressivity/eq deprecation 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-11-02 22:10:54 -03:00
Reynaldo H. Verdejo Pinochet
17cc78505c ffserver_config: simplify some if true conditions 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-11-02 22:05:54 -03:00
Reynaldo H. Verdejo Pinochet
200270cc8b ffserver_config: fix line lengths 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-11-02 21:54:23 -03:00
Lukasz Marek
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>
 2014-11-03 00:32:25 +01:00
Lukasz Marek
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>
 2014-11-02 23:44:22 +01:00
Lukasz Marek
e9899ca3dd ffserver_config: dont pass pointer to enum as pointer to int 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-02 00:01:29 +01:00
Lukasz Marek
d2d97b34a0 ffserver_config: fix compilation warning 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-01 02:11:52 +01:00
Lukasz Marek
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
 2014-11-01 01:04:12 +01:00
Lukasz Marek
27c61c32ce ffserver_conf: factorize parse function per config tag 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-22 22:37:40 +02:00
Lukasz Marek
d2f8ca4959 ffserver_config: clean up variable initialization 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-10-22 22:37:40 +02:00
Lukasz Marek
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>
 2014-10-22 22:37:40 +02:00