February 2015 - ffmpeg-cvslog

Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 19:03:35 2015 +0100| [a8eb02da80dfc04fdc75e50db63e45075821c134] | committer: Michael Niedermayer Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4 * commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc': h264: only ref cur_pic in update_thread_context if it is initialized Conflicts: libavcodec/h264_slice.c See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03 Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8eb02da80dfc04fd… ---

1 0

Merge commit '2686dab45eec54f99866413153aa0b36381e48be' into release/2.4
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 19:05:14 2015 +0100| [1172107d570baa6f01d5c11584090a8cbe552e14] | committer: Michael Niedermayer Merge commit '2686dab45eec54f99866413153aa0b36381e48be' into release/2.4 * commit '2686dab45eec54f99866413153aa0b36381e48be': h264: initialize H264Context.avctx in init_thread_copy Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1172107d570baa6f0… ---

1 0

Merge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 19:04:29 2015 +0100| [a22079b8193b3ce3119b4440a4972098cd141e4e] | committer: Michael Niedermayer Merge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4 * commit '06d433366c02ab81a1aaad33d32934b4180d354b': h264: Do not share rbsp_buffer across threads Conflicts: libavcodec/h264.c See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a22079b8193b3ce31… ---

1 0

hevc_deblock: Fix compilation with nasm
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sun Feb 22 17:46:49 2015 +0000| [2d1309c3528f89bfafe1298badf39fe7a1be0542] | committer: Vittorio Giovara hevc_deblock: Fix compilation with nasm CC: libav-stable(a)libav.org Bug-Id: 795 Signed-off-by: Vittorio Giovara <vittorio.giovara(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d1309c3528f89bfa… --- libavcodec/x86/hevc_deblock.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm index 45b8703..1e895f0 100644 --- a/libavcodec/x86/hevc_deblock.asm +++ b/libavcodec/x86/hevc_deblock.asm @@ -356,7 +356,7 @@ ALIGN 16 %if %1 > 8 shl betaq, %1 - 8 %endif - movd m13, betaq + movd m13, betad SPLATW m13, m13, 0 ;end beta calculations @@ -620,7 +620,7 @@ ALIGN 16 paddw m15, m2; p1' ;beta calculations - movd m10, betaq + movd m10, betad SPLATW m10, m10, 0 movd m13, r7d; 1dp0 + 1dp3

1 0

h264: initialize H264Context.avctx in init_thread_copy
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Anton Khirnov <anton(a)khirnov.net> | Thu Feb 12 13:06:49 2015 +0100| [2686dab45eec54f99866413153aa0b36381e48be] | committer: Anton Khirnov h264: initialize H264Context.avctx in init_thread_copy This prevents using a wrong (first thread's) AVCodecContext if decoding a frame in the first pass over all threads fails. (cherry picked from commit a06b0b1295c51d100101e0ca0434e199ad6de6b5) Signed-off-by: Anton Khirnov <anton(a)khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2686dab45eec54f99… --- libavcodec/h264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6dca22b..e9236e9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -686,6 +686,7 @@ static int decode_init_thread_copy(AVCodecContext *avctx) memset(h->sps_buffers, 0, sizeof(h->sps_buffers)); memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); + h->avctx = avctx; h->rbsp_buffer[0] = NULL; h->rbsp_buffer[1] = NULL; h->rbsp_buffer_size[0] = 0;

1 0

h264: Do not share rbsp_buffer across threads
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sun Aug 25 03:01:19 2013 +0200| [06d433366c02ab81a1aaad33d32934b4180d354b] | committer: Anton Khirnov h264: Do not share rbsp_buffer across threads Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> CC: libav-stable(a)libav.org (cherry picked from commit 61928b68dc28e080b8c8191afe5541123c682bbd) Signed-off-by: Anton Khirnov <anton(a)khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06d433366c02ab81a… --- libavcodec/h264.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 208aa92..6dca22b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -686,6 +686,10 @@ static int decode_init_thread_copy(AVCodecContext *avctx) memset(h->sps_buffers, 0, sizeof(h->sps_buffers)); memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); + h->rbsp_buffer[0] = NULL; + h->rbsp_buffer[1] = NULL; + h->rbsp_buffer_size[0] = 0; + h->rbsp_buffer_size[1] = 0; h->context_initialized = 0; return 0;

1 0

h264: only ref cur_pic in update_thread_context if it is initialized
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: release/2.4 | Anton Khirnov <anton(a)khirnov.net> | Thu Feb 12 12:26:58 2015 +0100| [1dbfaa34e615606cb3f1a3ecabb117e354459edc] | committer: Anton Khirnov h264: only ref cur_pic in update_thread_context if it is initialized It may be empty if the previous thread's decode call did not contain a valid frame. (cherry picked from commit 0dea4c77ccf5956561bb8991311b3d834bb5fa40) Signed-off-by: Anton Khirnov <anton(a)khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dbfaa34e615606cb… --- libavcodec/h264_slice.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1ee7a3d..e47a448 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -589,8 +589,11 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->cur_pic_ptr = REBASE_PICTURE(h1->cur_pic_ptr, h, h1); ff_h264_unref_picture(h, &h->cur_pic); - if ((ret = ff_h264_ref_picture(h, &h->cur_pic, &h1->cur_pic)) < 0) - return ret; + if (h1->cur_pic.f.buf[0]) { + ret = ff_h264_ref_picture(h, &h->cur_pic, &h1->cur_pic); + if (ret < 0) + return ret; + } h->workaround_bugs = h1->workaround_bugs; h->low_delay = h1->low_delay;

1 0

avcodec/ppc/fdctdsp: fix const warning
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Feb 27 23:07:22 2015 +0100| [5f1ea0bfc53ac221abf312aeb79cb693f3a6e07d] | committer: Michael Niedermayer avcodec/ppc/fdctdsp: fix const warning Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f1ea0bfc53ac221a… --- libavcodec/ppc/fdctdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ppc/fdctdsp.c b/libavcodec/ppc/fdctdsp.c index f2efc5d..40f4c6c 100644 --- a/libavcodec/ppc/fdctdsp.c +++ b/libavcodec/ppc/fdctdsp.c @@ -196,7 +196,7 @@ static const vector float fdctconsts[3] = { void ff_fdct_altivec(int16_t *block) { vector signed short *bp; - vector float *cp = fdctconsts; + const vector float *cp = fdctconsts; vector float b00, b10, b20, b30, b40, b50, b60, b70; vector float b01, b11, b21, b31, b41, b51, b61, b71; vector float mzero, cnst, cnsts0, cnsts1, cnsts2;

1 0

avcodec/vc1_block: Optimize vc1_decode_i_block_adv()
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | zhaoxiu.zeng <zhaoxiu.zeng(a)gmail.com> | Wed Feb 25 00:28:45 2015 +0800| [94f5ac93d783a8becff5488c8837c2debc2c4b18] | committer: Michael Niedermayer avcodec/vc1_block: Optimize vc1_decode_i_block_adv() 9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1) 13855 -> 10976 decicycles (fate-suite/vc1/SA20021.vc1) tests done by the author over this function but with the whole patchset applied not just this commit Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94f5ac93d783a8bec… --- libavcodec/vc1_block.c | 124 +++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 71 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 50c9887..f5daa67 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -729,39 +729,42 @@ static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n, *dc_val = dcdiff; /* Store the quantized DC coeff, used for prediction */ - if (n < 4) { - block[0] = dcdiff * s->y_dc_scale; - } else { - block[0] = dcdiff * s->c_dc_scale; - } - - //AC Decoding - i = 1; + if (n < 4) + scale = s->y_dc_scale; + else + scale = s->c_dc_scale; + block[0] = dcdiff * scale; /* check if AC is needed at all */ if (!a_avail && !c_avail) use_pred = 0; - ac_val = s->ac_val[0][0] + s->block_index[n] * 16; - ac_val2 = ac_val; scale = mquant * 2 + ((mquant == v->pq) ? v->halfpq : 0); + ac_val = s->ac_val[0][0] + s->block_index[n] * 16; + ac_val2 = ac_val; if (dc_pred_dir) // left ac_val -= 16; else // top ac_val -= 16 * s->block_wrap[n]; q1 = s->current_picture.qscale_table[mb_pos]; - if ( dc_pred_dir && c_avail && mb_pos) - q2 = s->current_picture.qscale_table[mb_pos - 1]; - if (!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) - q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; - if ( dc_pred_dir && n == 1) - q2 = q1; - if (!dc_pred_dir && n == 2) - q2 = q1; if (n == 3) q2 = q1; + else if (dc_pred_dir) { + if (n == 1) + q2 = q1; + else if (c_avail && mb_pos) + q2 = s->current_picture.qscale_table[mb_pos - 1]; + } else { + if (n == 2) + q2 = q1; + else if (a_avail && mb_pos >= s->mb_stride) + q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; + } + + //AC Decoding + i = 1; if (coded) { int last = 0, skip, value; @@ -794,28 +797,24 @@ static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n, /* apply AC prediction if needed */ if (use_pred) { + int sh; + if (dc_pred_dir) { // left + sh = v->left_blk_sh; + } else { // top + sh = v->top_blk_sh; + ac_val += 8; + } /* scale predictors if needed*/ if (q2 && q1 != q2) { q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; - q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; - if (q1 < 1) return AVERROR_INVALIDDATA; - if (dc_pred_dir) { // left - for (k = 1; k < 8; k++) - block[k << v->left_blk_sh] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; - } else { // top - for (k = 1; k < 8; k++) - block[k << v->top_blk_sh] += (ac_val[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; - } + q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; + for (k = 1; k < 8; k++) + block[k << sh] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; } else { - if (dc_pred_dir) { //left - for (k = 1; k < 8; k++) - block[k << v->left_blk_sh] += ac_val[k]; - } else { //top - for (k = 1; k < 8; k++) - block[k << v->top_blk_sh] += ac_val[k + 8]; - } + for (k = 1; k < 8; k++) + block[k << sh] += ac_val[k]; } } /* save AC coeffs for further prediction */ @@ -832,55 +831,38 @@ static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n, block[k] += (block[k] < 0) ? -mquant : mquant; } - if (use_pred) i = 63; } else { // no AC coeffs int k; memset(ac_val2, 0, 16 * 2); - if (dc_pred_dir) { // left - if (use_pred) { - memcpy(ac_val2, ac_val, 8 * 2); - if (q2 && q1 != q2) { - q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; - q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; - if (q1 < 1) - return AVERROR_INVALIDDATA; - for (k = 1; k < 8; k++) - ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; - } - } - } else { // top - if (use_pred) { - memcpy(ac_val2 + 8, ac_val + 8, 8 * 2); - if (q2 && q1 != q2) { - q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; - q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; - if (q1 < 1) - return AVERROR_INVALIDDATA; - for (k = 1; k < 8; k++) - ac_val2[k + 8] = (ac_val2[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; - } - } - } /* apply AC prediction if needed */ if (use_pred) { + int sh; if (dc_pred_dir) { // left - for (k = 1; k < 8; k++) { - block[k << v->left_blk_sh] = ac_val2[k] * scale; - if (!v->pquantizer && block[k << v->left_blk_sh]) - block[k << v->left_blk_sh] += (block[k << v->left_blk_sh] < 0) ? -mquant : mquant; - } + sh = v->left_blk_sh; } else { // top - for (k = 1; k < 8; k++) { - block[k << v->top_blk_sh] = ac_val2[k + 8] * scale; - if (!v->pquantizer && block[k << v->top_blk_sh]) - block[k << v->top_blk_sh] += (block[k << v->top_blk_sh] < 0) ? -mquant : mquant; - } + sh = v->top_blk_sh; + ac_val += 8; + ac_val2 += 8; + } + memcpy(ac_val2, ac_val, 8 * 2); + if (q2 && q1 != q2) { + q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1; + q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1; + if (q1 < 1) + return AVERROR_INVALIDDATA; + for (k = 1; k < 8; k++) + ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18; + } + for (k = 1; k < 8; k++) { + block[k << sh] = ac_val2[k] * scale; + if (!v->pquantizer && block[k << sh]) + block[k << sh] += (block[k << sh] < 0) ? -mquant : mquant; } - i = 63; } } + if (use_pred) i = 63; s->block_last_index[n] = i; return 0;

1 0

avcodec/vc1_block: Optimize vc1_decode_i_block()
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | zhaoxiu.zeng <zhaoxiu.zeng(a)gmail.com> | Wed Feb 25 00:28:45 2015 +0800| [21581182ca388090bebd032788fac958edd92b1e] | committer: Michael Niedermayer avcodec/vc1_block: Optimize vc1_decode_i_block() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21581182ca388090b… --- libavcodec/vc1_block.c | 95 +++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 57 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 4adcc82..50c9887 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -555,7 +555,7 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, int i; int16_t *dc_val; int16_t *ac_val, *ac_val2; - int dcdiff; + int dcdiff, scale; /* Get DC differential */ if (n < 4) { @@ -584,27 +584,29 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, *dc_val = dcdiff; /* Store the quantized DC coeff, used for prediction */ - if (n < 4) { - block[0] = dcdiff * s->y_dc_scale; - } else { - block[0] = dcdiff * s->c_dc_scale; - } - /* Skip ? */ - if (!coded) { - goto not_coded; - } + if (n < 4) + scale = s->y_dc_scale; + else + scale = s->c_dc_scale; + block[0] = dcdiff * scale; - // AC Decoding - i = 1; + ac_val = s->ac_val[0][0] + s->block_index[n] * 16; + ac_val2 = ac_val; + if (dc_pred_dir) // left + ac_val -= 16; + else // top + ac_val -= 16 * s->block_wrap[n]; - { + scale = v->pq * 2 + v->halfpq; + + //AC Decoding + i = !!coded; + + if (coded) { int last = 0, skip, value; const uint8_t *zz_table; - int scale; int k; - scale = v->pq * 2 + v->halfpq; - if (v->s.ac_pred) { if (!dc_pred_dir) zz_table = v->zz_8x8[2]; @@ -613,13 +615,6 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, } else zz_table = v->zz_8x8[1]; - ac_val = s->ac_val[0][0] + s->block_index[n] * 16; - ac_val2 = ac_val; - if (dc_pred_dir) // left - ac_val -= 16; - else // top - ac_val -= 16 * s->block_wrap[n]; - while (!last) { vc1_decode_ac_coeff(v, &last, &skip, &value, codingset); i += skip; @@ -630,13 +625,15 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, /* apply AC prediction if needed */ if (s->ac_pred) { + int sh; if (dc_pred_dir) { // left - for (k = 1; k < 8; k++) - block[k << v->left_blk_sh] += ac_val[k]; + sh = v->left_blk_sh; } else { // top - for (k = 1; k < 8; k++) - block[k << v->top_blk_sh] += ac_val[k + 8]; + sh = v->top_blk_sh; + ac_val += 8; } + for (k = 1; k < 8; k++) + block[k << sh] += ac_val[k]; } /* save AC coeffs for further prediction */ for (k = 1; k < 8; k++) { @@ -652,46 +649,30 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, block[k] += (block[k] < 0) ? -v->pq : v->pq; } - if (s->ac_pred) i = 63; - } - -not_coded: - if (!coded) { - int k, scale; - ac_val = s->ac_val[0][0] + s->block_index[n] * 16; - ac_val2 = ac_val; + } else { + int k; - i = 0; - scale = v->pq * 2 + v->halfpq; memset(ac_val2, 0, 16 * 2); - if (dc_pred_dir) { // left - ac_val -= 16; - if (s->ac_pred) - memcpy(ac_val2, ac_val, 8 * 2); - } else { // top - ac_val -= 16 * s->block_wrap[n]; - if (s->ac_pred) - memcpy(ac_val2 + 8, ac_val + 8, 8 * 2); - } /* apply AC prediction if needed */ if (s->ac_pred) { + int sh; if (dc_pred_dir) { //left - for (k = 1; k < 8; k++) { - block[k << v->left_blk_sh] = ac_val[k] * scale; - if (!v->pquantizer && block[k << v->left_blk_sh]) - block[k << v->left_blk_sh] += (block[k << v->left_blk_sh] < 0) ? -v->pq : v->pq; - } + sh = v->left_blk_sh; } else { // top - for (k = 1; k < 8; k++) { - block[k << v->top_blk_sh] = ac_val[k + 8] * scale; - if (!v->pquantizer && block[k << v->top_blk_sh]) - block[k << v->top_blk_sh] += (block[k << v->top_blk_sh] < 0) ? -v->pq : v->pq; - } + sh = v->top_blk_sh; + ac_val += 8; + ac_val2 += 8; + } + memcpy(ac_val2, ac_val, 8 * 2); + for (k = 1; k < 8; k++) { + block[k << sh] = ac_val[k] * scale; + if (!v->pquantizer && block[k << sh]) + block[k << sh] += (block[k << sh] < 0) ? -v->pq : v->pq; } - i = 63; } } + if (s->ac_pred) i = 63; s->block_last_index[n] = i; return 0;

1 0