May 2012 - ffmpeg-cvslog - lists.ffmpeg.org

swr-test: use uint_rand() for mode too
by git＠videolan.org 01 May '12

01 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue May 1 13:15:46 2012 +0200| [bea3d19fbb81048e830e1e56e25207299589b394] | committer: Michael Niedermayer swr-test: use uint_rand() for mode too Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bea3d19fbb81048e8… --- libswresample/swresample_test.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libswresample/swresample_test.c b/libswresample/swresample_test.c index 4e27b4e..6a6ba12 100644 --- a/libswresample/swresample_test.c +++ b/libswresample/swresample_test.c @@ -227,10 +227,11 @@ int main(int argc, char **argv){ uint8_t *aout[SWR_CH_MAX]; uint8_t *amid[SWR_CH_MAX]; int flush_i=0; - int mode = 0; + int mode; int max_tests = FF_ARRAY_ELEMS(rates) * FF_ARRAY_ELEMS(layouts) * FF_ARRAY_ELEMS(formats) * FF_ARRAY_ELEMS(layouts) * FF_ARRAY_ELEMS(formats); int num_tests = 10000; uint32_t seed = 0; + uint32_t rand_seed = 0; int remaining_tests[max_tests]; int test; @@ -307,8 +308,7 @@ int main(int argc, char **argv){ #else audiogen(ain, in_sample_fmt, in_ch_count, SAMPLES/6+1, SAMPLES); #endif - mode++; - mode%=3; + mode = uint_rand(rand_seed) % 3; if(mode==0 /*|| out_sample_rate == in_sample_rate*/) { mid_count= swr_convert(forw_ctx, amid, 3*SAMPLES, (const uint8_t **)ain, SAMPLES); } else if(mode==1){

1 0

swr-test: simplify by using uint_rand()
by git＠videolan.org 01 May '12

01 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue May 1 13:15:15 2012 +0200| [0334464336c2633c5806507d13cc4811e103776b] | committer: Michael Niedermayer swr-test: simplify by using uint_rand() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0334464336c2633c5… --- libswresample/swresample_test.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libswresample/swresample_test.c b/libswresample/swresample_test.c index ddba2d5..4e27b4e 100644 --- a/libswresample/swresample_test.c +++ b/libswresample/swresample_test.c @@ -253,7 +253,7 @@ int main(int argc, char **argv){ for(test=0; test<num_tests; test++){ unsigned r; - seed = seed * 1664525 + 1013904223; + uint_rand(seed); r = (seed * (uint64_t)(max_tests - test)) >>32; FFSWAP(int, remaining_tests[r], remaining_tests[max_tests - test - 1]); }

1 0

doc/filters: use @var{} for denoting parameter reference in drawtext docs
by git＠videolan.org 01 May '12

01 May '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Tue May 1 11:15:18 2012 +0200| [5f3f03f5dd99b8f9efac65830d87c8f958356639] | committer: Stefano Sabatini doc/filters: use @var{} for denoting parameter reference in drawtext docs > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f3f03f5dd99b8f9e… --- doc/filters.texi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 9db3342..5a8cd60 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1347,7 +1347,7 @@ of UTF-8 encoded characters. This parameter is mandatory if no text string is specified with the parameter @var{text}. -If both text and textfile are specified, an error is thrown. +If both @var{text} and @var{textfile} are specified, an error is thrown. @item x, y The expressions which specify the offsets where text will be drawn

1 0

doc/filters: alphabetically sort drawtext option listing
by git＠videolan.org 01 May '12

01 May '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Tue May 1 11:11:30 2012 +0200| [08c4dec5d3f3ecfcbe913be971e1e1443039c0e1] | committer: Stefano Sabatini doc/filters: alphabetically sort drawtext option listing > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08c4dec5d3f3ecfcb… --- doc/filters.texi | 102 +++++++++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index abbf474..9db3342 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1262,37 +1262,19 @@ The description of the accepted parameters follows. @table @option -@item fontfile -The font file to be used for drawing text. Path must be included. -This parameter is mandatory. - -@item text -The text string to be drawn. The text must be a sequence of UTF-8 -encoded characters. -This parameter is mandatory if no file is specified with the parameter -@var{textfile}. - -@item textfile -A text file containing text to be drawn. The text must be a sequence -of UTF-8 encoded characters. - -This parameter is mandatory if no text string is specified with the -parameter @var{text}. - -If both text and textfile are specified, an error is thrown. - -@item x, y -The expressions which specify the offsets where text will be drawn -within the video frame. They are relative to the top/left border of the -output image. - -The default value of @var{x} and @var{y} is "0". +@item box +Used to draw a box around text using background color. +Value should be either 1 (enable) or 0 (disable). +The default value of @var{box} is 0. -See below for the list of accepted constants. +@item boxcolor +The color to be used for drawing box around text. +Either a string (e.g. "yellow") or in 0xRRGGBB[AA] format +(e.g. "0xff00ff"), possibly followed by an alpha specifier. +The default value of @var{boxcolor} is "white". -@item fontsize -The font size to be used for drawing text. -The default value of @var{fontsize} is 16. +@item fix_bounds +If true, check and fix text coords to avoid clipping. @item fontcolor The color to be used for drawing fonts. @@ -1300,27 +1282,13 @@ Either a string (e.g. "red") or in 0xRRGGBB[AA] format (e.g. "0xff000033"), possibly followed by an alpha specifier. The default value of @var{fontcolor} is "black". -@item boxcolor -The color to be used for drawing box around text. -Either a string (e.g. "yellow") or in 0xRRGGBB[AA] format -(e.g. "0xff00ff"), possibly followed by an alpha specifier. -The default value of @var{boxcolor} is "white". - -@item box -Used to draw a box around text using background color. -Value should be either 1 (enable) or 0 (disable). -The default value of @var{box} is 0. - -@item shadowx, shadowy -The x and y offsets for the text shadow position with respect to the -position of the text. They can be either positive or negative -values. Default value for both is "0". +@item fontfile +The font file to be used for drawing text. Path must be included. +This parameter is mandatory. -@item shadowcolor -The color to be used for drawing a shadow behind the drawn text. It -can be a color name (e.g. "yellow") or a string in the 0xRRGGBB[AA] -form (e.g. "0xff00ff"), possibly followed by an alpha specifier. -The default value of @var{shadowcolor} is "black". +@item fontsize +The font size to be used for drawing text. +The default value of @var{fontsize} is 16. @item ft_load_flags Flags to be used for loading the fonts. @@ -1351,12 +1319,44 @@ Default value is "render". For more information consult the documentation for the FT_LOAD_* libfreetype flags. +@item shadowcolor +The color to be used for drawing a shadow behind the drawn text. It +can be a color name (e.g. "yellow") or a string in the 0xRRGGBB[AA] +form (e.g. "0xff00ff"), possibly followed by an alpha specifier. +The default value of @var{shadowcolor} is "black". + +@item shadowx, shadowy +The x and y offsets for the text shadow position with respect to the +position of the text. They can be either positive or negative +values. Default value for both is "0". + @item tabsize The size in number of spaces to use for rendering the tab. Default value is 4. -@item fix_bounds -If true, check and fix text coords to avoid clipping. +@item text +The text string to be drawn. The text must be a sequence of UTF-8 +encoded characters. +This parameter is mandatory if no file is specified with the parameter +@var{textfile}. + +@item textfile +A text file containing text to be drawn. The text must be a sequence +of UTF-8 encoded characters. + +This parameter is mandatory if no text string is specified with the +parameter @var{text}. + +If both text and textfile are specified, an error is thrown. + +@item x, y +The expressions which specify the offsets where text will be drawn +within the video frame. They are relative to the top/left border of the +output image. + +The default value of @var{x} and @var{y} is "0". + +See below for the list of accepted constants. @end table The parameters for @var{x} and @var{y} are expressions containing the

1 0

lavfi/lut: remove unused variable
by git＠videolan.org 01 May '12

01 May '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Tue May 1 01:24:48 2012 +0200| [bb39c74b59885adc173929041a0bc2c5368479ef] | committer: Stefano Sabatini lavfi/lut: remove unused variable Fix warning: libavfilter/vf_lut.c: In function ‘draw_slice’: libavfilter/vf_lut.c:297:15: warning: unused variable ‘k’ [-Wunused-variable] > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb39c74b59885adc1… --- libavfilter/vf_lut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 7d8e4b0..99df9e5 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -294,7 +294,7 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) AVFilterBufferRef *inpic = inlink ->cur_buf; AVFilterBufferRef *outpic = outlink->out_buf; uint8_t *inrow, *outrow, *inrow0, *outrow0; - int i, j, k, plane; + int i, j, plane; if (lut->is_rgb) { /* packed */

1 0