98aafc5bbf 
								
							
								 
							
						 
						
							
							
								
								timecode: set a fixed buffer size of 16B for tc string.  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								940d3cc0b0 
								
							
								 
							
						 
						
							
							
								
								drawtext: fix hard dependency to lavc (timecode).  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d4b63054d9 
								
							
								 
							
						 
						
							
							
								
								cosmetics: Drop unnecessary parentheses around return values.  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1858a5c25e 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: select YUV color for drawbox() in case YUV colorspace is used  
							
							Fix box alpha rendering when a YUV colorspace is selected, in particular
fix trac ticket #763 . 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								80914cde6f 
								
							
								 
							
						 
						
							
							
								
								timecode: rename internal ff_* symbols to avpriv_*.  
							
							Those functions are shared between libs.
Also fix a typo in function names: smtpe → smpte. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								fa4e30af7e 
								
							
								 
							
						 
						
							
							
								
								drawtext: allow burning the timecode.  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								78212cefe1 
								
							
								 
							
						 
						
							
							
								
								drawtext: remove typo  
							
							It slipped through the last two iterations. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f5edfc9e92 
								
							
								 
							
						 
						
							
							
								
								drawtext: introduce rand(min, max)  
							
							Signed-off-by: Luca Barbato <lu_zero@gentoo.org> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								73585620b8 
								
							
								 
							
						 
						
							
							
								
								drawtext: introduce explicit draw/hide variable  
							
							Signed-off-by: Luca Barbato <lu_zero@gentoo.org> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								dda3d716d6 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: support W/H parameters to reduce UI differences to qatar  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f88d5df383 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: cosmetics to reduce diff to qatar  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								297422b338 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: Add main_w/h to improve compatibility with the modified UI  
							
							from the fork.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2cf74eca70 
								
							
								 
							
						 
						
							
							
								
								drawtext: make x and y parametric  
							
							Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H",
"text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with
vf_overlay and refactor the code accordingly. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ec11ff8407 
								
							
								 
							
						 
						
							
							
								
								drawtext: manage memory allocation better  
							
							Call dtext_prepare_text as early as possible
Do not draw if the memory allocation failed 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a2fb4bcb01 
								
							
								 
							
						 
						
							
							
								
								drawtext: refactor draw_text  
							
							Split the memory allocation from the actual drawing. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2f0f9a87d0 
								
							
								 
							
						 
						
							
							
								
								Fix various if parenthesis misplacements.  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5af7daabc4 
								
							
								 
							
						 
						
							
							
								
								Mark AVFilterPad[] compound literals as const.  
							
							GCC 4.6.2 at least still seems to fail to put them in .rodata though,
see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d78473334e 
								
							
								 
							
						 
						
							
							
								
								Add const to static arrays where it was forgotten.  
							
							Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								124e28847b 
								
							
								 
							
						 
						
							
							
								
								Remove some stray unnecessary ffmpeg references.  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a2af901295 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: remove mathematical constants now redundant.  
							
							Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								145f741e11 
								
							
								 
							
						 
						
							
							
								
								AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9921613e82 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: apply misc style fixes  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								80daa247d8 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: do not reset "n" variable to 0 in case the filter is reinited  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								87f5e79732 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: use ctx for expressing outlink and dtext in end_frame  
							
							(Very) slighly improve readability. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								3de684206e 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: perform misc cosmetics changes to uninit  
							
							In particular:
* lexically sort strings freeing commands
* logically group freeing instructions
* prefer NULL over 0 when setting dtext->glyphs 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								275516f87c 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: set string defaults in the options array  
							
							Simplify. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								482ce0ce4e 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: make x and y options parametric  
							
							Address trac issue #378 . 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								163854bca0 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: drop text wrapping feature  
							
							Or in other word, do not go to the next line when the text cannot be
rendered within the frame.
The rationale is that wrapping is hard to manage, as it depends on the
position of the text, thus making hard/impossible to compute the size
occupied by the rendered text, and makes the filter behavior
unpredictible with moving text (implemented in a pending patch).
Also the current wrapping code is very limited (for example it splits
words in the middle), and correctly handling wrapping requires much
more complexity (alignment, gravity, word parsing etc.), while
drawtext is meant to be only a thin wrapper around libfreetype, so
such advanced features don't belong here. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b87d4c2b9f 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: do not set limitations on fontsize  
							
							It may be needed to use values greater than 72, and in general greater
than an arbitrary big value. Let the user choose what's too big for
her. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								3a87dce6bf 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: remove useless and misnamed intermediary "baseline" variable in draw_text()  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								500b3210da 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: fix background box coloring with RGB formats != RGBA  
							
							drawbox() expects a color specified in RGBA format, while the code was
providing a color with the components specified in the same order of
the input pixel format.
In particular, fix box coloring with AXXX RGB formats. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								db56a7507e 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: prefer int over unsigned int  
							
							This avoids overflow errors when the considered x and y values are
negative, as required by the incoming patches. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								79eff91325 
								
							
								 
							
						 
						
							
							
								
								AVOptions: deprecate av_opt_set_defaults2  
							
							It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore. 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								845383c358 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: always use expanded_text as we always support strftime() now and dont depend on localtime_r() anymore  
							
							Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								038a465efc 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: make strftime work without localtime_r()  
							
							modern OS should have localtime_r() or return thread locals on localtime() hopefully
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b881a2e254 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: Fix reinit to allow color changes.  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								595cfdef97 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0  
							
							the basetime argument also enables useage of pts instead of time()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								3016c7f543 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: fix segfault on reinit  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f782ce3b4d 
								
							
								 
							
						 
						
							
							
								
								drawtext: Support changing parameters through reinit command at runtime.  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								965fdda015 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: Remove some write-only variables.  
							
							libavfilter/vf_drawtext.c:427:22: warning: variable 'dst_pixel' set but not used
libavfilter/vf_drawtext.c:463:22: warning: variable 'dst_pixel' set but not used 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								702a62a1c6 
								
							
								 
							
						 
						
							
							
								
								drawtext: add braces around initialisers for option defaults  
							
							Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)
Signed-off-by: Anton Khirnov <anton@khirnov.net> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								53a715f576 
								
							
								 
							
						 
						
							
							
								
								drawtext: reindent after the previous commit  
							
							Signed-off-by: Anton Khirnov <anton@khirnov.net> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								3fd53defaa 
								
							
								 
							
						 
						
							
							
								
								drawtext: fix strftime() text expansion  
							
							The feature was dropped after the filter was partially rewritten and
recommitted.
Signed-off-by: Anton Khirnov <anton@khirnov.net> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								fd2c0a5db2 
								
							
								 
							
						 
						
							
							
								
								lavfi: add layout negotiation fields and helper functions.  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								5ac4952a58 
								
							
								 
							
						 
						
							
							
								
								vf_drawtext: Replace FFmpeg by Libav in license boilerplate.  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d8c7a21602 
								
							
								 
							
						 
						
							
							
								
								drawtext: specify union type for setting default options  
							
							Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’) 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e8ea9c2179 
								
							
								 
							
						 
						
							
							
								
								drawtext: reindent after the previous commit  
							
							
								
							
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ce207e050e 
								
							
								 
							
						 
						
							
							
								
								drawtext: fix strftime() text expansion  
							
							The feature was dropped after the filter was partially rewritten and
recommitted.
Fix issue #207 . 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c5420f100f 
								
							
								 
							
						 
						
							
							
								
								drawtext: add shadow support.  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net> 
							
						 
						14 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								e73127a443 
								
							
								 
							
						 
						
							
							
								
								drawtext: factor draw_glyphs.  
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net> 
							
						 
						14 years ago