October 2013 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/jpeglsdec: check err value for ls_get_code_runterm()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 23:27:28 2013 +0100| [cc0e47b55096361723b364afa43b79a3f5619cdc] | committer: Michael Niedermayer avcodec/jpeglsdec: check err value for ls_get_code_runterm() Fixes infinite loop Fixes Ticket3086 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc0e47b5509636172… --- libavcodec/jpeglsdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 0e344f5..1dda207 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -148,6 +148,8 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, ret = ret >> 1; } + if(FFABS(ret) > 0xFFFF) + return -0x10000; /* update state */ state->A[Q] += FFABS(ret) - RItype; ret *= state->twonear;

1 0

Optimize pure C unscaled yuv2rgb.
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Fri Oct 25 22:46:06 2013 +0200| [4fab08c94f836f24c67f75f3e44e82cdbac5ffb2] | committer: Reimar Döffinger Optimize pure C unscaled yuv2rgb. Aligning the tables reduces the amount of code generated on e.g. ARM as the offset constant then has few enough set bits so it can be encoded inside a single instruction instead of 2. Ideally all should be declared aligned, but the DECLARE_ALIGNED macros does not work with pointer tables, thus also reordered the tables. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fab08c94f836f24c… --- libswscale/swscale_internal.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 33fdfc2..6ad278e 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -362,9 +362,11 @@ typedef struct SwsContext { int dstY; ///< Last destination vertical line output from last slice. int flags; ///< Flags passed by the user to select scaler algorithm, optimizations, subsampling, etc... void *yuvTable; // pointer to the yuv->rgb table start so it can be freed() + // alignment ensures the offset can be added in a single + // instruction on e.g. ARM + DECLARE_ALIGNED(16, int, table_gV)[256 + 2*YUVRGB_TABLE_HEADROOM]; uint8_t *table_rV[256 + 2*YUVRGB_TABLE_HEADROOM]; uint8_t *table_gU[256 + 2*YUVRGB_TABLE_HEADROOM]; - int table_gV[256 + 2*YUVRGB_TABLE_HEADROOM]; uint8_t *table_bU[256 + 2*YUVRGB_TABLE_HEADROOM]; DECLARE_ALIGNED(16, int32_t, input_rgb2yuv_table)[16+40*4]; // This table can contain both C and SIMD formatted values, teh C vales are always at the XY_IDX points #define RY_IDX 0

1 0

avcodec/mpeg12dec: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [18802942d1a28b62b2691d06de7b44ef46b5e177] | committer: Michael Niedermayer avcodec/mpeg12dec: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18802942d1a28b62b… --- libavcodec/mpeg12dec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 6b6c03e..5e320bd 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1639,9 +1639,8 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, } /* extra slice info */ - while (get_bits1(&s->gb) != 0) { - skip_bits(&s->gb, 8); - } + if (skip_1stop_8data_bits(&s->gb) < 0) + return AVERROR_INVALIDDATA; s->mb_x = 0;

1 0

avcodec/vaapi_mpeg2: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [f0315318164037ddb72368d02e434932375be745] | committer: Michael Niedermayer avcodec/vaapi_mpeg2: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0315318164037ddb… --- libavcodec/vaapi_mpeg2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index d626f24..cdc70ee 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -115,8 +115,8 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer intra_slice_flag = get_bits1(&gb); if (intra_slice_flag) { skip_bits(&gb, 8); - while (get_bits1(&gb) != 0) - skip_bits(&gb, 8); + if (skip_1stop_8data_bits(&gb) < 0) + return AVERROR_INVALIDDATA; } macroblock_offset = get_bits_count(&gb);

1 0

avcodec/svq3: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [9c7662aeba9908bf2892ba034686d5c93539b291] | committer: Michael Niedermayer avcodec/svq3: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c7662aeba9908bf2… --- libavcodec/svq3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 1c8e1ec..a717e9d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -838,8 +838,8 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) skip_bits1(&h->gb); skip_bits(&h->gb, 2); - while (get_bits1(&h->gb)) - skip_bits(&h->gb, 8); + if (skip_1stop_8data_bits(&h->gb) < 0) + return AVERROR_INVALIDDATA; /* reset intra predictors and invalidate motion vector references */ if (h->mb_x > 0) { @@ -970,8 +970,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) /* unknown field */ skip_bits1(&gb); - while (get_bits1(&gb)) - skip_bits(&gb, 8); + if (skip_1stop_8data_bits(&gb) < 0) + return AVERROR_INVALIDDATA; s->unknown_flag = get_bits1(&gb); avctx->has_b_frames = !h->low_delay;

1 0

avcodec/svq1dec: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [c882b62d14f6a8a11dece85d7a847b6d4ffc2325] | committer: Michael Niedermayer avcodec/svq1dec: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c882b62d14f6a8a11… --- libavcodec/svq1dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 5193798..6c8bfc4 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -593,8 +593,8 @@ static int svq1_decode_frame_header(AVCodecContext *avctx, AVFrame *frame) skip_bits1(bitbuf); skip_bits(bitbuf, 2); - while (get_bits1(bitbuf)) - skip_bits(bitbuf, 8); + if (skip_1stop_8data_bits(bitbuf) < 0) + return AVERROR_INVALIDDATA; } s->width = width;

1 0

avcodec/ituh263dec: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [f4d3127197478c8146df482e722ceb9a7a337805] | committer: Michael Niedermayer avcodec/ituh263dec: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4d3127197478c814… --- libavcodec/ituh263dec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 5fbf89f..39ad781 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1113,11 +1113,8 @@ int ff_h263_decode_picture_header(MpegEncContext *s) } /* PEI */ - while (get_bits1(&s->gb) != 0) { - skip_bits(&s->gb, 8); - if (get_bits_left(&s->gb) <= 0) - return AVERROR_INVALIDDATA; - } + if (skip_1stop_8data_bits(&s->gb) < 0) + return AVERROR_INVALIDDATA; if(s->h263_slice_structured){ if (get_bits1(&s->gb) != 1) {

1 0

avcodec/intelh263dec: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [ddc6ed91873e281c43ecda4ed7a049d641d78874] | committer: Michael Niedermayer avcodec/intelh263dec: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddc6ed91873e281c4… --- libavcodec/intelh263dec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index a45560c..5da4202 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -111,11 +111,8 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) } /* PEI */ - while (get_bits1(&s->gb) != 0) { - skip_bits(&s->gb, 8); - if (get_bits_left(&s->gb) <= 0) - return AVERROR_INVALIDDATA; - } + if (skip_1stop_8data_bits(&s->gb) < 0) + return AVERROR_INVALIDDATA; s->f_code = 1; s->y_dc_scale_table=

1 0

avcodec/h261dec: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [711e981276d02895605a7099c4f873771d616c77] | committer: Michael Niedermayer avcodec/h261dec: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=711e981276d028956… --- libavcodec/h261dec.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 2995d8c..26b8855 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -125,11 +125,8 @@ static int h261_decode_gob_header(H261Context *h) } /* GEI */ - while (get_bits1(&s->gb) != 0) { - skip_bits(&s->gb, 8); - if (get_bits_left(&s->gb) <= 0) - return AVERROR_INVALIDDATA; - } + if (skip_1stop_8data_bits(&s->gb) < 0) + return AVERROR_INVALIDDATA; if (s->qscale == 0) { av_log(s->avctx, AV_LOG_ERROR, "qscale has forbidden 0 value\n"); @@ -508,11 +505,8 @@ static int h261_decode_picture_header(H261Context *h) skip_bits1(&s->gb); /* Reserved */ /* PEI */ - while (get_bits1(&s->gb) != 0) { - skip_bits(&s->gb, 8); - if (get_bits_left(&s->gb) <= 0) - return AVERROR_INVALIDDATA; - } + if (skip_1stop_8data_bits(&s->gb) < 0) + return AVERROR_INVALIDDATA; /* H.261 has no I-frames, but if we pass AV_PICTURE_TYPE_I for the first * frame, the codec crashes if it does not contain all I-blocks

1 0

avcodec/flvdec: Use skip_1stop_8data_bits()
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [9c284a8e1935e7aecc84fae429404becd683aa35] | committer: Michael Niedermayer avcodec/flvdec: Use skip_1stop_8data_bits() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c284a8e1935e7aec… --- libavcodec/flvdec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index af60dad..f425f00 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -102,11 +102,8 @@ int ff_flv_decode_picture_header(MpegEncContext *s) s->h263_long_vectors = 0; /* PEI */ - while (get_bits1(&s->gb) != 0) { - skip_bits(&s->gb, 8); - if (get_bits_left(&s->gb) <= 0) - return AVERROR_INVALIDDATA; - } + if (skip_1stop_8data_bits(&s->gb) < 0) + return AVERROR_INVALIDDATA; s->f_code = 1; if (s->ehc_mode)

1 0