May 2014 - 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/cljr: support width%4 encoding
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat May 31 23:52:50 2014 +0200| [6dc709f0f5c5e019ac9a1ea51bb06c04edc1e208] | committer: Michael Niedermayer avcodec/cljr: support width%4 encoding Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dc709f0f5c5e019a… --- libavcodec/cljr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 9b2bf60..8d1d1a0 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -124,12 +124,18 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint8_t *luma = &p->data[0][y * p->linesize[0]]; uint8_t *cb = &p->data[1][y * p->linesize[1]]; uint8_t *cr = &p->data[2][y * p->linesize[2]]; + uint8_t luma_tmp[4]; for (x = 0; x < avctx->width; x += 4) { switch (a->dither_type) { case 0: dither = 0x492A0000; break; case 1: dither = dither * 1664525 + 1013904223; break; case 2: dither = ordered_dither[ y&1 ][ (x>>2)&1 ];break; } + if (x+3 >= avctx->width) { + memset(luma_tmp, 0, sizeof(luma_tmp)); + memcpy(luma_tmp, luma, avctx->width - x); + luma = luma_tmp; + } put_bits(&pb, 5, (249*(luma[3] + (dither>>29) )) >> 11); put_bits(&pb, 5, (249*(luma[2] + ((dither>>26)&7))) >> 11); put_bits(&pb, 5, (249*(luma[1] + ((dither>>23)&7))) >> 11);

1 0

avcodec/cljr: remove coded_frame code
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat May 31 22:19:13 2014 +0200| [59a70422b1bba8b413c0f13d2489f3fac41e6413] | committer: Michael Niedermayer avcodec/cljr: remove coded_frame code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59a70422b1bba8b41… --- libavcodec/cljr.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 7e0773b..9b2bf60 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -102,21 +102,6 @@ typedef struct CLJRContext { int dither_type; } CLJRContext; -static av_cold int encode_init(AVCodecContext *avctx) -{ - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); - - return 0; -} - -static av_cold int encode_close(AVCodecContext *avctx) -{ - av_frame_free(&avctx->coded_frame); - return 0; -} - static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *p, int *got_packet) { @@ -133,9 +118,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, if ((ret = ff_alloc_packet2(avctx, pkt, 32*avctx->height*avctx->width/4)) < 0) return ret; - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; - init_put_bits(&pb, pkt->data, pkt->size); for (y = 0; y < avctx->height; y++) { @@ -186,9 +168,7 @@ AVCodec ff_cljr_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CLJR, .priv_data_size = sizeof(CLJRContext), - .init = encode_init, .encode2 = encode_frame, - .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }, .priv_class = &cljr_class,

1 0

lavc/dsputil: add missing vsad8 and vsse8 functions
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat May 31 14:25:03 2014 -0300| [ac1077ab5010fef7f77ea64089f73901825a1b43] | committer: Michael Niedermayer lavc/dsputil: add missing vsad8 and vsse8 functions the mpeg encoder would try to use them if vsad or vsse were selected for frame_skip_cmp and frame_skip_threshold or frame_skip_factor were set to values != 0 example: "ffmpeg -i INPUT -c:v mpeg2video -skipcmp vsad -skip_threshold 1 -f null -" Signed-off-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac1077ab5010fef7f… --- libavcodec/dsputil.c | 65 ++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 8fb37cb..91938b7 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1277,20 +1277,24 @@ static int vsad_intra ## size ## _c(MpegEncContext *c, \ VSAD_INTRA(8) VSAD_INTRA(16) -static int vsad16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, - int stride, int h) -{ - int score = 0, x, y; - - for (y = 1; y < h; y++) { - for (x = 0; x < 16; x++) - score += FFABS(s1[x] - s2[x] - s1[x + stride] + s2[x + stride]); - s1 += stride; - s2 += stride; - } - - return score; -} +#define VSAD(size) \ +static int vsad ## size ## _c(MpegEncContext *c, \ + uint8_t *s1, uint8_t *s2, \ + int stride, int h) \ +{ \ + int score = 0, x, y; \ + \ + for (y = 1; y < h; y++) { \ + for (x = 0; x < size; x++) \ + score += FFABS(s1[x] - s2[x] - s1[x + stride] + s2[x + stride]); \ + s1 += stride; \ + s2 += stride; \ + } \ + \ + return score; \ +} +VSAD(8) +VSAD(16) #define SQ(a) ((a) * (a)) #define VSSE_INTRA(size) \ @@ -1315,20 +1319,23 @@ static int vsse_intra ## size ## _c(MpegEncContext *c, \ VSSE_INTRA(8) VSSE_INTRA(16) -static int vsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, - int stride, int h) -{ - int score = 0, x, y; - - for (y = 1; y < h; y++) { - for (x = 0; x < 16; x++) - score += SQ(s1[x] - s2[x] - s1[x + stride] + s2[x + stride]); - s1 += stride; - s2 += stride; - } - - return score; -} +#define VSSE(size) \ +static int vsse ## size ## _c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, \ + int stride, int h) \ +{ \ + int score = 0, x, y; \ + \ + for (y = 1; y < h; y++) { \ + for (x = 0; x < size; x++) \ + score += SQ(s1[x] - s2[x] - s1[x + stride] + s2[x + stride]); \ + s1 += stride; \ + s2 += stride; \ + } \ + \ + return score; \ +} +VSSE(8) +VSSE(16) #define WRAPPER8_16_SQ(name8, name16) \ static int name16(MpegEncContext *s, uint8_t *dst, uint8_t *src, \ @@ -1668,9 +1675,11 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) SET_CMP_FUNC(rd) SET_CMP_FUNC(bit) c->vsad[0] = vsad16_c; + c->vsad[1] = vsad8_c; c->vsad[4] = vsad_intra16_c; c->vsad[5] = vsad_intra8_c; c->vsse[0] = vsse16_c; + c->vsse[1] = vsse8_c; c->vsse[4] = vsse_intra16_c; c->vsse[5] = vsse_intra8_c; c->nsse[0] = nsse16_c;

1 0

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

31 May '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat May 31 17:24:18 2014 +0200| [28f7b81f9b00ff7e7096e6d2415ddfd118c7b6e8] | committer: Michael Niedermayer Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Read mov files where the moov atom is hidden within a free atom. Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28f7b81f9b00ff7e7… ---

1 0

Read mov files where the moov atom is hidden within a free atom.
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat May 31 15:39:35 2014 +0200| [26b0d7198e23ca6d0538ad7da1c383a146a4bf1a] | committer: Carl Eugen Hoyos Read mov files where the moov atom is hidden within a free atom. Fixes ticket #1551 / issue 2226. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26b0d7198e23ca6d0… --- libavformat/isom.h | 1 + libavformat/mov.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h index a5934af..253451e 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -169,6 +169,7 @@ typedef struct MOVContext { int64_t next_root_atom; ///< offset of the next root atom int *bitrates; ///< bitrates read before streams creation int bitrates_count; + int moov_retry; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index befbfa6..fe089cd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3120,6 +3120,19 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size >= 8) { a.size = avio_rb32(pb); a.type = avio_rl32(pb); + if (a.type == MKTAG('f','r','e','e') && + a.size >= 8 && + c->moov_retry) { + uint8_t buf[8]; + uint32_t *type = (uint32_t *)buf + 1; + avio_read(pb, buf, 8); + avio_seek(pb, -8, SEEK_CUR); + if (*type == MKTAG('m','v','h','d') || + *type == MKTAG('c','m','o','v')) { + av_log(c->fc, AV_LOG_ERROR, "Detected moov in a free atom.\n"); + a.type = MKTAG('m','o','o','v'); + } + } if (atom.type != MKTAG('r','o','o','t') && atom.type != MKTAG('m','o','o','v')) { @@ -3486,11 +3499,15 @@ static int mov_read_header(AVFormatContext *s) atom.size = INT64_MAX; /* check MOV header */ + do { + if (mov->moov_retry) + avio_seek(pb, 0, SEEK_SET); if ((err = mov_read_default(mov, pb, atom)) < 0) { av_log(s, AV_LOG_ERROR, "error reading header: %d\n", err); mov_read_close(s); return err; } + } while (pb->seekable && !mov->found_moov && !mov->moov_retry++); if (!mov->found_moov) { av_log(s, AV_LOG_ERROR, "moov atom not found\n"); mov_read_close(s);

1 0

avcodec/asvenc: fix encoding dimensions %16 != 0
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat May 31 17:07:12 2014 +0200| [e692c9672b28230419c912f90f4f3852cdd71dd0] | committer: Michael Niedermayer avcodec/asvenc: fix encoding dimensions %16 != 0 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e692c9672b2823041… --- libavcodec/asvenc.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index b098f47..39e2315 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -181,6 +181,48 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int size, ret; int mb_x, mb_y; + if (pict->width % 16 || pict->height % 16) { + AVFrame *clone = av_frame_alloc(); + int i; + + if (!clone) + return AVERROR(ENOMEM); + clone->format = pict->format; + clone->width = FFALIGN(pict->width, 16); + clone->height = FFALIGN(pict->height, 16); + ret = av_frame_get_buffer(clone, 32); + if (ret < 0) { + av_frame_free(&clone); + return ret; + } + + ret = av_frame_copy(clone, pict); + if (ret < 0) { + av_frame_free(&clone); + return ret; + } + + for (i = 0; i<3; i++) { + int x, y; + int w = FF_CEIL_RSHIFT(pict->width, !!i); + int h = FF_CEIL_RSHIFT(pict->height, !!i); + int w2 = FF_CEIL_RSHIFT(clone->width, !!i); + int h2 = FF_CEIL_RSHIFT(clone->height, !!i); + for (y=0; y<h; y++) + for (x=w; x<w2; x++) + clone->data[i][x + y*clone->linesize[i]] = + clone->data[i][w - 1 + y*clone->linesize[i]]; + for (y=h; y<h2; y++) + for (x=0; x<w2; x++) + clone->data[i][x + y*clone->linesize[i]] = + clone->data[i][x + (h-1)*clone->linesize[i]]; + } + ret = encode_frame(avctx, pkt, clone, got_packet); + + av_frame_free(&clone); + return ret; + } + if ((ret = ff_alloc_packet2(avctx, pkt, a->mb_height*a->mb_width*MAX_MB_SIZE + FF_MIN_BUFFER_SIZE)) < 0) return ret;

1 0

avcodec/snow: fix 1 pixel block sizes
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat May 31 16:26:46 2014 +0200| [e868f84e83473221e98b56bb51c6cd1bedf91625] | committer: Michael Niedermayer avcodec/snow: fix 1 pixel block sizes Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e868f84e83473221e… --- libavcodec/snow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 3a825bd..bd20388 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -358,9 +358,13 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, ptrdiff_t st av_assert2(s->chroma_h_shift == s->chroma_v_shift); // only one mv_scale - av_assert2(b_w>1 && b_h>1); av_assert2((tab_index>=0 && tab_index<4) || b_w==32); - if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)) || !s->plane[plane_index].fast_mc ) + if( (dx&3) || (dy&3) + || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) + || (b_w&(b_w-1)) + || b_w == 1 + || b_h == 1 + || !s->plane[plane_index].fast_mc ) mc_block(&s->plane[plane_index], dst, src, stride, b_w, b_h, dx, dy); else if(b_w==32){ int y;

1 0

avutil/frame: frame_copy_video: support copying from a smaller to a larger frame
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat May 31 17:06:26 2014 +0200| [879aa062f973bf0f357bde8e5722522bc85d1884] | committer: Michael Niedermayer avutil/frame: frame_copy_video: support copying from a smaller to a larger frame Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=879aa062f973bf0f3… --- libavutil/frame.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 85208b8..89557ed 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -589,8 +589,8 @@ static int frame_copy_video(AVFrame *dst, const AVFrame *src) const uint8_t *src_data[4]; int i, planes; - if (dst->width != src->width || - dst->height != src->height) + if (dst->width < src->width || + dst->height < src->height) return AVERROR(EINVAL); planes = av_pix_fmt_count_planes(dst->format); @@ -601,7 +601,7 @@ static int frame_copy_video(AVFrame *dst, const AVFrame *src) memcpy(src_data, src->data, sizeof(src_data)); av_image_copy(dst->data, dst->linesize, src_data, src->linesize, - dst->format, dst->width, dst->height); + dst->format, src->width, src->height); return 0; }

1 0

Fix compilation with --disable-everything --enable-demuxer=matroska.
by git＠videolan.org 31 May '14

31 May '14

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat May 31 16:27:48 2014 +0200| [aab2e939a9a1bbf72469a690808dd9644c85ccee] | committer: Carl Eugen Hoyos Fix compilation with --disable-everything --enable-demuxer=matroska. Fixes ticket #3693. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aab2e939a9a1bbf72… --- libavcodec/Makefile | 3 ++- libavformat/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 18a3368..ce8521f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -671,7 +671,8 @@ OBJS-$(CONFIG_ISMV_MUXER) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += xiph.o mpeg4audio.o vorbis_data.o \ flac.o flacdata.o -OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o mpegaudiodata.o +OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o mpegaudiodata.o \ + vorbis_parser.o xiph.o OBJS-$(CONFIG_MATROSKA_MUXER) += mpeg4audio.o mpegaudiodata.o \ flac.o flacdata.o vorbis_data.o xiph.o OBJS-$(CONFIG_MP2_MUXER) += mpegaudiodata.o mpegaudiodecheader.o diff --git a/libavformat/Makefile b/libavformat/Makefile index fdd0123..7b7156c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -205,7 +205,7 @@ OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o OBJS-$(CONFIG_M4V_MUXER) += rawenc.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ - isom.o rmsipr.o \ + isom.o rmsipr.o flac_picture.o \ oggparsevorbis.o vorbiscomment.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ isom.o avc.o hevc.o \

1 0