June 2015 - ffmpeg-cvslog - lists.ffmpeg.org

h263: Always check both dimensions
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Fri Jun 26 15:57:16 2015 +0200| [0a49a62f998747cfa564d98d36a459fe70d3299b] | committer: Vittorio Giovara h263: Always check both dimensions CC: libav-stable(a)libav.org Found-By: ago(a)gentoo.org > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a49a62f998747cfa… --- libavcodec/ituh263dec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index b1da22f..b9189b2 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -30,6 +30,7 @@ #include <limits.h> #include "libavutil/attributes.h" +#include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/mathematics.h" #include "avcodec.h" @@ -868,7 +869,7 @@ end: /* most is hardcoded. should extend to handle all h263 streams */ int ff_h263_decode_picture_header(MpegEncContext *s) { - int format, width, height, i; + int format, width, height, i, ret; uint32_t startcode; align_get_bits(&s->gb); @@ -919,8 +920,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s) /* H.263v1 */ width = ff_h263_format[format][0]; height = ff_h263_format[format][1]; - if (!width) - return -1; s->pict_type = AV_PICTURE_TYPE_I + get_bits1(&s->gb); @@ -1073,6 +1072,9 @@ int ff_h263_decode_picture_header(MpegEncContext *s) s->qscale = get_bits(&s->gb, 5); } + if ((ret = av_image_check_size(s->width, s->height, 0, s)) < 0) + return ret; + s->mb_width = (s->width + 15) / 16; s->mb_height = (s->height + 15) / 16; s->mb_num = s->mb_width * s->mb_height;

1 0

Merge commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 22:01:22 2015 +0200| [5585da7c5e47810b8433f54bea5ff947251b3055] | committer: Michael Niedermayer Merge commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f' * commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f': cosmetic: Reformat ff_h263_decode_mba Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5585da7c5e47810b8… ---

1 0

cosmetic: Reformat ff_h263_decode_mba
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Fri Jun 26 15:57:15 2015 +0200| [6f4cd33efb5a9ec75db1677d5f7846c60337129f] | committer: Vittorio Giovara cosmetic: Reformat ff_h263_decode_mba > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f4cd33efb5a9ec75… --- libavcodec/ituh263dec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 10dd6c2..b1da22f 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -139,12 +139,12 @@ int ff_h263_decode_mba(MpegEncContext *s) { int i, mb_pos; - for(i=0; i<6; i++){ - if(s->mb_num-1 <= ff_mba_max[i]) break; - } - mb_pos= get_bits(&s->gb, ff_mba_length[i]); - s->mb_x= mb_pos % s->mb_width; - s->mb_y= mb_pos / s->mb_width; + for (i = 0; i < 6; i++) + if (s->mb_num - 1 <= ff_mba_max[i]) + break; + mb_pos = get_bits(&s->gb, ff_mba_length[i]); + s->mb_x = mb_pos % s->mb_width; + s->mb_y = mb_pos / s->mb_width; return mb_pos; }

1 0

Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 21:36:16 2015 +0200| [cfcb9f5e3628fc8e768836cd4b9b377c24221cf9] | committer: Michael Niedermayer Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a' * commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a': mov: Preserve the metadata even when bit-exactness is requested Conflicts: libavformat/movenc.c tests/ref/vsynth/vsynth1-mpeg4 tests/ref/vsynth/vsynth2-mpeg4 See: a17ee4117dcb2922f57da33b8401d11b06e81cba Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfcb9f5e3628fc8e7… ---

1 0

mov: Preserve the metadata even when bit-exactness is requested
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Mon Jun 15 20:40:46 2015 +0200| [e95c7a61852cc5b9ce5445ff034b87553e61958a] | committer: Vittorio Giovara mov: Preserve the metadata even when bit-exactness is requested Make sure to not write the custom `encoder` string in that case. Bug-Id: 845 CC: libav-stable(a)libav.org > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e95c7a61852cc5b9c… --- libavformat/movenc.c | 14 +++++++------- tests/ref/vsynth/vsynth1-mpeg4 | 4 ++-- tests/ref/vsynth/vsynth2-mpeg4 | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 761c3e8..d8255c8 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1768,7 +1768,7 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov, int ret, size; uint8_t *buf; - if (!st || mov->fc->flags & AVFMT_FLAG_BITEXACT) + if (!st) return 0; ret = avio_open_dyn_buf(&pb_buf); @@ -2062,8 +2062,10 @@ static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1); mov_write_string_metadata(s, pb, "\251alb", "album" , 1); mov_write_string_metadata(s, pb, "\251day", "date" , 1); - if (!mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1)) - mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1); + if (!mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1)) { + if (!(s->flags & AVFMT_FLAG_BITEXACT)) + mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1); + } mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1); mov_write_string_metadata(s, pb, "\251gen", "genre" , 1); mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1); @@ -2166,9 +2168,6 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov, int ret, size; uint8_t *buf; - if (s->flags & AVFMT_FLAG_BITEXACT) - return 0; - ret = avio_open_dyn_buf(&pb_buf); if (ret < 0) return ret; @@ -2188,7 +2187,8 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov, mov_write_string_metadata(s, pb_buf, "\251aut", "author", 0); mov_write_string_metadata(s, pb_buf, "\251alb", "album", 0); mov_write_string_metadata(s, pb_buf, "\251day", "date", 0); - mov_write_string_metadata(s, pb_buf, "\251swr", "encoder", 0); + if (!(s->flags & AVFMT_FLAG_BITEXACT)) + mov_write_string_metadata(s, pb_buf, "\251swr", "encoder", 0); mov_write_string_metadata(s, pb_buf, "\251des", "comment", 0); mov_write_string_metadata(s, pb_buf, "\251gen", "genre", 0); mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright", 0); diff --git a/tests/ref/vsynth/vsynth1-mpeg4 b/tests/ref/vsynth/vsynth1-mpeg4 index 38a7294..ac1ebc7 100644 --- a/tests/ref/vsynth/vsynth1-mpeg4 +++ b/tests/ref/vsynth/vsynth1-mpeg4 @@ -1,4 +1,4 @@ -dc927acd770e19a97456ecbd4d786938 *tests/data/fate/vsynth1-mpeg4.mp4 -540180 tests/data/fate/vsynth1-mpeg4.mp4 +173f524d5cd2591709bf1d5d2818b420 *tests/data/fate/vsynth1-mpeg4.mp4 +540241 tests/data/fate/vsynth1-mpeg4.mp4 8828a375448dc5c2215163ba70656f89 *tests/data/fate/vsynth1-mpeg4.out.rawvideo stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg4 b/tests/ref/vsynth/vsynth2-mpeg4 index 1aa75a8..bd47f14 100644 --- a/tests/ref/vsynth/vsynth2-mpeg4 +++ b/tests/ref/vsynth/vsynth2-mpeg4 @@ -1,4 +1,4 @@ -f60260ca447624a19ad8307abad7a431 *tests/data/fate/vsynth2-mpeg4.mp4 -159432 tests/data/fate/vsynth2-mpeg4.mp4 +5476cf4dc144eac67b12737fd8966641 *tests/data/fate/vsynth2-mpeg4.mp4 +159493 tests/data/fate/vsynth2-mpeg4.mp4 871fda3853f4766669ad875923920bd5 *tests/data/fate/vsynth2-mpeg4.out.rawvideo stddev: 6.02 PSNR: 32.53 MAXDIFF: 89 bytes: 7603200/ 7603200

1 0

Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 21:19:16 2015 +0200| [4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8] | committer: Michael Niedermayer Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb' * commit '303ec065a90498c29d384b4add2ac626bc38d5eb': aic: Fix slice size computation for widths multiples of 32 macroblocks Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ff0c61ba80016bdd… ---

1 0

aic: Fix slice size computation for widths multiples of 32 macroblocks
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun Jun 28 10:50:42 2015 +0200| [303ec065a90498c29d384b4add2ac626bc38d5eb] | committer: Vittorio Giovara aic: Fix slice size computation for widths multiples of 32 macroblocks CC: libav-stable(a)libav.org > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=303ec065a90498c29… --- libavcodec/aic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aic.c b/libavcodec/aic.c index 4782294..aff740c 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -444,7 +444,7 @@ static av_cold int aic_decode_init(AVCodecContext *avctx) ctx->num_x_slices = (ctx->mb_width + 15) >> 4; ctx->slice_width = 16; for (i = 1; i < 32; i++) { - if (!(ctx->mb_width % i) && (ctx->mb_width / i < 32)) { + if (!(ctx->mb_width % i) && (ctx->mb_width / i <= 32)) { ctx->slice_width = ctx->mb_width / i; ctx->num_x_slices = i; break;

1 0

Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 20:59:36 2015 +0200| [2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016] | committer: Michael Niedermayer Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a' * commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a': h264: Allow stream and container cropping at the same time Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e9dcb82e5d54f54b… ---

1 0

h264: Allow stream and container cropping at the same time
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun Mar 8 04:06:32 2015 +0000| [3e3056f2a020dd77efdf379dbd4c06a65b4a499a] | committer: Vittorio Giovara h264: Allow stream and container cropping at the same time The container cropping is applied only when difference is within 16 pixels, and the smallest value between the two is chosen. Bug-Id: 383 Signed-off-by: Vittorio Giovara <vittorio.giovara(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e3056f2a020dd77e… --- libavcodec/h264_slice.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 16043dc..d287662 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -896,13 +896,10 @@ static int init_dimensions(H264Context *h) { int width = h->width - (h->sps.crop_right + h->sps.crop_left); int height = h->height - (h->sps.crop_top + h->sps.crop_bottom); - int crop_present = h->sps.crop_left || h->sps.crop_top || - h->sps.crop_right || h->sps.crop_bottom; /* handle container cropping */ - if (!crop_present && - FFALIGN(h->avctx->width, 16) == h->width && - FFALIGN(h->avctx->height, 16) == h->height) { + if (FFALIGN(h->avctx->width, 16) == FFALIGN(width, 16) && + FFALIGN(h->avctx->height, 16) == FFALIGN(height, 16)) { width = h->avctx->width; height = h->avctx->height; }

1 0

avfilter/vf_ssim: fix some cosmetics issues
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jun 30 02:20:28 2015 +0000| [185e76976e8291d42f82972d0b7e103ef4b2d8cd] | committer: Paul B Mahol avfilter/vf_ssim: fix some cosmetics issues Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=185e76976e8291d42… --- libavfilter/vf_ssim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 604fb44..57b9074 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -139,7 +139,7 @@ static float ssim_end4(int sum0[5][4], int sum1[5][4], int width) float ssim = 0.0; int i; - for( i = 0; i < width; i++ ) + for (i = 0; i < width; i++) ssim += ssim_end1(sum0[i][0] + sum0[i + 1][0] + sum1[i][0] + sum1[i + 1][0], sum0[i][1] + sum0[i + 1][1] + sum1[i][1] + sum1[i + 1][1], sum0[i][2] + sum0[i + 1][2] + sum1[i][2] + sum1[i + 1][2],

1 0