December 2015 - ffmpeg-cvslog

x86/vf_stereo3d: optimize register usage
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Dec 27 17:44:48 2015 -0300| [6e243d17e911bf20cb0f0dd3eccf10245dfaf2cb] | committer: James Almer x86/vf_stereo3d: optimize register usage Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e243d17e911bf20c… --- libavfilter/x86/vf_stereo3d.asm | 164 ++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 78 deletions(-) diff --git a/libavfilter/x86/vf_stereo3d.asm b/libavfilter/x86/vf_stereo3d.asm index 94a0473..29a8c56 100644 --- a/libavfilter/x86/vf_stereo3d.asm +++ b/libavfilter/x86/vf_stereo3d.asm @@ -37,125 +37,133 @@ ex_b: db 2,-1,-1,-1,5,-1,-1,-1,8,-1,-1,-1,11,-1,-1,-1 SECTION .text INIT_XMM sse4 -cglobal anaglyph, 11, 13, 16, 2*6*mmsize, dst, lsrc, rsrc, dst_linesize, l_linesize, r_linesize, width, height, ana_matrix_r, ana_matrix_g, ana_matrix_b - movu m13, [ana_matrix_rq+ 0] - movq m15, [ana_matrix_rq+16] - pshufd m10, m13, q0000 - pshufd m11, m13, q1111 - pshufd m12, m13, q2222 - pshufd m13, m13, q3333 - pshufd m14, m15, q0000 - pshufd m15, m15, q1111 - mova [rsp+mmsize*0], m10 - mova [rsp+mmsize*1], m11 - mova [rsp+mmsize*2], m12 - mova [rsp+mmsize*3], m13 - mova [rsp+mmsize*4], m14 - mova [rsp+mmsize*5], m15 - - movu m13, [ana_matrix_gq+ 0] - movq m15, [ana_matrix_gq+16] - pshufd m10, m13, q0000 - pshufd m11, m13, q1111 - pshufd m12, m13, q2222 - pshufd m13, m13, q3333 - pshufd m14, m15, q0000 - pshufd m15, m15, q1111 - mova [rsp+mmsize*6 ], m10 - mova [rsp+mmsize*7 ], m11 - mova [rsp+mmsize*8 ], m12 - mova [rsp+mmsize*9 ], m13 - mova [rsp+mmsize*10], m14 - mova [rsp+mmsize*11], m15 - - movu m13, [ana_matrix_bq+ 0] - movq m15, [ana_matrix_bq+16] - pshufd m10, m13, q0000 - pshufd m11, m13, q1111 - pshufd m12, m13, q2222 - pshufd m13, m13, q3333 - pshufd m14, m15, q0000 - pshufd m15, m15, q1111 +cglobal anaglyph, 6, 10, 14, 2*6*mmsize, dst, lsrc, rsrc, dst_linesize, l_linesize, r_linesize, width, height, o, cnt +%define ana_matrix_rq r6q +%define ana_matrix_gq r7q +%define ana_matrix_bq r8q + mov ana_matrix_rq, r8m + mov ana_matrix_gq, r9m + mov ana_matrix_bq, r10m + movu m3, [ana_matrix_rq+ 0] + movq m5, [ana_matrix_rq+16] + pshufd m0, m3, q0000 + pshufd m1, m3, q1111 + pshufd m2, m3, q2222 + pshufd m3, m3, q3333 + pshufd m4, m5, q0000 + pshufd m5, m5, q1111 + mova [rsp+mmsize*0], m0 + mova [rsp+mmsize*1], m1 + mova [rsp+mmsize*2], m2 + mova [rsp+mmsize*3], m3 + mova [rsp+mmsize*4], m4 + mova [rsp+mmsize*5], m5 + + movu m3, [ana_matrix_gq+ 0] + movq m5, [ana_matrix_gq+16] + pshufd m0, m3, q0000 + pshufd m1, m3, q1111 + pshufd m2, m3, q2222 + pshufd m3, m3, q3333 + pshufd m4, m5, q0000 + pshufd m5, m5, q1111 + mova [rsp+mmsize*6 ], m0 + mova [rsp+mmsize*7 ], m1 + mova [rsp+mmsize*8 ], m2 + mova [rsp+mmsize*9 ], m3 + mova [rsp+mmsize*10], m4 + mova [rsp+mmsize*11], m5 + + movu m11, [ana_matrix_bq+ 0] + movq m13, [ana_matrix_bq+16] + pshufd m8, m11, q0000 + pshufd m9, m11, q1111 + pshufd m10, m11, q2222 + pshufd m11, m11, q3333 + pshufd m12, m13, q0000 + pshufd m13, m13, q1111 + mov widthd, dword widthm + mov heightd, dword heightm + .nextrow: - mov r11q, widthq - mov r12q, 0 - %define o r12q + mov od, widthd + xor cntd, cntd .loop: - movu m0, [lsrcq+o+0] + movu m0, [lsrcq+cntq] pshufb m1, m0, [ex_r] pshufb m2, m0, [ex_g] pshufb m3, m0, [ex_b] - movu m0, [rsrcq+o+0] + movu m0, [rsrcq+cntq] pshufb m4, m0, [ex_r] pshufb m5, m0, [ex_g] - pshufb m6, m0, [ex_b] + pshufb m0, [ex_b] pmulld m1, [rsp+mmsize*0] pmulld m2, [rsp+mmsize*1] pmulld m3, [rsp+mmsize*2] pmulld m4, [rsp+mmsize*3] pmulld m5, [rsp+mmsize*4] - pmulld m6, [rsp+mmsize*5] + pmulld m0, [rsp+mmsize*5] paddd m1, m2 paddd m3, m4 - paddd m5, m6 + paddd m5, m0 paddd m1, m3 paddd m1, m5 - movu m0, [lsrcq+o+0] + movu m0, [lsrcq+cntq] pshufb m7, m0, [ex_r] pshufb m2, m0, [ex_g] pshufb m3, m0, [ex_b] - movu m0, [rsrcq+o+0] + movu m0, [rsrcq+cntq] pshufb m4, m0, [ex_r] pshufb m5, m0, [ex_g] - pshufb m6, m0, [ex_b] + pshufb m0, [ex_b] pmulld m7, [rsp+mmsize*6] pmulld m2, [rsp+mmsize*7] pmulld m3, [rsp+mmsize*8] pmulld m4, [rsp+mmsize*9] pmulld m5, [rsp+mmsize*10] - pmulld m6, [rsp+mmsize*11] + pmulld m0, [rsp+mmsize*11] paddd m7, m2 paddd m3, m4 - paddd m5, m6 + paddd m5, m0 paddd m7, m3 paddd m7, m5 - movu m0, [lsrcq+o+0] - pshufb m8, m0, [ex_r] - pshufb m2, m0, [ex_g] - pshufb m3, m0, [ex_b] - movu m0, [rsrcq+o+0] - pshufb m4, m0, [ex_r] - pshufb m5, m0, [ex_g] - pshufb m6, m0, [ex_b] - pmulld m8, m10 - pmulld m2, m11 - pmulld m3, m12 - pmulld m4, m13 - pmulld m5, m14 - pmulld m6, m15 - paddd m8, m2 - paddd m3, m4 - paddd m5, m6 - paddd m8, m3 - paddd m8, m5 + movu m0, [lsrcq+cntq] + pshufb m2, m0, [ex_r] + pshufb m3, m0, [ex_g] + pshufb m4, m0, [ex_b] + movu m0, [rsrcq+cntq] + pshufb m5, m0, [ex_r] + pshufb m6, m0, [ex_g] + pshufb m0, [ex_b] + pmulld m2, m8 + pmulld m3, m9 + pmulld m4, m10 + pmulld m5, m11 + pmulld m6, m12 + pmulld m0, m13 + paddd m2, m3 + paddd m4, m5 + paddd m6, m0 + paddd m2, m4 + paddd m2, m6 psrld m1, 16 psrld m7, 16 - psrld m8, 16 + psrld m2, 16 packusdw m1, m7 - packusdw m8, m8 - packuswb m1, m8 + packusdw m2, m2 + packuswb m1, m2 pshufb m1, [shuf] - movq [dstq+o+0], m1 + movq [dstq+cntq+0], m1 psrldq m1, 8 - movd [dstq+o+8], m1 - add r12d, 12 - sub r11d, 4 + movd [dstq+cntq+8], m1 + add cntd, 12 + sub od, 4 jg .loop add dstq, dst_linesizeq

1 0

x86/vf_stereo3d: make ff_anaglyph_sse4 work on x86_32
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Dec 27 18:52:00 2015 -0300| [1817643d4f50a2a9a0fe0b3c0cc2a69a33ec6ccd] | committer: James Almer x86/vf_stereo3d: make ff_anaglyph_sse4 work on x86_32 Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1817643d4f50a2a9a… --- libavfilter/x86/vf_stereo3d.asm | 47 +++++++++++++++++++++++++++++++++--- libavfilter/x86/vf_stereo3d_init.c | 2 +- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/libavfilter/x86/vf_stereo3d.asm b/libavfilter/x86/vf_stereo3d.asm index 29a8c56..491579f 100644 --- a/libavfilter/x86/vf_stereo3d.asm +++ b/libavfilter/x86/vf_stereo3d.asm @@ -22,8 +22,6 @@ %include "libavutil/x86/x86util.asm" -%if ARCH_X86_64 - SECTION_RODATA ; rgbrgbrgbrgb @@ -37,10 +35,33 @@ ex_b: db 2,-1,-1,-1,5,-1,-1,-1,8,-1,-1,-1,11,-1,-1,-1 SECTION .text INIT_XMM sse4 +%if ARCH_X86_64 cglobal anaglyph, 6, 10, 14, 2*6*mmsize, dst, lsrc, rsrc, dst_linesize, l_linesize, r_linesize, width, height, o, cnt %define ana_matrix_rq r6q %define ana_matrix_gq r7q %define ana_matrix_bq r8q + +%else ; ARCH_X86_32 +%if HAVE_ALIGNED_STACK +cglobal anaglyph, 3, 7, 8, 2*9*mmsize, dst, lsrc, rsrc, dst_linesize, l_linesize, o, cnt +%else +cglobal anaglyph, 3, 6, 8, 2*9*mmsize, dst, lsrc, rsrc, dst_linesize, o, cnt +%define l_linesizeq r4mp +%endif ; HAVE_ALIGNED_STACK +%define ana_matrix_rq r3q +%define ana_matrix_gq r4q +%define ana_matrix_bq r5q +%define r_linesizeq r5mp +%define widthd r6mp +%define heightd r7mp +%define m8 [rsp+mmsize*12] +%define m9 [rsp+mmsize*13] +%define m10 [rsp+mmsize*14] +%define m11 [rsp+mmsize*15] +%define m12 [rsp+mmsize*16] +%define m13 [rsp+mmsize*17] +%endif ; ARCH + mov ana_matrix_rq, r8m mov ana_matrix_gq, r9m mov ana_matrix_bq, r10m @@ -74,6 +95,7 @@ cglobal anaglyph, 6, 10, 14, 2*6*mmsize, dst, lsrc, rsrc, dst_linesize, l_linesi mova [rsp+mmsize*10], m4 mova [rsp+mmsize*11], m5 +%if ARCH_X86_64 movu m11, [ana_matrix_bq+ 0] movq m13, [ana_matrix_bq+16] pshufd m8, m11, q0000 @@ -84,6 +106,26 @@ cglobal anaglyph, 6, 10, 14, 2*6*mmsize, dst, lsrc, rsrc, dst_linesize, l_linesi pshufd m13, m13, q1111 mov widthd, dword widthm mov heightd, dword heightm +%else + movu m3, [ana_matrix_bq+ 0] + movq m5, [ana_matrix_bq+16] + pshufd m0, m3, q0000 + pshufd m1, m3, q1111 + pshufd m2, m3, q2222 + pshufd m3, m3, q3333 + pshufd m4, m5, q0000 + pshufd m5, m5, q1111 + mova [rsp+mmsize*12], m0 + mova [rsp+mmsize*13], m1 + mova [rsp+mmsize*14], m2 + mova [rsp+mmsize*15], m3 + mova [rsp+mmsize*16], m4 + mova [rsp+mmsize*17], m5 + mov dst_linesizeq, r3m +%if HAVE_ALIGNED_STACK + mov l_linesizeq, r4m +%endif +%endif ; ARCH .nextrow: mov od, widthd @@ -172,4 +214,3 @@ cglobal anaglyph, 6, 10, 14, 2*6*mmsize, dst, lsrc, rsrc, dst_linesize, l_linesi sub heightd, 1 jg .nextrow REP_RET -%endif diff --git a/libavfilter/x86/vf_stereo3d_init.c b/libavfilter/x86/vf_stereo3d_init.c index 77d4f7b..da160a8 100644 --- a/libavfilter/x86/vf_stereo3d_init.c +++ b/libavfilter/x86/vf_stereo3d_init.c @@ -31,7 +31,7 @@ void ff_stereo3d_init_x86(Stereo3DDSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); - if (ARCH_X86_64 && EXTERNAL_SSE4(cpu_flags)) { + if (EXTERNAL_SSE4(cpu_flags)) { dsp->anaglyph = ff_anaglyph_sse4; } }

1 0

avfilter/avf_showspectrum: make colors for log scale more user friendly
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 28 20:20:32 2015 +0100| [4020787b5bbd2ac159c860d1d1ec983837bf31bb] | committer: Paul B Mahol avfilter/avf_showspectrum: make colors for log scale more user friendly Previosly output was almost useless because background noise, due to windowing function picked and which is not actually present in audio, had too much brightness. Now output of sine wave matches more with SoX. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4020787b5bbd2ac15… --- libavfilter/avf_showspectrum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 433400d..0e2e84b 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -380,7 +380,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) a = cbrt(a); break; case LOG: - a = 1 + log10(FFMAX(FFMIN(1, a), 1e-6)) / 6; // zero = -120dBFS + a = 1 + log10(FFMAX(FFMIN(1, a), 1e-6)) / 5; // zero = -120dBFS break; default: av_assert0(0);

1 0

avfilter/avf_showspectrum: use ff_generate_window_func
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 28 18:51:56 2015 +0100| [f88546b426af6d38f76a8d1b7dc05109a12c7bb9] | committer: Paul B Mahol avfilter/avf_showspectrum: use ff_generate_window_func Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f88546b426af6d38f… --- doc/filters.texi | 17 ++++++++++----- libavfilter/Makefile | 2 +- libavfilter/avf_showspectrum.c | 45 +++++++++++++++++----------------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 316eaa4..1d14bc9 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14647,14 +14647,21 @@ Set window function. It accepts the following values: @table @samp -@item none -No samples pre-processing (do not expect this to be faster) +@item rect +@item bartlett @item hann -Hann window +@item hanning @item hamming -Hamming window @item blackman -Blackman window +@item welch +@item flattop +@item bharris +@item bnuttall +@item bhann +@item sine +@item nuttall +@item lanczos +@item gauss @end table Default value is @code{hann}. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 37b3a70..e334016 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -285,7 +285,7 @@ OBJS-$(CONFIG_AVECTORSCOPE_FILTER) += avf_avectorscope.o OBJS-$(CONFIG_CONCAT_FILTER) += avf_concat.o OBJS-$(CONFIG_SHOWCQT_FILTER) += avf_showcqt.o lswsutils.o lavfutils.o OBJS-$(CONFIG_SHOWFREQS_FILTER) += avf_showfreqs.o window_func.o -OBJS-$(CONFIG_SHOWSPECTRUM_FILTER) += avf_showspectrum.o +OBJS-$(CONFIG_SHOWSPECTRUM_FILTER) += avf_showspectrum.o window_func.o OBJS-$(CONFIG_SHOWVOLUME_FILTER) += avf_showvolume.o OBJS-$(CONFIG_SHOWWAVES_FILTER) += avf_showwaves.o OBJS-$(CONFIG_SHOWWAVESPIC_FILTER) += avf_showwaves.o diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 384bad5..433400d 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -33,11 +33,11 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "internal.h" +#include "window_func.h" enum DisplayMode { COMBINED, SEPARATE, NB_MODES }; enum DisplayScale { LINEAR, SQRT, CBRT, LOG, NB_SCALES }; enum ColorMode { CHANNEL, INTENSITY, NB_CLMODES }; -enum WindowFunc { WFUNC_NONE, WFUNC_HANN, WFUNC_HAMMING, WFUNC_BLACKMAN, NB_WFUNC }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; typedef struct { @@ -57,6 +57,7 @@ typedef struct { FFTSample **rdft_data; ///< bins holder for each (displayed) channels float *window_func_lut; ///< Window function LUT int win_func; + float overlap; float *combine_buffer; ///< color combining buffer (3 * h items) } ShowSpectrumContext; @@ -83,10 +84,22 @@ static const AVOption showspectrum_options[] = { { "log", "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=LOG}, 0, 0, FLAGS, "scale" }, { "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=LINEAR}, 0, 0, FLAGS, "scale" }, { "saturation", "color saturation multiplier", OFFSET(saturation), AV_OPT_TYPE_FLOAT, {.dbl = 1}, -10, 10, FLAGS }, - { "win_func", "set window function", OFFSET(win_func), AV_OPT_TYPE_INT, {.i64 = WFUNC_HANN}, 0, NB_WFUNC-1, FLAGS, "win_func" }, - { "hann", "Hann window", 0, AV_OPT_TYPE_CONST, {.i64 = WFUNC_HANN}, 0, 0, FLAGS, "win_func" }, - { "hamming", "Hamming window", 0, AV_OPT_TYPE_CONST, {.i64 = WFUNC_HAMMING}, 0, 0, FLAGS, "win_func" }, - { "blackman", "Blackman window", 0, AV_OPT_TYPE_CONST, {.i64 = WFUNC_BLACKMAN}, 0, 0, FLAGS, "win_func" }, + { "win_func", "set window function", OFFSET(win_func), AV_OPT_TYPE_INT, {.i64 = WFUNC_HANNING}, 0, NB_WFUNC-1, FLAGS, "win_func" }, + { "rect", "Rectangular", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_RECT}, 0, 0, FLAGS, "win_func" }, + { "bartlett", "Bartlett", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BARTLETT}, 0, 0, FLAGS, "win_func" }, + { "hann", "Hann", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_HANNING}, 0, 0, FLAGS, "win_func" }, + { "hanning", "Hanning", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_HANNING}, 0, 0, FLAGS, "win_func" }, + { "hamming", "Hamming", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_HAMMING}, 0, 0, FLAGS, "win_func" }, + { "blackman", "Blackman", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BLACKMAN}, 0, 0, FLAGS, "win_func" }, + { "welch", "Welch", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_WELCH}, 0, 0, FLAGS, "win_func" }, + { "flattop", "Flat-top", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_FLATTOP}, 0, 0, FLAGS, "win_func" }, + { "bharris", "Blackman-Harris", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BHARRIS}, 0, 0, FLAGS, "win_func" }, + { "bnuttall", "Blackman-Nuttall", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BNUTTALL}, 0, 0, FLAGS, "win_func" }, + { "bhann", "Bartlett-Hann", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BHANN}, 0, 0, FLAGS, "win_func" }, + { "sine", "Sine", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_SINE}, 0, 0, FLAGS, "win_func" }, + { "nuttall", "Nuttall", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_NUTTALL}, 0, 0, FLAGS, "win_func" }, + { "lanczos", "Lanczos", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_LANCZOS}, 0, 0, FLAGS, "win_func" }, + { "gauss", "Gauss", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_GAUSS}, 0, 0, FLAGS, "win_func" }, { NULL } }; @@ -203,27 +216,7 @@ static int config_output(AVFilterLink *outlink) sizeof(*s->window_func_lut)); if (!s->window_func_lut) return AVERROR(ENOMEM); - switch (s->win_func) { - case WFUNC_NONE: - for (i = 0; i < win_size; i++) - s->window_func_lut[i] = 1.; - break; - case WFUNC_HANN: - for (i = 0; i < win_size; i++) - s->window_func_lut[i] = .5f * (1 - cos(2*M_PI*i / (win_size-1))); - break; - case WFUNC_HAMMING: - for (i = 0; i < win_size; i++) - s->window_func_lut[i] = .54f - .46f * cos(2*M_PI*i / (win_size-1)); - break; - case WFUNC_BLACKMAN: { - for (i = 0; i < win_size; i++) - s->window_func_lut[i] = .42f - .5f*cos(2*M_PI*i / (win_size-1)) + .08f*cos(4*M_PI*i / (win_size-1)); - break; - } - default: - av_assert0(0); - } + ff_generate_window_func(s->window_func_lut, win_size, s->win_func, &s->overlap); /* prepare the initial picref buffer (black frame) */ av_frame_free(&s->outpicref);

1 0

avfilter: move window function generation into separate file
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 28 18:39:31 2015 +0100| [45b3e6e04e8e93b6ccacf4207b99596e044b72af] | committer: Paul B Mahol avfilter: move window function generation into separate file Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45b3e6e04e8e93b6c… --- libavfilter/Makefile | 2 +- libavfilter/avf_showfreqs.c | 93 +----------------------------------- libavfilter/window_func.c | 110 +++++++++++++++++++++++++++++++++++++++++++ libavfilter/window_func.h | 32 +++++++++++++ 4 files changed, 145 insertions(+), 92 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index adbbc39..37b3a70 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -284,7 +284,7 @@ OBJS-$(CONFIG_APHASEMETER_FILTER) += avf_aphasemeter.o OBJS-$(CONFIG_AVECTORSCOPE_FILTER) += avf_avectorscope.o OBJS-$(CONFIG_CONCAT_FILTER) += avf_concat.o OBJS-$(CONFIG_SHOWCQT_FILTER) += avf_showcqt.o lswsutils.o lavfutils.o -OBJS-$(CONFIG_SHOWFREQS_FILTER) += avf_showfreqs.o +OBJS-$(CONFIG_SHOWFREQS_FILTER) += avf_showfreqs.o window_func.o OBJS-$(CONFIG_SHOWSPECTRUM_FILTER) += avf_showspectrum.o OBJS-$(CONFIG_SHOWVOLUME_FILTER) += avf_showvolume.o OBJS-$(CONFIG_SHOWWAVES_FILTER) += avf_showwaves.o diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index df3fcd1..03fcf4e 100644 --- a/libavfilter/avf_showfreqs.c +++ b/libavfilter/avf_showfreqs.c @@ -32,15 +32,12 @@ #include "video.h" #include "avfilter.h" #include "internal.h" +#include "window_func.h" enum DisplayMode { LINE, BAR, DOT, NB_MODES }; enum ChannelMode { COMBINED, SEPARATE, NB_CMODES }; enum FrequencyScale { FS_LINEAR, FS_LOG, FS_RLOG, NB_FSCALES }; enum AmplitudeScale { AS_LINEAR, AS_SQRT, AS_CBRT, AS_LOG, NB_ASCALES }; -enum WindowFunc { WFUNC_RECT, WFUNC_HANNING, WFUNC_HAMMING, WFUNC_BLACKMAN, - WFUNC_BARTLETT, WFUNC_WELCH, WFUNC_FLATTOP, - WFUNC_BHARRIS, WFUNC_BNUTTALL, WFUNC_SINE, WFUNC_NUTTALL, - WFUNC_BHANN, WFUNC_LANCZOS, WFUNC_GAUSS, NB_WFUNC }; typedef struct ShowFreqsContext { const AVClass *class; @@ -156,92 +153,6 @@ static int query_formats(AVFilterContext *ctx) return 0; } -static void generate_window_func(float *lut, int N, int win_func, float *overlap) -{ - int n; - - switch (win_func) { - case WFUNC_RECT: - for (n = 0; n < N; n++) - lut[n] = 1.; - *overlap = 0.; - break; - case WFUNC_BARTLETT: - for (n = 0; n < N; n++) - lut[n] = 1.-fabs((n-(N-1)/2.)/((N-1)/2.)); - *overlap = 0.5; - break; - case WFUNC_HANNING: - for (n = 0; n < N; n++) - lut[n] = .5*(1-cos(2*M_PI*n/(N-1))); - *overlap = 0.5; - break; - case WFUNC_HAMMING: - for (n = 0; n < N; n++) - lut[n] = .54-.46*cos(2*M_PI*n/(N-1)); - *overlap = 0.5; - break; - case WFUNC_BLACKMAN: - for (n = 0; n < N; n++) - lut[n] = .42659-.49656*cos(2*M_PI*n/(N-1))+.076849*cos(4*M_PI*n/(N-1)); - *overlap = 0.661; - break; - case WFUNC_WELCH: - for (n = 0; n < N; n++) - lut[n] = 1.-(n-(N-1)/2.)/((N-1)/2.)*(n-(N-1)/2.)/((N-1)/2.); - *overlap = 0.293; - break; - case WFUNC_FLATTOP: - for (n = 0; n < N; n++) - lut[n] = 1.-1.985844164102*cos( 2*M_PI*n/(N-1))+1.791176438506*cos( 4*M_PI*n/(N-1))- - 1.282075284005*cos( 6*M_PI*n/(N-1))+0.667777530266*cos( 8*M_PI*n/(N-1))- - 0.240160796576*cos(10*M_PI*n/(N-1))+0.056656381764*cos(12*M_PI*n/(N-1))- - 0.008134974479*cos(14*M_PI*n/(N-1))+0.000624544650*cos(16*M_PI*n/(N-1))- - 0.000019808998*cos(18*M_PI*n/(N-1))+0.000000132974*cos(20*M_PI*n/(N-1)); - *overlap = 0.841; - break; - case WFUNC_BHARRIS: - for (n = 0; n < N; n++) - lut[n] = 0.35875-0.48829*cos(2*M_PI*n/(N-1))+0.14128*cos(4*M_PI*n/(N-1))-0.01168*cos(6*M_PI*n/(N-1)); - *overlap = 0.661; - break; - case WFUNC_BNUTTALL: - for (n = 0; n < N; n++) - lut[n] = 0.3635819-0.4891775*cos(2*M_PI*n/(N-1))+0.1365995*cos(4*M_PI*n/(N-1))-0.0106411*cos(6*M_PI*n/(N-1)); - *overlap = 0.661; - break; - case WFUNC_BHANN: - for (n = 0; n < N; n++) - lut[n] = 0.62-0.48*fabs(n/(double)(N-1)-.5)-0.38*cos(2*M_PI*n/(N-1)); - *overlap = 0.5; - break; - case WFUNC_SINE: - for (n = 0; n < N; n++) - lut[n] = sin(M_PI*n/(N-1)); - *overlap = 0.75; - break; - case WFUNC_NUTTALL: - for (n = 0; n < N; n++) - lut[n] = 0.355768-0.487396*cos(2*M_PI*n/(N-1))+0.144232*cos(4*M_PI*n/(N-1))-0.012604*cos(6*M_PI*n/(N-1)); - *overlap = 0.663; - break; - case WFUNC_LANCZOS: -#define SINC(x) (!(x)) ? 1 : sin(M_PI * (x))/(M_PI * (x)); - for (n = 0; n < N; n++) - lut[n] = SINC((2.*n)/(N-1)-1); - *overlap = 0.75; - break; - case WFUNC_GAUSS: -#define SQR(x) ((x)*(x)) - for (n = 0; n < N; n++) - lut[n] = exp(-0.5 * SQR((n-(N-1)/2)/(0.4*(N-1)/2.f))); - *overlap = 0.75; - break; - default: - av_assert0(0); - } -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -290,7 +201,7 @@ static int config_output(AVFilterLink *outlink) sizeof(*s->window_func_lut)); if (!s->window_func_lut) return AVERROR(ENOMEM); - generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap); + ff_generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap); if (s->overlap == 1.) s->overlap = overlap; s->skip_samples = (1. - s->overlap) * s->win_size; diff --git a/libavfilter/window_func.c b/libavfilter/window_func.c new file mode 100644 index 0000000..15600be --- /dev/null +++ b/libavfilter/window_func.c @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2015 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <math.h> + +#include "libavutil/avassert.h" +#include "window_func.h" + +void ff_generate_window_func(float *lut, int N, int win_func, float *overlap) +{ + int n; + + switch (win_func) { + case WFUNC_RECT: + for (n = 0; n < N; n++) + lut[n] = 1.; + *overlap = 0.; + break; + case WFUNC_BARTLETT: + for (n = 0; n < N; n++) + lut[n] = 1.-fabs((n-(N-1)/2.)/((N-1)/2.)); + *overlap = 0.5; + break; + case WFUNC_HANNING: + for (n = 0; n < N; n++) + lut[n] = .5*(1-cos(2*M_PI*n/(N-1))); + *overlap = 0.5; + break; + case WFUNC_HAMMING: + for (n = 0; n < N; n++) + lut[n] = .54-.46*cos(2*M_PI*n/(N-1)); + *overlap = 0.5; + break; + case WFUNC_BLACKMAN: + for (n = 0; n < N; n++) + lut[n] = .42659-.49656*cos(2*M_PI*n/(N-1))+.076849*cos(4*M_PI*n/(N-1)); + *overlap = 0.661; + break; + case WFUNC_WELCH: + for (n = 0; n < N; n++) + lut[n] = 1.-(n-(N-1)/2.)/((N-1)/2.)*(n-(N-1)/2.)/((N-1)/2.); + *overlap = 0.293; + break; + case WFUNC_FLATTOP: + for (n = 0; n < N; n++) + lut[n] = 1.-1.985844164102*cos( 2*M_PI*n/(N-1))+1.791176438506*cos( 4*M_PI*n/(N-1))- + 1.282075284005*cos( 6*M_PI*n/(N-1))+0.667777530266*cos( 8*M_PI*n/(N-1))- + 0.240160796576*cos(10*M_PI*n/(N-1))+0.056656381764*cos(12*M_PI*n/(N-1))- + 0.008134974479*cos(14*M_PI*n/(N-1))+0.000624544650*cos(16*M_PI*n/(N-1))- + 0.000019808998*cos(18*M_PI*n/(N-1))+0.000000132974*cos(20*M_PI*n/(N-1)); + *overlap = 0.841; + break; + case WFUNC_BHARRIS: + for (n = 0; n < N; n++) + lut[n] = 0.35875-0.48829*cos(2*M_PI*n/(N-1))+0.14128*cos(4*M_PI*n/(N-1))-0.01168*cos(6*M_PI*n/(N-1)); + *overlap = 0.661; + break; + case WFUNC_BNUTTALL: + for (n = 0; n < N; n++) + lut[n] = 0.3635819-0.4891775*cos(2*M_PI*n/(N-1))+0.1365995*cos(4*M_PI*n/(N-1))-0.0106411*cos(6*M_PI*n/(N-1)); + *overlap = 0.661; + break; + case WFUNC_BHANN: + for (n = 0; n < N; n++) + lut[n] = 0.62-0.48*fabs(n/(double)(N-1)-.5)-0.38*cos(2*M_PI*n/(N-1)); + *overlap = 0.5; + break; + case WFUNC_SINE: + for (n = 0; n < N; n++) + lut[n] = sin(M_PI*n/(N-1)); + *overlap = 0.75; + break; + case WFUNC_NUTTALL: + for (n = 0; n < N; n++) + lut[n] = 0.355768-0.487396*cos(2*M_PI*n/(N-1))+0.144232*cos(4*M_PI*n/(N-1))-0.012604*cos(6*M_PI*n/(N-1)); + *overlap = 0.663; + break; + case WFUNC_LANCZOS: +#define SINC(x) (!(x)) ? 1 : sin(M_PI * (x))/(M_PI * (x)); + for (n = 0; n < N; n++) + lut[n] = SINC((2.*n)/(N-1)-1); + *overlap = 0.75; + break; + case WFUNC_GAUSS: +#define SQR(x) ((x)*(x)) + for (n = 0; n < N; n++) + lut[n] = exp(-0.5 * SQR((n-(N-1)/2)/(0.4*(N-1)/2.f))); + *overlap = 0.75; + break; + default: + av_assert0(0); + } +} diff --git a/libavfilter/window_func.h b/libavfilter/window_func.h new file mode 100644 index 0000000..eb2a326 --- /dev/null +++ b/libavfilter/window_func.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2015 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef AVFILTER_WINDOW_FUNC_H +#define AVFILTER_WINDOW_FUNC_H + +enum WindowFunc { WFUNC_RECT, WFUNC_HANNING, WFUNC_HAMMING, WFUNC_BLACKMAN, + WFUNC_BARTLETT, WFUNC_WELCH, WFUNC_FLATTOP, + WFUNC_BHARRIS, WFUNC_BNUTTALL, WFUNC_SINE, WFUNC_NUTTALL, + WFUNC_BHANN, WFUNC_LANCZOS, WFUNC_GAUSS, NB_WFUNC }; + +void ff_generate_window_func(float *lut, int N, int win_func, float *overlap); + +#endif /* AVFILTER_WINDOW_FUNC_H */

1 0

avfilter/avf_showspectrum: add rscroll sliding mode
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 28 18:14:46 2015 +0100| [67771ac4b894112b743b37e6df24b0d4f27a120b] | committer: Paul B Mahol avfilter/avf_showspectrum: add rscroll sliding mode Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67771ac4b894112b7… --- doc/filters.texi | 2 ++ libavfilter/avf_showspectrum.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 8dae782..316eaa4 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14585,6 +14585,8 @@ It accepts the following values: the samples start again on the left when they reach the right @item scroll the samples scroll from right to left +@item rscroll +the samples scroll from left to right @item fullframe frames are only produced when the samples reach the right @end table diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index f6f16fc..384bad5 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -38,7 +38,7 @@ enum DisplayMode { COMBINED, SEPARATE, NB_MODES }; enum DisplayScale { LINEAR, SQRT, CBRT, LOG, NB_SCALES }; enum ColorMode { CHANNEL, INTENSITY, NB_CLMODES }; enum WindowFunc { WFUNC_NONE, WFUNC_HANN, WFUNC_HAMMING, WFUNC_BLACKMAN, NB_WFUNC }; -enum SlideMode { REPLACE, SCROLL, FULLFRAME, NB_SLIDES }; +enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; typedef struct { const AVClass *class; @@ -66,9 +66,10 @@ typedef struct { static const AVOption showspectrum_options[] = { { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x512"}, 0, 0, FLAGS }, { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x512"}, 0, 0, FLAGS }, - { "slide", "set sliding mode", OFFSET(sliding), AV_OPT_TYPE_INT, {.i64 = 0}, 0, NB_SLIDES, FLAGS, "slide" }, + { "slide", "set sliding mode", OFFSET(sliding), AV_OPT_TYPE_INT, {.i64 = 0}, 0, NB_SLIDES-1, FLAGS, "slide" }, { "replace", "replace old columns with new", 0, AV_OPT_TYPE_CONST, {.i64=REPLACE}, 0, 0, FLAGS, "slide" }, { "scroll", "scroll from right to left", 0, AV_OPT_TYPE_CONST, {.i64=SCROLL}, 0, 0, FLAGS, "slide" }, + { "rscroll", "scroll from left to right", 0, AV_OPT_TYPE_CONST, {.i64=RSCROLL}, 0, 0, FLAGS, "slide" }, { "fullframe", "return full frames", 0, AV_OPT_TYPE_CONST, {.i64=FULLFRAME}, 0, 0, FLAGS, "slide" }, { "mode", "set channel display mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=COMBINED}, COMBINED, NB_MODES-1, FLAGS, "mode" }, { "combined", "combined mode", 0, AV_OPT_TYPE_CONST, {.i64=COMBINED}, 0, 0, FLAGS, "mode" }, @@ -442,6 +443,15 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) } } s->xpos = outlink->w - 1; + } else if (s->sliding == RSCROLL) { + for (plane = 0; plane < 3; plane++) { + for (y = 0; y < outlink->h; y++) { + uint8_t *p = outpicref->data[plane] + + y * outpicref->linesize[plane]; + memmove(p + 1, p, outlink->w - 1); + } + } + s->xpos = 0; } for (plane = 0; plane < 3; plane++) { uint8_t *p = outpicref->data[plane] +

1 0

avformat/http: Documented http_proxy option
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Joel Holdsworth <joel(a)airwebreathe.org.uk> | Mon Dec 28 09:50:15 2015 +0000| [b9c46b5242bf338f6e57bc6a4380e69be83c058c] | committer: Michael Niedermayer avformat/http: Documented http_proxy option Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9c46b5242bf338f6… --- doc/protocols.texi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/protocols.texi b/doc/protocols.texi index 7c6b9d4..8b2e310 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -240,6 +240,9 @@ If set to 1 use chunked Transfer-Encoding for posts, default is 1. @item content_type Set a specific content type for the POST messages. +@item http_proxy +set HTTP proxy to tunnel through e.g. http://example.com:1234 + @item headers Set custom HTTP headers, can override built in default headers. The value must be a string encoding the headers.

1 0

lavf/mpegtsenc: add automatic bitstream filtering
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Rodger Combs <rodger.combs(a)gmail.com> | Mon Nov 30 03:00:41 2015 -0600| [1b5bd4051d1e394f0429cbf6cf6c137f55857478] | committer: Rodger Combs lavf/mpegtsenc: add automatic bitstream filtering > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b5bd4051d1e394f0… --- libavformat/mpegtsenc.c | 65 +++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index cb11c31..2c12043 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -717,7 +717,7 @@ static void section_write_packet(MpegTSSection *s, const uint8_t *packet) avio_write(ctx->pb, packet, TS_PACKET_SIZE); } -static int mpegts_write_header(AVFormatContext *s) +static int mpegts_init(AVFormatContext *s) { MpegTSWrite *ts = s->priv_data; MpegTSWriteStream *ts_st; @@ -960,26 +960,6 @@ static int mpegts_write_header(AVFormatContext *s) fail: av_freep(&pids); - for (i = 0; i < s->nb_streams; i++) { - st = s->streams[i]; - ts_st = st->priv_data; - if (ts_st) { - av_freep(&ts_st->payload); - if (ts_st->amux) { - avformat_free_context(ts_st->amux); - ts_st->amux = NULL; - } - } - av_freep(&st->priv_data); - } - - for (i = 0; i < ts->nb_services; i++) { - service = ts->services[i]; - av_freep(&service->provider_name); - av_freep(&service->name); - av_freep(&service); - } - av_freep(&ts->services); return ret; } @@ -1714,20 +1694,27 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) static int mpegts_write_end(AVFormatContext *s) { + if (s->pb) + mpegts_write_flush(s); + + return 0; +} + +static void mpegts_deinit(AVFormatContext *s) +{ MpegTSWrite *ts = s->priv_data; MpegTSService *service; int i; - if (s->pb) - mpegts_write_flush(s); - for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MpegTSWriteStream *ts_st = st->priv_data; - av_freep(&ts_st->payload); - if (ts_st->amux) { - avformat_free_context(ts_st->amux); - ts_st->amux = NULL; + if (ts_st) { + av_freep(&ts_st->payload); + if (ts_st->amux) { + avformat_free_context(ts_st->amux); + ts_st->amux = NULL; + } } } @@ -1738,8 +1725,24 @@ static int mpegts_write_end(AVFormatContext *s) av_freep(&service); } av_freep(&ts->services); +} - return 0; +static int mpegts_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) +{ + int ret = 1; + AVStream *st = s->streams[pkt->stream_index]; + + if (st->codec->codec_id == AV_CODEC_ID_H264) { + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + AV_RB24(pkt->data) != 0x000001) + ret = ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL); + } else if (st->codec->codec_id == AV_CODEC_ID_HEVC) { + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + AV_RB24(pkt->data) != 0x000001) + ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL); + } + + return ret; } static const AVOption options[] = { @@ -1846,9 +1849,11 @@ AVOutputFormat ff_mpegts_muxer = { .priv_data_size = sizeof(MpegTSWrite), .audio_codec = AV_CODEC_ID_MP2, .video_codec = AV_CODEC_ID_MPEG2VIDEO, - .write_header = mpegts_write_header, + .init = mpegts_init, .write_packet = mpegts_write_packet, .write_trailer = mpegts_write_end, + .deinit = mpegts_deinit, + .check_bitstream = mpegts_check_bitstream, .flags = AVFMT_ALLOW_FLUSH | AVFMT_VARIABLE_FPS, .priv_class = &mpegts_muxer_class, };

1 0

lavf/matroskaenc: add automatic bitstream filtering
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Rodger Combs <rodger.combs(a)gmail.com> | Wed Oct 7 21:34:06 2015 -0500| [b287d7ea17f404a51eb3fdca80fa8a8b1fb7dd8b] | committer: Rodger Combs lavf/matroskaenc: add automatic bitstream filtering > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b287d7ea17f404a51… --- libavformat/matroskaenc.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 60f7c16..98ab6df 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -845,9 +845,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, int j, ret; AVDictionaryEntry *tag; - // ms precision is the de-facto standard timescale for mkv files - avpriv_set_pts_info(st, 64, 1, 1000); - if (codec->codec_type == AVMEDIA_TYPE_ATTACHMENT) { mkv->have_attachments = 1; return 0; @@ -1392,11 +1389,6 @@ static int mkv_write_header(AVFormatContext *s) else mkv->mode = MODE_MATROSKAv2; - if (s->avoid_negative_ts < 0) { - s->avoid_negative_ts = 1; - s->internal->avoid_negative_ts_use_pts = 1; - } - if (mkv->mode != MODE_WEBM || av_dict_get(s->metadata, "stereo_mode", NULL, 0) || av_dict_get(s->metadata, "alpha_mode", NULL, 0)) @@ -2102,6 +2094,35 @@ static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance) return 0; } +static int mkv_init(struct AVFormatContext *s) +{ + int i; + + if (s->avoid_negative_ts < 0) { + s->avoid_negative_ts = 1; + s->internal->avoid_negative_ts_use_pts = 1; + } + + for (i = 0; i < s->nb_streams; i++) { + // ms precision is the de-facto standard timescale for mkv files + avpriv_set_pts_info(s->streams[i], 64, 1, 1000); + } + + return 0; +} + +static int mkv_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) +{ + int ret = 1; + AVStream *st = s->streams[pkt->stream_index]; + + if (st->codec->codec_id == AV_CODEC_ID_AAC) + if (pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) + ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL); + + return ret; +} + static const AVCodecTag additional_audio_tags[] = { { AV_CODEC_ID_ALAC, 0XFFFFFFFF }, { AV_CODEC_ID_EAC3, 0XFFFFFFFF }, @@ -2164,6 +2185,7 @@ AVOutputFormat ff_matroska_muxer = { AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3, .video_codec = CONFIG_LIBX264_ENCODER ? AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, + .init = mkv_init, .write_header = mkv_write_header, .write_packet = mkv_write_flush_packet, .write_trailer = mkv_write_trailer, @@ -2175,6 +2197,7 @@ AVOutputFormat ff_matroska_muxer = { }, .subtitle_codec = AV_CODEC_ID_ASS, .query_codec = mkv_query_codec, + .check_bitstream = mkv_check_bitstream, .priv_class = &matroska_class, }; #endif @@ -2196,9 +2219,11 @@ AVOutputFormat ff_webm_muxer = { .audio_codec = CONFIG_LIBOPUS_ENCODER ? AV_CODEC_ID_OPUS : AV_CODEC_ID_VORBIS, .video_codec = CONFIG_LIBVPX_VP9_ENCODER? AV_CODEC_ID_VP9 : AV_CODEC_ID_VP8, .subtitle_codec = AV_CODEC_ID_WEBVTT, + .init = mkv_init, .write_header = mkv_write_header, .write_packet = mkv_write_flush_packet, .write_trailer = mkv_write_trailer, + .check_bitstream = mkv_check_bitstream, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .priv_class = &webm_class, @@ -2221,9 +2246,11 @@ AVOutputFormat ff_matroska_audio_muxer = { .audio_codec = CONFIG_LIBVORBIS_ENCODER ? AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3, .video_codec = AV_CODEC_ID_NONE, + .init = mkv_init, .write_header = mkv_write_header, .write_packet = mkv_write_flush_packet, .write_trailer = mkv_write_trailer, + .check_bitstream = mkv_check_bitstream, .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .codec_tag = (const AVCodecTag* const []){

1 0

lavf: add internal API to append a bsf to a stream's list
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Rodger Combs <rodger.combs(a)gmail.com> | Wed Oct 7 21:10:08 2015 -0500| [822e80fde39f8992daeab6d51312f27188021d9b] | committer: Rodger Combs lavf: add internal API to append a bsf to a stream's list > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=822e80fde39f8992d… --- libavformat/internal.h | 11 +++++++++++ libavformat/utils.c | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/libavformat/internal.h b/libavformat/internal.h index 0e59da0..2cb3481 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -465,6 +465,17 @@ enum AVChromaLocation ff_choose_chroma_location(AVFormatContext *s, AVStream *st int ff_generate_avci_extradata(AVStream *st); /** + * Add a bitstream filter to a stream. + * + * @param st output stream to add a filter to + * @param name the name of the filter to add + * @param args filter-specific argument string + * @return >0 on success; + * AVERROR code on failure + */ +int ff_stream_add_bitstream_filter(AVStream *st, const char *name, const char *args); + +/** * Wrap errno on rename() error. * * @param oldpath source path diff --git a/libavformat/utils.c b/libavformat/utils.c index 7e101a4..95acbf3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4651,6 +4651,28 @@ uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, return data; } +int ff_stream_add_bitstream_filter(AVStream *st, const char *name, const char *args) +{ + AVBitStreamFilterContext *bsfc = NULL; + AVBitStreamFilterContext **dest = &st->internal->bsfc; + while (*dest && (*dest)->next) + dest = &(*dest)->next; + + if (!(bsfc = av_bitstream_filter_init(name))) { + av_log(NULL, AV_LOG_ERROR, "Unknown bitstream filter '%s'\n", name); + return AVERROR(EINVAL); + } + if (args && !(bsfc->args = av_strdup(args))) { + av_bitstream_filter_close(bsfc); + return AVERROR(ENOMEM); + } + av_log(st->codec, AV_LOG_VERBOSE, + "Automatically inserted bitstream filter '%s'; args='%s'\n", + name, args ? args : ""); + *dest = bsfc; + return 1; +} + int av_apply_bitstream_filters(AVCodecContext *codec, AVPacket *pkt, AVBitStreamFilterContext *bsfc) {

1 0