April 2012 - ffmpeg-cvslog - lists.ffmpeg.org

ffv1: add slicecrc option
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Apr 30 15:00:10 2012 +0200| [123dd9346b4c6da765a338e998c2881ac7071b04] | committer: Michael Niedermayer ffv1: add slicecrc option Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=123dd9346b4c6da76… --- libavcodec/ffv1.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 540dfdb..05d1d53 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -36,6 +36,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/avassert.h" #include "libavutil/crc.h" +#include "libavutil/opt.h" #ifdef __INTEL_COMPILER #undef av_flatten @@ -903,7 +904,10 @@ static av_cold int encode_init(AVCodecContext *avctx) if(avctx->level == 3){ s->version = 3; - s->ec = 1; + } + + if(s->ec < 0){ + s->ec = (s->version >= 3); } if(s->version >= 2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { @@ -2028,6 +2032,21 @@ AVCodec ff_ffv1_decoder = { }; #if CONFIG_FFV1_ENCODER + +#define OFFSET(x) offsetof(FFV1Context, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "slicecrc", "Protect slices with CRCs", OFFSET(ec), AV_OPT_TYPE_INT, {-1}, -1, 1, VE}, +{NULL} +}; + +static const AVClass class = { + .class_name = "ffv1 encoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVCodec ff_ffv1_encoder = { .name = "ffv1", .type = AVMEDIA_TYPE_VIDEO, @@ -2039,5 +2058,6 @@ AVCodec ff_ffv1_encoder = { .capabilities = CODEC_CAP_SLICE_THREADS, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUVA420P, PIX_FMT_YUV444P, PIX_FMT_YUVA444P, PIX_FMT_YUV440P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV444P9, PIX_FMT_YUV422P9, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10, PIX_FMT_GRAY16, PIX_FMT_GRAY8, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), + .priv_class = &class, }; #endif

1 0

EC: fix dest index for non 420 chroma.
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Apr 30 03:31:58 2012 +0200| [24e3f44aedd450fa48ca95d995e65341c2718b0c] | committer: Michael Niedermayer EC: fix dest index for non 420 chroma. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24e3f44aedd450fa4… --- libavcodec/error_resilience.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 2691109..63f996c 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -48,6 +48,8 @@ static void decode_mb(MpegEncContext *s, int ref) ff_init_block_index(s); ff_update_block_index(s); + s->dest[1] += (16 >> s->chroma_x_shift) - 8; + s->dest[2] += (16 >> s->chroma_x_shift) - 8; if (CONFIG_H264_DECODER && s->codec_id == CODEC_ID_H264) { H264Context *h = (void*)s;

1 0

isom: remove duplicate line.
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Apr 30 02:37:35 2012 +0200| [bcc213cf36f999343602da049de31c983194dbdb] | committer: Michael Niedermayer isom: remove duplicate line. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcc213cf36f999343… --- libavformat/isom.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index 77b7246..bb2237a 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -252,7 +252,6 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */ { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, - { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */ { CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') }, { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') },

1 0

isom: Clarify comment for 'ec-3' fourcc
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Wed Apr 25 15:19:59 2012 -0400| [9ea5756dae0f0c5d967eb5643d6f88610e2ef9d9] | committer: Michael Niedermayer isom: Clarify comment for 'ec-3' fourcc Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ea5756dae0f0c5d9… --- libavformat/isom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index ba2cce7..77b7246 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -252,7 +252,7 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */ { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, - { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */ + { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */ { CODEC_ID_GSM, MKTAG('a', 'g', 's', 'm') }, { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') },

1 0

ffmpeg: add the edge at the correct place in allocating of the buffer.
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Apr 29 23:13:06 2012 +0200| [7588b33ad4b33a52ed293c1e36ece496ba842291] | committer: Michael Niedermayer ffmpeg: add the edge at the correct place in allocating of the buffer. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7588b33ad4b33a52e… --- ffmpeg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 6efa12c..abceb3f 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -546,12 +546,13 @@ static int alloc_buffer(InputStream *ist, AVCodecContext *s, FrameBuffer **pbuf) if (!buf) return AVERROR(ENOMEM); + avcodec_align_dimensions(s, &w, &h); + if (!(s->flags & CODEC_FLAG_EMU_EDGE)) { w += 2*edge; h += 2*edge; } - avcodec_align_dimensions(s, &w, &h); if ((ret = av_image_alloc(buf->base, buf->linesize, w, h, s->pix_fmt, 32)) < 0) { av_freep(&buf);

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 29 Apr '12

29 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Apr 29 21:45:41 2012 +0200| [dfa07e89289b25d44b6f2b959130077913921e0a] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: 4xm: fix invalid array indexing rv34dsp: factorize a multiplication in the noround inverse transform rv40: perform bitwise checks in loop filter rv34: remove inline keyword from rv34_decode_block(). rv40: change a logical test into a bitwise one. rv34: remove constant parameter rv40: don't always do the full prev_type search dsputil x86: revert a test back to its previous value rv34dsp x86: implement MMX2 inverse transform Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfa07e89289b25d44… ---

1 0

4xm: fix invalid array indexing
by git＠videolan.org 29 Apr '12

29 Apr '12

ffmpeg | branch: master | Mans Rullgard <mans(a)mansr.com> | Sat Apr 28 13:05:18 2012 +0100| [acb2c79c2102026747468dcafa6780ab1094b3c5] | committer: Mans Rullgard 4xm: fix invalid array indexing Indexing outside arrays is invalid and breaks with gcc 4.8. Signed-off-by: Mans Rullgard <mans(a)mansr.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acb2c79c210202674… --- libavcodec/4xm.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 8cc5592..7869264 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -240,15 +240,18 @@ static void idct(DCTELEM block[64]) static av_cold void init_vlcs(FourXContext *f) { - static VLC_TYPE table[8][32][2]; - int i; - - for (i = 0; i < 8; i++) { - block_type_vlc[0][i].table = table[i]; - block_type_vlc[0][i].table_allocated = 32; - init_vlc(&block_type_vlc[0][i], BLOCK_TYPE_VLC_BITS, 7, - &block_type_tab[0][i][0][1], 2, 1, - &block_type_tab[0][i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC); + static VLC_TYPE table[2][4][32][2]; + int i, j; + + for (i = 0; i < 2; i++) { + for (j = 0; j < 4; j++) { + block_type_vlc[i][j].table = table[i][j]; + block_type_vlc[i][j].table_allocated = 32; + init_vlc(&block_type_vlc[i][j], BLOCK_TYPE_VLC_BITS, 7, + &block_type_tab[i][j][0][1], 2, 1, + &block_type_tab[i][j][0][0], 2, 1, + INIT_VLC_USE_NEW_STATIC); + } } }

1 0

rv34dsp: factorize a multiplication in the noround inverse transform
by git＠videolan.org 29 Apr '12

29 Apr '12

ffmpeg | branch: master | Christophe GISQUET <christophe.gisquet(a)gmail.com> | Tue Apr 17 18:44:43 2012 +0000| [7fb8b491e5c10b3fbad53ffc89c60d3541114416] | committer: Ronald S. Bultje rv34dsp: factorize a multiplication in the noround inverse transform Signed-off-by: Ronald S. Bultje <rsbultje(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fb8b491e5c10b3fb… --- libavcodec/rv34dsp.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/rv34dsp.c b/libavcodec/rv34dsp.c index 4145c4d..1ddcea4 100644 --- a/libavcodec/rv34dsp.c +++ b/libavcodec/rv34dsp.c @@ -88,15 +88,15 @@ static void rv34_inv_transform_noround_c(DCTELEM *block){ rv34_row_transform(temp, block); for(i = 0; i < 4; i++){ - const int z0 = 13*(temp[4*0+i] + temp[4*2+i]); - const int z1 = 13*(temp[4*0+i] - temp[4*2+i]); - const int z2 = 7* temp[4*1+i] - 17*temp[4*3+i]; - const int z3 = 17* temp[4*1+i] + 7*temp[4*3+i]; - - block[i*4+0] = ((z0 + z3) * 3) >> 11; - block[i*4+1] = ((z1 + z2) * 3) >> 11; - block[i*4+2] = ((z1 - z2) * 3) >> 11; - block[i*4+3] = ((z0 - z3) * 3) >> 11; + const int z0 = 39*(temp[4*0+i] + temp[4*2+i]); + const int z1 = 39*(temp[4*0+i] - temp[4*2+i]); + const int z2 = 21* temp[4*1+i] - 51*temp[4*3+i]; + const int z3 = 51* temp[4*1+i] + 21*temp[4*3+i]; + + block[i*4+0] = (z0 + z3) >> 11; + block[i*4+1] = (z1 + z2) >> 11; + block[i*4+2] = (z1 - z2) >> 11; + block[i*4+3] = (z0 - z3) >> 11; } }

1 0

rv40: perform bitwise checks in loop filter
by git＠videolan.org 29 Apr '12

29 Apr '12

ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Tue Apr 17 18:44:51 2012 +0000| [d834ab0f2a5d5689cdd323e935534fda918319ef] | committer: Ronald S. Bultje rv40: perform bitwise checks in loop filter Down from 95 kcycles to 93 (including all called functions). Signed-off-by: Ronald S. Bultje <rsbultje(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d834ab0f2a5d5689c… --- libavcodec/rv40.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 18dd51e..695b029 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -431,7 +431,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row) y_v_deblock &= ~MASK_Y_LEFT_COL; if(!row) y_h_deblock &= ~MASK_Y_TOP_ROW; - if(row == s->mb_height - 1 || (mb_strong[POS_CUR] || mb_strong[POS_BOTTOM])) + if(row == s->mb_height - 1 || (mb_strong[POS_CUR] | mb_strong[POS_BOTTOM])) y_h_deblock &= ~(MASK_Y_TOP_ROW << 16); /* Calculating chroma patterns is similar and easier since there is * no motion vector pattern for them. @@ -448,7 +448,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row) c_v_deblock[i] &= ~MASK_C_LEFT_COL; if(!row) c_h_deblock[i] &= ~MASK_C_TOP_ROW; - if(row == s->mb_height - 1 || mb_strong[POS_CUR] || mb_strong[POS_BOTTOM]) + if(row == s->mb_height - 1 || (mb_strong[POS_CUR] | mb_strong[POS_BOTTOM])) c_h_deblock[i] &= ~(MASK_C_TOP_ROW << 4); } @@ -469,7 +469,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row) 0, 0, 0); } // filter left block edge in ordinary mode (with low filtering strength) - if(y_v_deblock & (MASK_CUR << ij) && (i || !(mb_strong[POS_CUR] || mb_strong[POS_LEFT]))){ + if(y_v_deblock & (MASK_CUR << ij) && (i || !(mb_strong[POS_CUR] | mb_strong[POS_LEFT]))){ if(!i) clip_left = mvmasks[POS_LEFT] & (MASK_RIGHT << j) ? clip[POS_LEFT] : 0; else @@ -480,14 +480,14 @@ static void rv40_loop_filter(RV34DecContext *r, int row) alpha, beta, betaY, 0, 0, 1); } // filter top edge of the current macroblock when filtering strength is high - if(!j && y_h_deblock & (MASK_CUR << i) && (mb_strong[POS_CUR] || mb_strong[POS_TOP])){ + if(!j && y_h_deblock & (MASK_CUR << i) && (mb_strong[POS_CUR] | mb_strong[POS_TOP])){ rv40_adaptive_loop_filter(&r->rdsp, Y, s->linesize, dither, clip_cur, mvmasks[POS_TOP] & (MASK_TOP << i) ? clip[POS_TOP] : 0, alpha, beta, betaY, 0, 1, 0); } // filter left block edge in edge mode (with high filtering strength) - if(y_v_deblock & (MASK_CUR << ij) && !i && (mb_strong[POS_CUR] || mb_strong[POS_LEFT])){ + if(y_v_deblock & (MASK_CUR << ij) && !i && (mb_strong[POS_CUR] | mb_strong[POS_LEFT])){ clip_left = mvmasks[POS_LEFT] & (MASK_RIGHT << j) ? clip[POS_LEFT] : 0; rv40_adaptive_loop_filter(&r->rdsp, Y, s->linesize, dither, clip_cur, @@ -509,7 +509,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row) clip_cur, alpha, beta, betaC, 1, 0, 0); } - if((c_v_deblock[k] & (MASK_CUR << ij)) && (i || !(mb_strong[POS_CUR] || mb_strong[POS_LEFT]))){ + if((c_v_deblock[k] & (MASK_CUR << ij)) && (i || !(mb_strong[POS_CUR] | mb_strong[POS_LEFT]))){ if(!i) clip_left = uvcbp[POS_LEFT][k] & (MASK_CUR << (2*j+1)) ? clip[POS_LEFT] : 0; else @@ -519,14 +519,14 @@ static void rv40_loop_filter(RV34DecContext *r, int row) clip_left, alpha, beta, betaC, 1, 0, 1); } - if(!j && c_h_deblock[k] & (MASK_CUR << ij) && (mb_strong[POS_CUR] || mb_strong[POS_TOP])){ + if(!j && c_h_deblock[k] & (MASK_CUR << ij) && (mb_strong[POS_CUR] | mb_strong[POS_TOP])){ int clip_top = uvcbp[POS_TOP][k] & (MASK_CUR << (ij+2)) ? clip[POS_TOP] : 0; rv40_adaptive_loop_filter(&r->rdsp, C, s->uvlinesize, i*8, clip_cur, clip_top, alpha, beta, betaC, 1, 1, 0); } - if(c_v_deblock[k] & (MASK_CUR << ij) && !i && (mb_strong[POS_CUR] || mb_strong[POS_LEFT])){ + if(c_v_deblock[k] & (MASK_CUR << ij) && !i && (mb_strong[POS_CUR] | mb_strong[POS_LEFT])){ clip_left = uvcbp[POS_LEFT][k] & (MASK_CUR << (2*j+1)) ? clip[POS_LEFT] : 0; rv40_adaptive_loop_filter(&r->rdsp, C, s->uvlinesize, j*8, clip_cur,

1 0

rv34: remove inline keyword from rv34_decode_block().
by git＠videolan.org 29 Apr '12

29 Apr '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Sat Apr 28 11:10:57 2012 -0700| [774b681b80af4bcb6df58f5cc9c7254111fbc7f5] | committer: Ronald S. Bultje rv34: remove inline keyword from rv34_decode_block(). Force-inlining increases object size by 8kB and causes a 2% slowdown. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=774b681b80af4bcb6… --- libavcodec/rv34.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index a3d3fcd..beecf67 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -282,7 +282,7 @@ static inline void decode_subblock3(DCTELEM *dst, int code, GetBitContext *gb, V * o--o */ -static inline int rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rvlc, int fc, int sc, int q_dc, int q_ac1, int q_ac2) +static int rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rvlc, int fc, int sc, int q_dc, int q_ac1, int q_ac2) { int code, pattern, has_ac = 1;

1 0