March 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

Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
by git＠videolan.org 03 Apr '14

03 Apr '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Mar 25 19:24:40 2014 +0100| [41e7e46cac507e993af6d656c8d3672ba3f9e304] | committer: Michael Niedermayer Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc' * commit 'aa499568afc01d59215eef7e5b14b949a9671afc': avconv: More descriptive message about framedrop Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41e7e46cac507e993… ---

2 1

avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2
by git＠videolan.org 31 Mar '14

31 Mar '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Apr 1 01:14:26 2014 +0200| [d56c373391d334d3dc29c752955fd17f0cef7ff9] | committer: Michael Niedermayer avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2 Fixes Ticket3516 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d56c373391d334d3d… --- libavcodec/mjpegdec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 47017ef..3c10395 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -414,6 +414,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) s->upscale_v = 6; s->upscale_h = 6; s->chroma_height = s->height; + } else if (s->adobe_transform == 2 && s->bits <= 8) { + s->avctx->pix_fmt = AV_PIX_FMT_YUVA444P; + s->upscale_v = 6; + s->upscale_h = 6; + s->chroma_height = s->height; + s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; } else { if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUVA420P; else s->avctx->pix_fmt = AV_PIX_FMT_YUVA420P16; @@ -2053,6 +2059,7 @@ the_end: avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ440P || avctx->pix_fmt == AV_PIX_FMT_YUV440P || + avctx->pix_fmt == AV_PIX_FMT_YUVA444P || avctx->pix_fmt == AV_PIX_FMT_GBRAP ); for (p = 1; p<4; p++) { @@ -2072,6 +2079,7 @@ the_end: avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || avctx->pix_fmt == AV_PIX_FMT_YUV422P || + avctx->pix_fmt == AV_PIX_FMT_YUVA444P || avctx->pix_fmt == AV_PIX_FMT_GBRAP ); avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift);

1 0

avformat/img2dec: zero probe buffer
by git＠videolan.org 31 Mar '14

31 Mar '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 31 23:42:08 2014 +0200| [1f361124d97cf8b8ce6d3aacb10cdc53706470de] | committer: Michael Niedermayer avformat/img2dec: zero probe buffer Fixes use of uninitialized memory Fixes valgrind failure Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f361124d97cf8b8c… --- libavformat/img2dec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index d491241..5da123f 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -361,6 +361,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) ret = avio_read(f[0], header, PROBE_BUF_MIN); if (ret < 0) return ret; + memset(header + ret, 0, sizeof(header) - ret); avio_skip(f[0], -ret); pd.buf = header; pd.buf_size = ret;

1 0

dshow: fixup some COM objects, based on patches from Don Moir
by git＠videolan.org 31 Mar '14

31 Mar '14

ffmpeg | branch: master | rogerdpack <rogerpack2005(a)gmail.com> | Thu Mar 27 14:37:48 2014 -0600| [0cc8a62a78b3afa6092b0dca3d2c2bb3bb14668e] | committer: Michael Niedermayer dshow: fixup some COM objects, based on patches from Don Moir Signed-off-by: rogerdpack <rogerpack2005(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cc8a62a78b3afa60… --- libavdevice/dshow_enummediatypes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/dshow_enummediatypes.c b/libavdevice/dshow_enummediatypes.c index aaed58b..5b69a5b 100644 --- a/libavdevice/dshow_enummediatypes.c +++ b/libavdevice/dshow_enummediatypes.c @@ -22,7 +22,7 @@ #include "dshow_capture.h" DECLARE_QUERYINTERFACE(libAVEnumMediaTypes, - { {&IID_IUnknown,0}, {&IID_IEnumPins,0} }) + { {&IID_IUnknown,0}, {&IID_IEnumMediaTypes,0} }) DECLARE_ADDREF(libAVEnumMediaTypes) DECLARE_RELEASE(libAVEnumMediaTypes) @@ -82,7 +82,7 @@ libAVEnumMediaTypes_Clone(libAVEnumMediaTypes *this, libAVEnumMediaTypes **enums static int libAVEnumMediaTypes_Setup(libAVEnumMediaTypes *this, const AM_MEDIA_TYPE *type) { - IEnumPinsVtbl *vtbl = this->vtbl; + IEnumMediaTypesVtbl *vtbl = this->vtbl; SETVTBL(vtbl, libAVEnumMediaTypes, QueryInterface); SETVTBL(vtbl, libAVEnumMediaTypes, AddRef); SETVTBL(vtbl, libAVEnumMediaTypes, Release);

1 0

lavd/qtkit: Fix non-constant initializer element for some clang compilers.
by git＠videolan.org 31 Mar '14

31 Mar '14

ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann(a)mail.de> | Mon Mar 31 14:16:26 2014 +0200| [d5c0036d4adcec7a38aad6e3aab8792ab9bc074a] | committer: Michael Niedermayer lavd/qtkit: Fix non-constant initializer element for some clang compilers. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5c0036d4adcec7a3… --- libavdevice/qtkit.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavdevice/qtkit.m b/libavdevice/qtkit.m index 038ce02..a1da4d4 100644 --- a/libavdevice/qtkit.m +++ b/libavdevice/qtkit.m @@ -35,11 +35,11 @@ #include "libavutil/time.h" #include "avdevice.h" -static const int kQTKitTimeBase = 100; +#define QTKIT_TIMEBASE 100 static const AVRational kQTKitTimeBase_q = { .num = 1, - .den = kQTKitTimeBase + .den = QTKIT_TIMEBASE }; typedef struct @@ -213,7 +213,7 @@ static int qtkit_read_header(AVFormatContext *s) goto fail; } - avpriv_set_pts_info(stream, 64, 1, kQTKitTimeBase); + avpriv_set_pts_info(stream, 64, 1, QTKIT_TIMEBASE); stream->codec->codec_id = AV_CODEC_ID_RAWVIDEO; stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;

1 0

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

31 Mar '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 31 22:07:34 2014 +0200| [9d013fe840213407790592ca8ecbab69285030ed] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: mov: Unbreak sbtl writing Conflicts: libavformat/movenc.c See: 8a9d0a1561470a185a3d09676fcf9b44830a4bfe Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d013fe8402134077… ---

1 0

mov: Unbreak sbtl writing
by git＠videolan.org 31 Mar '14

31 Mar '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Mar 29 15:56:03 2014 +0100| [f94371b1db89bf65173a763a49175ce549466602] | committer: Luca Barbato mov: Unbreak sbtl writing > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f94371b1db89bf651… --- libavformat/movenc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a6a55d5..889f15c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1312,9 +1312,13 @@ static int mov_write_hdlr_tag(AVIOContext *pb, MOVTrack *track) hdlr_type = "soun"; descr = "SoundHandler"; } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) { - if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl"; - if (track->tag == MKTAG('m','p','4','s')) hdlr_type = "subp"; - else hdlr_type = "text"; + if (track->tag == MKTAG('t','x','3','g')) { + hdlr_type = "sbtl"; + } else if (track->tag == MKTAG('m','p','4','s')) { + hdlr_type = "subp"; + } else { + hdlr_type = "text"; + } descr = "SubtitleHandler"; } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) { hdlr_type = "hint";

1 0

Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'
by git＠videolan.org 31 Mar '14

31 Mar '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 31 21:58:26 2014 +0200| [0f714abb49850fd43be207dc8c5a4bfab5a1999e] | committer: Michael Niedermayer Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80' * commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80': vc1dec: improve hwaccel #ifdefs Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f714abb49850fd43… ---

1 0

vc1dec: improve hwaccel #ifdefs
by git＠videolan.org 31 Mar '14

31 Mar '14

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Tue Mar 25 20:19:58 2014 +0000| [654c7446a806c5dc8ec7800874c49a4c1ba2ce80] | committer: Vittorio Giovara vc1dec: improve hwaccel #ifdefs > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=654c7446a806c5dc8… --- libavcodec/vc1dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index f8340ee..e6bbe58 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6122,13 +6122,13 @@ static const AVProfile profiles[] = { }; static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { -#if CONFIG_DXVA2 +#if CONFIG_VC1_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, #endif -#if CONFIG_VAAPI +#if CONFIG_VC1_VAAPI_HWACCEL AV_PIX_FMT_VAAPI_VLD, #endif -#if CONFIG_VDPAU +#if CONFIG_VC1_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, #endif AV_PIX_FMT_YUV420P,

1 0