November 2015 - ffmpeg-cvslog

Merge commit 'fdd5c48ebdec489ec9e84eee547fefa50c3ad53c'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:07:59 2015 +0100| [503153a96782801bf3274e7aef74831801a002c6] | committer: Hendrik Leppkes Merge commit 'fdd5c48ebdec489ec9e84eee547fefa50c3ad53c' * commit 'fdd5c48ebdec489ec9e84eee547fefa50c3ad53c': texturedsp: Explicitly cast RGBA parameters to unsigned Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=503153a96782801bf… ---

1 0

texturedsp: Explicitly cast RGBA parameters to unsigned
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Mon Nov 23 17:02:19 2015 -0500| [fdd5c48ebdec489ec9e84eee547fefa50c3ad53c] | committer: Vittorio Giovara texturedsp: Explicitly cast RGBA parameters to unsigned Silences warnings when using -Wshift-overflow (GCC 6+). Found-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdd5c48ebdec489ec… --- libavcodec/texturedsp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/texturedsp.c b/libavcodec/texturedsp.c index 78eb6fa..58446b1 100644 --- a/libavcodec/texturedsp.c +++ b/libavcodec/texturedsp.c @@ -31,7 +31,10 @@ #include "texturedsp.h" -#define RGBA(r, g, b, a) (r) | ((g) << 8) | ((b) << 16) | ((a) << 24) +#define RGBA(r, g, b, a) ((uint8_t)(r) << 0) | \ + ((uint8_t)(g) << 8) | \ + ((uint8_t)(b) << 16) | \ + ((uint8_t)(a) << 24) static av_always_inline void extract_color(uint32_t colors[4], uint16_t color0,

1 0

Merge commit 'eef38316cab68aff080cf2b83c2427a734194e8d'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:05:50 2015 +0100| [c754591677367ee9a95ce138daa68d36df0b6ce4] | committer: Hendrik Leppkes Merge commit 'eef38316cab68aff080cf2b83c2427a734194e8d' * commit 'eef38316cab68aff080cf2b83c2427a734194e8d': texturedspenc: Avoid using separate variables Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c754591677367ee9a… ---

1 0

texturedspenc: Avoid using separate variables
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Mon Nov 23 17:02:18 2015 -0500| [eef38316cab68aff080cf2b83c2427a734194e8d] | committer: Vittorio Giovara texturedspenc: Avoid using separate variables Use the result directly, removing an unneeded cast. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eef38316cab68aff0… --- libavcodec/texturedspenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c index a351bea..d2d9a34 100644 --- a/libavcodec/texturedspenc.c +++ b/libavcodec/texturedspenc.c @@ -583,14 +583,10 @@ static void rgba2ycocg(uint8_t *dst, const uint8_t *pixel) int b = pixel[2]; int t = (2 + r + b) >> 2; - int y = av_clip_uint8(g + t); - int co = av_clip_uint8(128 + ((r - b + 1) >> 1)); - int cg = av_clip_uint8(128 + g - t); - - dst[0] = (uint8_t) co; - dst[1] = (uint8_t) cg; + dst[0] = av_clip_uint8(128 + ((r - b + 1) >> 1)); /* Co */ + dst[1] = av_clip_uint8(128 + g - t); /* Cg */ dst[2] = 0; - dst[3] = (uint8_t) y; + dst[3] = av_clip_uint8(g + t); /* Y */ } /**

1 0

Merge commit '7831fb90503142e32cc3c9be43bc3f9d342ded6b'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:05:19 2015 +0100| [f01a276b50a52abdcde2c989e01c31a056922e76] | committer: Hendrik Leppkes Merge commit '7831fb90503142e32cc3c9be43bc3f9d342ded6b' * commit '7831fb90503142e32cc3c9be43bc3f9d342ded6b': textureencdsp: cosmetics: Use normal static const for tables Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f01a276b50a52abdc… ---

1 0

textureencdsp: cosmetics: Use normal static const for tables
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Mon Nov 23 17:02:17 2015 -0500| [7831fb90503142e32cc3c9be43bc3f9d342ded6b] | committer: Vittorio Giovara textureencdsp: cosmetics: Use normal static const for tables > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7831fb90503142e32… --- libavcodec/texturedspenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c index 2036998..a351bea 100644 --- a/libavcodec/texturedspenc.c +++ b/libavcodec/texturedspenc.c @@ -32,13 +32,13 @@ #include "texturedsp.h" -const static uint8_t expand5[32] = { +static const uint8_t expand5[32] = { 0, 8, 16, 24, 33, 41, 49, 57, 66, 74, 82, 90, 99, 107, 115, 123, 132, 140, 148, 156, 165, 173, 181, 189, 198, 206, 214, 222, 231, 239, 247, 255, }; -const static uint8_t expand6[64] = { +static const uint8_t expand6[64] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, 130, 134, 138, 142, @@ -47,7 +47,7 @@ const static uint8_t expand6[64] = { 243, 247, 251, 255, }; -const static uint8_t match5[256][2] = { +static const uint8_t match5[256][2] = { { 0, 0 }, { 0, 0 }, { 0, 1 }, { 0, 1 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 1 }, { 1, 1 }, { 2, 0 }, { 2, 0 }, { 0, 4 }, { 2, 1 }, { 2, 1 }, { 2, 1 }, { 3, 0 }, { 3, 0 }, { 3, 0 }, @@ -93,7 +93,7 @@ const static uint8_t match5[256][2] = { { 31, 30 }, { 31, 30 }, { 31, 31 }, { 31, 31 }, }; -const static uint8_t match6[256][2] = { +static const uint8_t match6[256][2] = { { 0, 0 }, { 0, 1 }, { 1, 0 }, { 1, 0 }, { 1, 1 }, { 2, 0 }, { 2, 1 }, { 3, 0 }, { 3, 0 }, { 3, 1 }, { 4, 0 }, { 4, 0 }, { 4, 1 }, { 5, 0 }, { 5, 1 }, { 6, 0 }, { 6, 0 }, { 6, 1 },

1 0

Merge commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:04:46 2015 +0100| [28765693955fcfb843009b834d4e2a4fe0211526] | committer: Hendrik Leppkes Merge commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5' * commit '99cb833fc2d9874c62fffbcd3347fae660de0fe5': sgi: Correctly propagate meaningful error values Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28765693955fcfb84… ---

1 0

sgi: Correctly propagate meaningful error values
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Mon Nov 23 18:56:09 2015 -0500| [99cb833fc2d9874c62fffbcd3347fae660de0fe5] | committer: Vittorio Giovara sgi: Correctly propagate meaningful error values > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99cb833fc2d9874c6… --- libavcodec/sgidec.c | 11 ++++++----- libavcodec/sgienc.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index c827ff5..6f93a30 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -229,13 +229,13 @@ static int decode_frame(AVCodecContext *avctx, if (s->bytes_per_channel != 1 && s->bytes_per_channel != 2) { av_log(avctx, AV_LOG_ERROR, "wrong channel number\n"); - return -1; + return AVERROR(EINVAL); } /* Check for supported image dimensions. */ if (dimension != 2 && dimension != 3) { av_log(avctx, AV_LOG_ERROR, "wrong dimension number\n"); - return -1; + return AVERROR(EINVAL); } if (s->depth == SGI_GRAYSCALE) { @@ -246,16 +246,17 @@ static int decode_frame(AVCodecContext *avctx, avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGBA64BE : AV_PIX_FMT_RGBA; } else { av_log(avctx, AV_LOG_ERROR, "wrong picture format\n"); - return -1; + return AVERROR(EINVAL); } ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) return ret; - if (ff_get_buffer(avctx, p, 0) < 0) { + ret = ff_get_buffer(avctx, p, 0); + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n"); - return -1; + return ret; } p->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index c5e66cd..2da4f51 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -193,7 +193,7 @@ FF_ENABLE_DEPRECATION_WARNINGS /* Make an intermediate consecutive buffer. */ if (!(encode_buf = av_malloc(width * bytes_per_channel))) - return -1; + return AVERROR(ENOMEM); for (z = 0; z < depth; z++) { in_buf = p->data[0] + p->linesize[0] * (height - 1) + z * bytes_per_channel; @@ -208,7 +208,7 @@ FF_ENABLE_DEPRECATION_WARNINGS bytes_per_channel); if (length < 1) { av_free(encode_buf); - return -1; + return AVERROR_INVALIDDATA; } bytestream2_put_be32(&tablen_pcb, length);

1 0

Merge commit '823fa7004571cb8404ca5785f9fa6e85f0f9f3d3'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:00:54 2015 +0100| [5c0dbc20fceb04ffd129983ba6717230137efec5] | committer: Hendrik Leppkes Merge commit '823fa7004571cb8404ca5785f9fa6e85f0f9f3d3' * commit '823fa7004571cb8404ca5785f9fa6e85f0f9f3d3': fate: Rework sgi tests into a suite and add the missing ones Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c0dbc20fceb04ffd… ---

1 0

fate: Rework sgi tests into a suite and add the missing ones
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Fri Nov 20 02:17:35 2015 +0100| [823fa7004571cb8404ca5785f9fa6e85f0f9f3d3] | committer: Vittorio Giovara fate: Rework sgi tests into a suite and add the missing ones Signed-off-by: Vittorio Giovara <vittorio.giovara(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=823fa7004571cb840… --- tests/fate/image.mak | 33 +++++++------------------------- tests/ref/fate/sgi-gray16 | 2 +- tests/ref/fate/sgi-gray16-rle | 2 ++ tests/ref/fate/{sgi-gray => sgi-gray8} | 0 tests/ref/fate/sgi-gray8-rle | 2 ++ tests/ref/fate/sgi-rgba-rle | 2 ++ tests/ref/fate/sgi-rgba64-rle | 2 +- 7 files changed, 15 insertions(+), 28 deletions(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index b7cc30e..f7b05ae 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -94,35 +94,16 @@ fate-png: $(FATE_PNG-yes) FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -FATE_SGI += fate-sgi-gray -fate-sgi-gray: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_gray.sgi -pix_fmt gray - -FATE_SGI += fate-sgi-gray16 -fate-sgi-gray16: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_gray16.sgi -pix_fmt gray16le - -FATE_SGI += fate-sgi-rgb24 -fate-sgi-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgb24.sgi -pix_fmt rgb24 - -FATE_SGI += fate-sgi-rgb24-rle -fate-sgi-rgb24-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb24_rle.sgi -pix_fmt rgb24 - -FATE_SGI += fate-sgi-rgb48 -fate-sgi-rgb48: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgb48.sgi -pix_fmt rgb48be - -FATE_SGI += fate-sgi-rgb48-rle -fate-sgi-rgb48-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb48_rle.sgi -pix_fmt rgb48be - -FATE_SGI += fate-sgi-rgba -fate-sgi-rgba: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgba.sgi -pix_fmt rgba - -FATE_SGI += fate-sgi-rgba64 -fate-sgi-rgba64: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgba64.sgi -pix_fmt rgba64be +define FATE_IMGSUITE_SGI +FATE_SGI += fate-sgi-$(1) fate-sgi-$(1)-rle +fate-sgi-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1).sgi -sws_flags +accurate_rnd+bitexact +fate-sgi-$(1)-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1)_rle.sgi -sws_flags +accurate_rnd+bitexact +endef -FATE_SGI += fate-sgi-rgba64-rle -fate-sgi-rgba64-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/maya_rgba64_rle.sgi -pix_fmt rgba64be +SGI_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 +$(foreach CLSP,$(SGI_COLORSPACES),$(eval $(call FATE_IMGSUITE_SGI,$(CLSP)))) FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI) - FATE_SAMPLES_AVCONV += $(FATE_SGI-yes) fate-sgi: $(FATE_SGI-yes) diff --git a/tests/ref/fate/sgi-gray16 b/tests/ref/fate/sgi-gray16 index 3218edc..0908746 100644 --- a/tests/ref/fate/sgi-gray16 +++ b/tests/ref/fate/sgi-gray16 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 262144, 0xecdaf084 +0, 0, 0, 1, 262144, 0x6c27f084 diff --git a/tests/ref/fate/sgi-gray16-rle b/tests/ref/fate/sgi-gray16-rle new file mode 100644 index 0000000..09903d5 --- /dev/null +++ b/tests/ref/fate/sgi-gray16-rle @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 262144, 0x65ef57ff diff --git a/tests/ref/fate/sgi-gray b/tests/ref/fate/sgi-gray8 similarity index 100% rename from tests/ref/fate/sgi-gray rename to tests/ref/fate/sgi-gray8 diff --git a/tests/ref/fate/sgi-gray8-rle b/tests/ref/fate/sgi-gray8-rle new file mode 100644 index 0000000..b0e0606 --- /dev/null +++ b/tests/ref/fate/sgi-gray8-rle @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 131072, 0xb0702a94 diff --git a/tests/ref/fate/sgi-rgba-rle b/tests/ref/fate/sgi-rgba-rle new file mode 100644 index 0000000..058f5f9 --- /dev/null +++ b/tests/ref/fate/sgi-rgba-rle @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 524288, 0x4ee5adbb diff --git a/tests/ref/fate/sgi-rgba64-rle b/tests/ref/fate/sgi-rgba64-rle index 1dfac76..cdf5fd0 100644 --- a/tests/ref/fate/sgi-rgba64-rle +++ b/tests/ref/fate/sgi-rgba64-rle @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 614400, 0xb92d409d +0, 0, 0, 1, 1048576, 0xb619d0f1

1 0