Stefano Sabatini | 1 May 11:18 2012

doc/filters: alphabetically sort drawtext option listing

ffmpeg | branch: master | Stefano Sabatini <stefasab <at> 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=08c4dec5d3f3ecfcbe913be971e1e1443039c0e1
---

 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
 <at>  <at>  -1262,37 +1262,19  <at>  <at>  The description of the accepted parameters follows.

  <at> table  <at> option

- <at> item fontfile
-The font file to be used for drawing text. Path must be included.
-This parameter is mandatory.
-
- <at> 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
- <at> var{textfile}.
-
- <at> item textfile
(Continue reading)

Stefano Sabatini | 1 May 11:18 2012

lavfi/lut: remove unused variable

ffmpeg | branch: master | Stefano Sabatini <stefasab <at> 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=bb39c74b59885adc173929041a0bc2c5368479ef
---

 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
 <at>  <at>  -294,7 +294,7  <at>  <at>  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 */

_______________________________________________
(Continue reading)

Stefano Sabatini | 1 May 11:18 2012

doc/filters: use <at> var{} for denoting parameter reference in drawtext docs

ffmpeg | branch: master | Stefano Sabatini <stefasab <at> gmail.com> | Tue May  1 11:15:18 2012 +0200|
[5f3f03f5dd99b8f9efac65830d87c8f958356639] | committer: Stefano Sabatini

doc/filters: use  <at> var{} for denoting parameter reference in drawtext docs

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f3f03f5dd99b8f9efac65830d87c8f958356639
---

 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
 <at>  <at>  -1347,7 +1347,7  <at>  <at>  of UTF-8 encoded characters.
 This parameter is mandatory if no text string is specified with the
 parameter  <at> var{text}.

-If both text and textfile are specified, an error is thrown.
+If both  <at> var{text} and  <at> var{textfile} are specified, an error is thrown.

  <at> item x, y
 The expressions which specify the offsets where text will be drawn
Michael Niedermayer | 1 May 13:30 2012

swr-test: simplify by using uint_rand()

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> 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 <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0334464336c2633c5806507d13cc4811e103776b
---

 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
 <at>  <at>  -253,7 +253,7  <at>  <at>  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]);
     }
Michael Niedermayer | 1 May 13:30 2012

swr-test: use uint_rand() for mode too

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> 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 <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bea3d19fbb81048e830e1e56e25207299589b394
---

 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
 <at>  <at>  -227,10 +227,11  <at>  <at>  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;
(Continue reading)

Michael Niedermayer | 1 May 13:30 2012

swr-test: allow randomizing mode differently each run.

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Tue May  1 13:16:13 2012 +0200|
[30aa004f0cf0b5ef4c81853ce26af691f61e639a] | committer: Michael Niedermayer

swr-test: allow randomizing mode differently each run.

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30aa004f0cf0b5ef4c81853ce26af691f61e639a
---

 libswresample/swresample_test.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/libswresample/swresample_test.c b/libswresample/swresample_test.c
index 6a6ba12..35eede2 100644
--- a/libswresample/swresample_test.c
+++ b/libswresample/swresample_test.c
 <at>  <at>  -24,6 +24,9  <at>  <at> 
 #include "libavutil/audioconvert.h"
 #include "libavutil/opt.h"
 #include "swresample.h"
+
+#undef time
+#include "time.h"
 #undef fprintf

 #define SAMPLES 1000
 <at>  <at>  -245,6 +248,10  <at>  <at>  int main(int argc, char **argv){
             return 0;
         }
(Continue reading)

Michael Niedermayer | 1 May 20:42 2012

swr: add native matrix for rematrixing

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Tue May  1 20:19:28 2012 +0200|
[00fea26faf8df22b7c686ceb36a7eecdc3d44b10] | committer: Michael Niedermayer

swr: add native matrix for rematrixing

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00fea26faf8df22b7c686ceb36a7eecdc3d44b10
---

 libswresample/rematrix.c            |   23 +++++++++++++++++++++++
 libswresample/swresample.c          |    2 ++
 libswresample/swresample_internal.h |    3 +++
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 415fb1e..329bd66 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
 <at>  <at>  -253,12 +253,30  <at>  <at>  static int auto_matrix(SwrContext *s)

 int swri_rematrix_init(SwrContext *s){
     int i, j;
+    int nb_in  = av_get_channel_layout_nb_channels(s->in_ch_layout);
+    int nb_out = av_get_channel_layout_nb_channels(s->out_ch_layout);

     if (!s->rematrix_custom) {
         int r = auto_matrix(s);
         if (r)
             return r;
(Continue reading)

Michael Niedermayer | 1 May 20:42 2012

ffmpeg: fix type of dither scale.

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Tue May  1 20:13:32 2012 +0200|
[f08397642fed84ac7e6eaffbe3e05e96ecaf5aa1] | committer: Michael Niedermayer

ffmpeg: fix type of dither scale.

This allows non integer scales.

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f08397642fed84ac7e6eaffbe3e05e96ecaf5aa1
---

 ffmpeg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 37817cc..a13dcf7 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
 <at>  <at>  -1624,7 +1624,7  <at>  <at>  static void do_audio_out(AVFormatContext *s, OutputStream *ost,
                                           dec->channel_layout, dec->sample_fmt, dec->sample_rate,
                                           0, NULL);
             av_opt_set_int(ost->swr, "dither_method", ost->swr_dither_method,0);
-            av_opt_set_int(ost->swr, "dither_scale", ost->swr_dither_scale,0);
+            av_opt_set_double(ost->swr, "dither_scale", ost->swr_dither_scale,0);
             if (ost->audio_channels_mapped)
                 swr_set_channel_mapping(ost->swr, ost->audio_channels_map);
             av_opt_set_double(ost->swr, "rmvol", ost->rematrix_volume, 0);
Michael Niedermayer | 1 May 20:42 2012

swr: add and use function pointers for rematrix

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Tue May  1 20:20:21 2012 +0200|
[aab5a4521c4034c218cbd72325b5d1946a3ec3c2] | committer: Michael Niedermayer

swr: add and use function pointers for rematrix

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aab5a4521c4034c218cbd72325b5d1946a3ec3c2
---

 libswresample/rematrix.c            |   31 +++++++++++++------------------
 libswresample/rematrix_template.c   |   17 ++++++++---------
 libswresample/swresample.c          |    5 +++--
 libswresample/swresample_internal.h |    6 +++++-
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 329bd66..27c4e1b 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
 <at>  <at>  -268,6 +268,8  <at>  <at>  int swri_rematrix_init(SwrContext *s){
             for (j = 0; j < nb_in; j++)
                 ((int*)s->native_matrix)[i * nb_in + j] = lrintf(s->matrix[i][j] * 32768);
         *((int*)s->native_one) = 32768;
+        s->mix_1_1_f = copy_s16;
+        s->mix_2_1_f = sum2_s16;
     }else if(s->midbuf.fmt == AV_SAMPLE_FMT_FLTP){
         s->native_matrix = av_mallocz(nb_in * nb_out * sizeof(float));
         s->native_one    = av_mallocz(sizeof(float));
 <at>  <at>  -275,6 +277,8  <at>  <at>  int swri_rematrix_init(SwrContext *s){
(Continue reading)

Michael Niedermayer | 1 May 20:42 2012

swr: disable 1 stage convert when dither is enabled.

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Tue May  1 20:12:31 2012 +0200|
[046b5339fccebba331ce8fe28b53693c153831cd] | committer: Michael Niedermayer

swr: disable 1 stage convert when dither is enabled.

This combination is not possible easily.

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=046b5339fccebba331ce8fe28b53693c153831cd
---

 libswresample/swresample.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 7f545e0..9429c1e 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
 <at>  <at>  -274,7 +274,7  <at>  <at>  av_assert0(s->out.ch_count);

     s->in_buffer= s->in;

-    if(!s->resample && !s->rematrix && !s->channel_map){
+    if(!s->resample && !s->rematrix && !s->channel_map && !s->dither_method){
         s->full_convert = swri_audio_convert_alloc(s->out_sample_fmt,
                                                    s-> in_sample_fmt, s-> in.ch_count, NULL, 0);
         return 0;

Gmane