October 2013 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/ff_init_vlc_sparse: use a spinlock for thread sync
by git＠videolan.org 17 Jun '14

17 Jun '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jul 13 13:32:39 2013 +0200| [6af8326354ed6c1c68b53b3f2bba6697fb2d3bff] | committer: Michael Niedermayer avcodec/ff_init_vlc_sparse: use a spinlock for thread sync Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6af8326354ed6c1c6… --- libavcodec/bitstream.c | 28 +++++++++++++++++++--------- libavcodec/get_bits.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 3c4d176..aac32a5 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -28,6 +28,7 @@ * bitstream api. */ +#include "libavutil/atomic.h" #include "libavutil/avassert.h" #include "avcodec.h" #include "mathops.h" @@ -269,14 +270,17 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, { VLCcode *buf; int i, j, ret; + void *state; vlc->bits = nb_bits; if (flags & INIT_VLC_USE_NEW_STATIC) { - if (vlc->table_size && vlc->table_size == vlc->table_allocated) { - return 0; - } else if(vlc->table_size) { - abort(); // fatal error, we are called on a partially initialized table + while (state = avpriv_atomic_ptr_cas(&vlc->init_state, NULL, vlc)) { + if (state == vlc + 1) { + av_assert0(vlc->table_size && vlc->table_size == vlc->table_allocated); + return 0; + } } + av_assert0(!vlc->table_size); } else { vlc->table = NULL; vlc->table_allocated = 0; @@ -326,12 +330,18 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, ret = build_table(vlc, nb_bits, nb_codes, buf, flags); av_free(buf); - if (ret < 0) { - av_freep(&vlc->table); - return ret; + if (flags & INIT_VLC_USE_NEW_STATIC) { + if(vlc->table_size != vlc->table_allocated) + av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); + state = avpriv_atomic_ptr_cas(&vlc->init_state, vlc, vlc+1); + av_assert0(state == vlc); + av_assert0(ret >= 0); + } else { + if (ret < 0) { + av_freep(&vlc->table); + return ret; + } } - if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated) - av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); return 0; } diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index b6cc75a..3967b49 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -64,6 +64,7 @@ typedef struct VLC { int bits; VLC_TYPE (*table)[2]; ///< code, bits int table_size, table_allocated; + void *init_state; } VLC; typedef struct RL_VLC_ELEM {

4 5

avcodec/wmv2enc: Collect statistics for 2 pass encoding
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Nov 1 00:40:33 2013 +0100| [ec5e02d49573975ee4bc73be173a2fad76d808ff] | committer: Michael Niedermayer avcodec/wmv2enc: Collect statistics for 2 pass encoding Fixes Ticket3053 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec5e02d49573975ee… --- libavcodec/wmv2enc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index ab5e085..6aeee59 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -169,10 +169,12 @@ void ff_wmv2_encode_mb(MpegEncContext * s, ff_wmv2_inter_table[w->cbp_table_index][cbp + 64][1], ff_wmv2_inter_table[w->cbp_table_index][cbp + 64][0]); + s->misc_bits += get_bits_diff(s); /* motion vector */ ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y); ff_msmpeg4_encode_motion(s, motion_x - pred_x, motion_y - pred_y); + s->mv_bits += get_bits_diff(s); } else { /* compute cbp */ cbp = 0; @@ -203,11 +205,16 @@ void ff_wmv2_encode_mb(MpegEncContext * s, s->h263_aic_dir=0; put_bits(&s->pb, ff_table_inter_intra[s->h263_aic_dir][1], ff_table_inter_intra[s->h263_aic_dir][0]); } + s->misc_bits += get_bits_diff(s); } for (i = 0; i < 6; i++) { ff_msmpeg4_encode_block(s, block[i], i); } + if (s->mb_intra) + s->i_tex_bits += get_bits_diff(s); + else + s->p_tex_bits += get_bits_diff(s); } AVCodec ff_wmv2_encoder = {

1 0

MAINTAINERS: add myself as libzvbi-teletextdec maintainer
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Thu Oct 31 21:28:47 2013 +0100| [e1573d714746684e261628d6e773fa6913ed9634] | committer: Michael Niedermayer MAINTAINERS: add myself as libzvbi-teletextdec maintainer Signed-off-by: Marton Balint <cus(a)passwd.hu> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1573d714746684e2… --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a9a55df..8b24771 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -199,6 +199,7 @@ Codecs: libvorbis.c David Conrad libx264.c Mans Rullgard, Jason Garrett-Glaser libxavs.c Stefan Gehrer + libzvbi-teletextdec.c Marton Balint loco.c Kostya Shishkov lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer

1 0

aacdec: fix small comment, update decoder features comment
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Compn <tempn(a)twmi.rr.com> | Thu Oct 31 15:57:16 2013 -0400| [6173b0fea71aae0855dc2bbcb030a49cdcb72f55] | committer: Compn aacdec: fix small comment, update decoder features comment > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6173b0fea71aae085… --- libavcodec/aacdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index eb6ee5e..bb613f0 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -74,6 +74,7 @@ * N SinuSoidal Coding (Transient, Sinusoid, Noise) * Y Parametric Stereo * N Direct Stream Transfer + * Y Enhanced AAC Low Delay (ER AAC ELD) * * Note: - HE AAC v1 comprises LC AAC with Spectral Band Replication. * - HE AAC v2 comprises LC AAC with Spectral Band Replication and @@ -2533,7 +2534,7 @@ static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce) // Inverse transform, mapped to the conventional IMDCT by // Chivukula, R.K.; Reznik, Y.A.; Devarajan, V., // "Efficient algorithms for MPEG-4 AAC-ELD, AAC-LD and AAC-LC filterbanks," - // Audio, Language and Image Processing, 2008. ICALIP 2008. International Conference on + // International Conference on Audio, Language and Image Processing, ICALIP 2008. // URL: http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=4590245&isnumber=45… for (i = 0; i < n2; i+=2) { float temp;

1 0

Fix a crash on oom when decoding hevc.
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Thu Oct 31 20:17:18 2013 +0100| [5ab1efb9d0dc65e748a0291b67915e35578b302e] | committer: Carl Eugen Hoyos Fix a crash on oom when decoding hevc. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ab1efb9d0dc65e74… --- libavcodec/hevc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 9528323..18fee33 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2597,7 +2597,8 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) pic_arrays_free(s); - av_freep(&lc->edge_emu_buffer); + if (lc) + av_freep(&lc->edge_emu_buffer); av_freep(&s->md5_ctx); for(i=0; i < s->nals_allocated; i++) {

1 0

doc/filters: add few more examples for blend filter
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 31 13:31:11 2013 +0000| [49287bbfd3227b0718fddb976d19bebae52b71ef] | committer: Paul B Mahol doc/filters: add few more examples for blend filter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49287bbfd3227b071… --- doc/filters.texi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 14692a2..57679cc 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2412,6 +2412,24 @@ Apply 1x1 checkerboard effect: @example blend=all_expr='if(eq(mod(X,2),mod(Y,2)),A,B)' @end example + +@item +Apply uncover left effect: +@example +blend=all_expr='if(gte(N*SW+X,W),A,B)' +@end example + +@item +Apply uncover down effect: +@example +blend=all_expr='if(gte(Y-N*SH,0),A,B)' +@end example + +@item +Apply uncover up-left effect: +@example +blend=all_expr='if(gte(T*SH*40+Y,H)*gte((T*40*SW+X)*W/H,W),A,B)' +@end example @end itemize @section boxblur

1 0

Merge remote-tracking branch 'cehoyos/master'
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Oct 31 14:27:47 2013 +0100| [045214e3d98157d173284e10c412f3976cc55b35] | committer: Michael Niedermayer Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: libavfilter/decimate: Add pts of first frame to all frames. Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=045214e3d98157d17… ---

1 0

libavfilter/decimate: Add pts of first frame to all frames.
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Thu Oct 31 00:33:51 2013 +0100| [e4b0a77021a25fd538ef14791e31c06950d5ff1f] | committer: Carl Eugen Hoyos libavfilter/decimate: Add pts of first frame to all frames. Fixes ticket #3019 Reviewed-by: Clément Bœsch > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4b0a77021a25fd53… --- libavfilter/vf_decimate.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c index 034d524..5efafe9 100644 --- a/libavfilter/vf_decimate.c +++ b/libavfilter/vf_decimate.c @@ -43,6 +43,7 @@ typedef struct { AVFrame **clean_src; ///< frame queue for the clean source int got_frame[2]; ///< frame request flag for each input stream double ts_unit; ///< timestamp units for the output frames + int64_t start_pts; ///< base for output timestamps uint32_t eof; ///< bitmask for end of stream int hsub, vsub; ///< chroma subsampling values int depth; @@ -210,11 +211,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_frame_free(&dm->queue[i].frame); } else { AVFrame *frame = dm->queue[i].frame; + if (frame->pts != AV_NOPTS_VALUE && dm->start_pts == AV_NOPTS_VALUE) + dm->start_pts = frame->pts; if (dm->ppsrc) { av_frame_free(&frame); frame = dm->clean_src[i]; } - frame->pts = outlink->frame_count * dm->ts_unit; + frame->pts = outlink->frame_count * dm->ts_unit + + (dm->start_pts == AV_NOPTS_VALUE ? 0 : dm->start_pts); ret = ff_filter_frame(outlink, frame); if (ret < 0) break; @@ -259,7 +263,7 @@ static int config_input(AVFilterLink *inlink) static av_cold int decimate_init(AVFilterContext *ctx) { - const DecimateContext *dm = ctx->priv; + DecimateContext *dm = ctx->priv; AVFilterPad pad = { .name = av_strdup("main"), .type = AVMEDIA_TYPE_VIDEO, @@ -285,6 +289,8 @@ static av_cold int decimate_init(AVFilterContext *ctx) return AVERROR(EINVAL); } + dm->start_pts = AV_NOPTS_VALUE; + return 0; }

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Oct 31 13:08:06 2013 +0100| [532ca12300f149a91090270ac733c52c4573ec88] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: build: Ensure that strip commands are run silently Conflicts: Makefile Not merged as it conflicts with strip being on the BRIEF list Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=532ca12300f149a91… ---

1 0

build: Ensure that strip commands are run silently
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Tue Oct 29 15:46:02 2013 +0100| [c7f25d4c7f6504db1265d711822885331dd3ad4c] | committer: Diego Biurrun build: Ensure that strip commands are run silently > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7f25d4c7f6504db1… --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 783971f..e116905 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) BRIEF = CC HOSTCC HOSTLD AS YASM AR LD -SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM +SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM STRIP MSG = $@ M = @$(call ECHO,$(TAG),$@); $(foreach VAR,$(BRIEF), \

1 0