August 2013 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] lavf/matroska: Adding support for Opus CodecDelay
by Vignesh Venkatasubramanian 09 Sep '13

09 Sep '13

In order to represent the codec delay accurately in Matroska, a new element CodecDelay has been introduced. It contains the overall delay added by the codec in nanoseconds. This patch adds support for muxing CodecDelay value in the container. Matroska spec for CodecDelay element can be found here: http://matroska.org/technical/specs/index.html#CodecDelay Signed-off-by: Vignesh Venkatasubramanian <vigneshv(a)google.com> --- libavformat/matroska.h | 1 + libavformat/matroskaenc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 7cf423c..2c72d3e 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -91,6 +91,7 @@ #define MATROSKA_ID_CODECINFOURL 0x3B4040 #define MATROSKA_ID_CODECDOWNLOADURL 0x26B240 #define MATROSKA_ID_CODECDECODEALL 0xAA +#define MATROSKA_ID_CODECDELAY 0x56AA #define MATROSKA_ID_SEEKPREROLL 0x56BB #define MATROSKA_ID_TRACKNAME 0x536E #define MATROSKA_ID_TRACKLANGUAGE 0x22B59C diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 92df6cb..cbfef04 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -649,6 +649,7 @@ static int mkv_write_tracks(AVFormatContext *s) if (codec->codec_id == AV_CODEC_ID_OPUS) { put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL); + put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, codec->delay); } if (mkv->mode == MODE_WEBM && !(codec->codec_id == AV_CODEC_ID_VP8 || -- 1.8.3

2 4

[PATCH] libavcodec: Do not return encoding errors when -sub_charenc_mode is do_nothing
by Eelco Lempsink 09 Sep '13

09 Sep '13

Signed-off-by: Eelco Lempsink <eml(a)tupil.com> --- libavcodec/utils.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d77b5ec..2b1e92d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2294,11 +2294,16 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, for (i = 0; i < sub->num_rects; i++) { if (sub->rects[i]->ass && !utf8_check(sub->rects[i]->ass)) { - av_log(avctx, AV_LOG_ERROR, - "Invalid UTF-8 in decoded subtitles text; " - "maybe missing -sub_charenc option\n"); - avsubtitle_free(sub); - return AVERROR_INVALIDDATA; + if (avctx->sub_charenc_mode != FF_SUB_CHARENC_MODE_DO_NOTHING) { + av_log(avctx, AV_LOG_ERROR, + "Invalid UTF-8 in decoded subtitles text; " + "maybe missing -sub_charenc option\n"); + avsubtitle_free(sub); + return AVERROR_INVALIDDATA; + } else { + av_log(avctx, AV_LOG_WARNING, + "Invalid UTF-8 in decoded subtitles text.\n"); + } } } -- 1.7.12.4 (Apple Git-37)

7 34

[PATCH] lavu: Add RIPEMD hashing
by James Almer 09 Sep '13

09 Sep '13

Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320 Signed-off-by: James Almer <jamrial(a)gmail.com> --- doc/APIchanges | 7 + libavutil/Makefile | 3 + libavutil/ripemd.c | 437 +++++++++++++++++++++++++++++++++++++++++++++++ libavutil/ripemd.h | 75 ++++++++ libavutil/version.h | 2 +- tests/fate/libavutil.mak | 4 + tests/ref/fate/ripemd | 28 +++ 7 files changed, 555 insertions(+), 1 deletion(-) create mode 100644 libavutil/ripemd.c create mode 100644 libavutil/ripemd.h create mode 100644 tests/ref/fate/ripemd diff --git a/doc/APIchanges b/doc/APIchanges index 1ab17c2..ffdb8a2 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -16,6 +16,13 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-06-xx - xxxxxxx - lavu 52.36.100 + Add AVRIPEMD: + av_ripemd_alloc() + av_ripemd_init() + av_ripemd_update() + av_ripemd_final() + 2013-06-05 - fc962d4 - lavu 52.13.0 - mem.h Add av_realloc_array and av_reallocp_array diff --git a/libavutil/Makefile b/libavutil/Makefile index f1ff9c6..21746f0 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -43,6 +43,7 @@ HEADERS = adler32.h \ pixfmt.h \ random_seed.h \ rational.h \ + ripemd.h \ samplefmt.h \ sha.h \ sha512.h \ @@ -102,6 +103,7 @@ OBJS = adler32.o \ random_seed.o \ rational.o \ rc4.o \ + ripemd.o \ samplefmt.o \ sha.o \ sha512.o \ @@ -148,6 +150,7 @@ TESTPROGS = adler32 \ parseutils \ random_seed \ rational \ + ripemd \ sha \ sha512 \ tree \ diff --git a/libavutil/ripemd.c b/libavutil/ripemd.c new file mode 100644 index 0000000..f73073c --- /dev/null +++ b/libavutil/ripemd.c @@ -0,0 +1,437 @@ +/* + * Copyright (C) 2007 Michael Niedermayer <michaelni(a)gmx.at> + * Copyright (C) 2013 James Almer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <string.h> + +#include "attributes.h" +#include "avutil.h" +#include "bswap.h" +#include "intreadwrite.h" +#include "ripemd.h" +#include "mem.h" + +/** hash context */ +typedef struct AVRIPEMD { + uint8_t digest_len; ///< digest length in 32-bit words + uint64_t count; ///< number of bytes in buffer + uint8_t buffer[64]; ///< 512-bit buffer of input values used in hash updating + uint32_t state[10]; ///< current hash value + uint8_t ext; ///< extension (0 for 128 and 160, 1 for 256 and 320) + /** function used to update hash for 512-bit input block */ + void (*transform)(uint32_t *state, const uint8_t buffer[64], int ext); +} AVRIPEMD; + +const int av_ripemd_size = sizeof(AVRIPEMD); + +struct AVRIPEMD *av_ripemd_alloc(void) +{ + return av_mallocz(sizeof(struct AVRIPEMD)); +} + +static const uint32_t KA[4] = { + 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xa953fd4e +}; + +static const uint32_t KB[4] = { + 0x50a28be6, 0x5c4dd124, 0x6d703ef3, 0x7a6d76e9 +}; + +static const int ROTA[80] = { + 11, 14, 15, 12, 5, 8, 7 , 9, 11, 13, 14, 15, 6, 7, 9, 8, + 7 , 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12, + 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5, + 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12, + 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 +}; + +static const int ROTB[80] = { + 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6, + 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, + 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5, + 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, + 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 +}; + +static const int WA[80] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8, + 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12, + 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2, + 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13 +}; + +static const int WB[80] = { + 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12, + 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2, + 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13, + 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14, + 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11 +}; + +static uint32_t rol(uint32_t value, uint32_t bits) { + return (value << bits) | (value >> (32 - bits)); +} + +#define SWAP(a,b) if (ext) { int t = a; a = b; b = t; } + +#define ROUND128_0_TO_15(a,b,c,d,e,f,g,h) \ + a = rol(a + (( b ^ c ^ d) + block[WA[n]]), ROTA[n]); \ + e = rol(e + ((((f ^ g) & h) ^ g) + block[WB[n]] + KB[0]), ROTB[n]); \ + n++ + +#define ROUND128_16_TO_31(a,b,c,d,e,f,g,h) \ + a = rol(a + ((((c ^ d) & b) ^ d) + block[WA[n]] + KA[0]), ROTA[n]); \ + e = rol(e + (((~g | f) ^ h) + block[WB[n]] + KB[1]), ROTB[n]); \ + n++ + +#define ROUND128_32_TO_47(a,b,c,d,e,f,g,h) \ + a = rol(a + (((~c | b) ^ d) + block[WA[n]] + KA[1]), ROTA[n]); \ + e = rol(e + ((((g ^ h) & f) ^ h) + block[WB[n]] + KB[2]), ROTB[n]); \ + n++ + +#define ROUND128_48_TO_63(a,b,c,d,e,f,g,h) \ + a = rol(a + ((((b ^ c) & d) ^ c) + block[WA[n]] + KA[2]), ROTA[n]); \ + e = rol(e + (( f ^ g ^ h) + block[WB[n]]), ROTB[n]); \ + n++ + +static void ripemd128_transform(uint32_t *state, const uint8_t buffer[64], int ext) +{ + uint32_t a, b, c, d, e, f, g, h; + uint32_t block[16]; + int n; + + if (ext) { + a = state[0]; b = state[1]; c = state[2]; d = state[3]; + e = state[4]; f = state[5]; g = state[6]; h = state[7]; + } else { + a = e = state[0]; + b = f = state[1]; + c = g = state[2]; + d = h = state[3]; + } + + for (n = 0; n < 16; n++) + block[n] = AV_RL32(buffer + 4 * n); + + for (n = 0; n < 16;) { + ROUND128_0_TO_15(a,b,c,d,e,f,g,h); + ROUND128_0_TO_15(d,a,b,c,h,e,f,g); + ROUND128_0_TO_15(c,d,a,b,g,h,e,f); + ROUND128_0_TO_15(b,c,d,a,f,g,h,e); + } + SWAP(a,e) + + for (; n < 32;) { + ROUND128_16_TO_31(a,b,c,d,e,f,g,h); + ROUND128_16_TO_31(d,a,b,c,h,e,f,g); + ROUND128_16_TO_31(c,d,a,b,g,h,e,f); + ROUND128_16_TO_31(b,c,d,a,f,g,h,e); + } + SWAP(b,f) + + for (; n < 48;) { + ROUND128_32_TO_47(a,b,c,d,e,f,g,h); + ROUND128_32_TO_47(d,a,b,c,h,e,f,g); + ROUND128_32_TO_47(c,d,a,b,g,h,e,f); + ROUND128_32_TO_47(b,c,d,a,f,g,h,e); + } + SWAP(c,g) + + for (; n < 64;) { + ROUND128_48_TO_63(a,b,c,d,e,f,g,h); + ROUND128_48_TO_63(d,a,b,c,h,e,f,g); + ROUND128_48_TO_63(c,d,a,b,g,h,e,f); + ROUND128_48_TO_63(b,c,d,a,f,g,h,e); + } + SWAP(d,h) + + if (ext) { + state[0] += a; state[1] += b; state[2] += c; state[3] += d; + state[4] += e; state[5] += f; state[6] += g; state[7] += h; + } else { + h += c + state[1]; + state[1] = state[2] + d + e; + state[2] = state[3] + a + f; + state[3] = state[0] + b + g; + state[0] = h; + } +} + +#define ROTATE(x,y) \ + x = rol(x, 10); \ + y = rol(y, 10); \ + n++ + +#define ROUND160_0_TO_15(a,b,c,d,e,f,g,h,i,j) \ + a = rol(a + (( b ^ c ^ d) + block[WA[n]]), ROTA[n]) + e; \ + f = rol(f + (((~i | h) ^ g) + block[WB[n]] + KB[0]), ROTB[n]) + j; \ + ROTATE(c,h) + +#define ROUND160_16_TO_31(a,b,c,d,e,f,g,h,i,j) \ + a = rol(a + ((((c ^ d) & b) ^ d) + block[WA[n]] + KA[0]), ROTA[n]) + e; \ + f = rol(f + ((((g ^ h) & i) ^ h) + block[WB[n]] + KB[1]), ROTB[n]) + j; \ + ROTATE(c,h) + +#define ROUND160_32_TO_47(a,b,c,d,e,f,g,h,i,j) \ + a = rol(a + (((~c | b) ^ d) + block[WA[n]] + KA[1]), ROTA[n]) + e; \ + f = rol(f + (((~h | g) ^ i) + block[WB[n]] + KB[2]), ROTB[n]) + j; \ + ROTATE(c,h) + +#define ROUND160_48_TO_63(a,b,c,d,e,f,g,h,i,j) \ + a = rol(a + ((((b ^ c) & d) ^ c) + block[WA[n]] + KA[2]), ROTA[n]) + e; \ + f = rol(f + ((((h ^ i) & g) ^ i) + block[WB[n]] + KB[3]), ROTB[n]) + j; \ + ROTATE(c,h) + +#define ROUND160_64_TO_79(a,b,c,d,e,f,g,h,i,j) \ + a = rol(a + (((~d | c) ^ b) + block[WA[n]] + KA[3]), ROTA[n]) + e; \ + f = rol(f + (( g ^ h ^ i) + block[WB[n]]), ROTB[n]) + j; \ + ROTATE(c,h) + +static void ripemd160_transform(uint32_t *state, const uint8_t buffer[64], int ext) +{ + uint32_t a, b, c, d, e, f, g, h, i, j; + uint32_t block[16]; + int n; + + if (ext) { + a = state[0]; b = state[1]; c = state[2]; d = state[3]; e = state[4]; + f = state[5]; g = state[6]; h = state[7]; i = state[8]; j = state[9]; + } else { + a = f = state[0]; + b = g = state[1]; + c = h = state[2]; + d = i = state[3]; + e = j = state[4]; + } + + for (n = 0; n < 16; n++) + block[n] = AV_RL32(buffer + 4 * n); + + for (n = 0; n < 16 - 4;) { + ROUND160_0_TO_15(a,b,c,d,e,f,g,h,i,j); + ROUND160_0_TO_15(e,a,b,c,d,j,f,g,h,i); + ROUND160_0_TO_15(d,e,a,b,c,i,j,f,g,h); + ROUND160_0_TO_15(c,d,e,a,b,h,i,j,f,g); + ROUND160_0_TO_15(b,c,d,e,a,g,h,i,j,f); + } + ROUND160_0_TO_15(a,b,c,d,e,f,g,h,i,j); + SWAP(a,f) + + for (; n < 32 - 4;) { + ROUND160_16_TO_31(e,a,b,c,d,j,f,g,h,i); + ROUND160_16_TO_31(d,e,a,b,c,i,j,f,g,h); + ROUND160_16_TO_31(c,d,e,a,b,h,i,j,f,g); + ROUND160_16_TO_31(b,c,d,e,a,g,h,i,j,f); + ROUND160_16_TO_31(a,b,c,d,e,f,g,h,i,j); + } + ROUND160_16_TO_31(e,a,b,c,d,j,f,g,h,i); + SWAP(b,g) + + for (; n < 48 - 4;) { + ROUND160_32_TO_47(d,e,a,b,c,i,j,f,g,h); + ROUND160_32_TO_47(c,d,e,a,b,h,i,j,f,g); + ROUND160_32_TO_47(b,c,d,e,a,g,h,i,j,f); + ROUND160_32_TO_47(a,b,c,d,e,f,g,h,i,j); + ROUND160_32_TO_47(e,a,b,c,d,j,f,g,h,i); + } + ROUND160_32_TO_47(d,e,a,b,c,i,j,f,g,h); + SWAP(c,h) + + for (; n < 64 - 4;) { + ROUND160_48_TO_63(c,d,e,a,b,h,i,j,f,g); + ROUND160_48_TO_63(b,c,d,e,a,g,h,i,j,f); + ROUND160_48_TO_63(a,b,c,d,e,f,g,h,i,j); + ROUND160_48_TO_63(e,a,b,c,d,j,f,g,h,i); + ROUND160_48_TO_63(d,e,a,b,c,i,j,f,g,h); + } + ROUND160_48_TO_63(c,d,e,a,b,h,i,j,f,g); + SWAP(d,i) + + for (; n < 80 - 4;) { + ROUND160_64_TO_79(b,c,d,e,a,g,h,i,j,f); + ROUND160_64_TO_79(a,b,c,d,e,f,g,h,i,j); + ROUND160_64_TO_79(e,a,b,c,d,j,f,g,h,i); + ROUND160_64_TO_79(d,e,a,b,c,i,j,f,g,h); + ROUND160_64_TO_79(c,d,e,a,b,h,i,j,f,g); + } + ROUND160_64_TO_79(b,c,d,e,a,g,h,i,j,f); + SWAP(e,j) + + if (ext) { + state[0] += a; state[1] += b; state[2] += c; state[3] += d; state[4] += e; + state[5] += f; state[6] += g; state[7] += h; state[8] += i; state[9] += j; + } else { + i += c + state[1]; + state[1] = state[2] + d + j; + state[2] = state[3] + e + f; + state[3] = state[4] + a + g; + state[4] = state[0] + b + h; + state[0] = i; + } +} + +av_cold int av_ripemd_init(AVRIPEMD *ctx, int bits) +{ + ctx->digest_len = bits >> 5; + switch (bits) { + case 128: // RIPEMD-128 + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; + ctx->transform = ripemd128_transform; + ctx->ext = 0; + break; + case 160: // RIPEMD-160 + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; + ctx->state[4] = 0xC3D2E1F0; + ctx->transform = ripemd160_transform; + ctx->ext = 0; + break; + case 256: // RIPEMD-256 + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; + ctx->state[4] = 0x76543210; + ctx->state[5] = 0xFEDCBA98; + ctx->state[6] = 0x89ABCDEF; + ctx->state[7] = 0x01234567; + ctx->transform = ripemd128_transform; + ctx->ext = 1; + break; + case 320: // RIPEMD-320 + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; + ctx->state[4] = 0xC3D2E1F0; + ctx->state[5] = 0x76543210; + ctx->state[6] = 0xFEDCBA98; + ctx->state[7] = 0x89ABCDEF; + ctx->state[8] = 0x01234567; + ctx->state[9] = 0x3C2D1E0F; + ctx->transform = ripemd160_transform; + ctx->ext = 1; + break; + default: + return -1; + } + ctx->count = 0; + return 0; +} + +void av_ripemd_update(AVRIPEMD* ctx, const uint8_t* data, unsigned int len) +{ + unsigned int i, j; + + j = ctx->count & 63; + ctx->count += len; +#if CONFIG_SMALL + for (i = 0; i < len; i++) { + ctx->buffer[j++] = data[i]; + if (64 == j) { + ctx->transform(ctx->state, ctx->buffer, ctx->ext); + j = 0; + } + } +#else + if ((j + len) > 63) { + memcpy(&ctx->buffer[j], data, (i = 64 - j)); + ctx->transform(ctx->state, ctx->buffer, ctx->ext); + for (; i + 63 < len; i += 64) + ctx->transform(ctx->state, &data[i], ctx->ext); + j = 0; + } else + i = 0; + memcpy(&ctx->buffer[j], &data[i], len - i); +#endif +} + +void av_ripemd_final(AVRIPEMD* ctx, uint8_t *digest) +{ + int i; + uint64_t finalcount = av_le2ne64(ctx->count << 3); + + av_ripemd_update(ctx, "\200", 1); + while ((ctx->count & 63) != 56) + av_ripemd_update(ctx, "", 1); + av_ripemd_update(ctx, (uint8_t *)&finalcount, 8); /* Should cause a transform() */ + for (i = 0; i < ctx->digest_len; i++) + AV_WL32(digest + i*4, ctx->state[i]); +} + +#ifdef TEST +#include <stdio.h> + +int main(void) +{ + int i, j, k; + AVRIPEMD ctx; + unsigned char digest[40]; + const int lengths[4] = { 128, 160, 256, 320 }; + + for (j = 0; j < 4; j++) { + printf("Testing RIPEMD-%d\n", lengths[j]); + for (k = 0; k < 3; k++) { + av_ripemd_init(&ctx, lengths[j]); + if (k == 0) + av_ripemd_update(&ctx, "abc", 3); + else if (k == 1) + av_ripemd_update(&ctx, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56); + else + for (i = 0; i < 1000*1000; i++) + av_ripemd_update(&ctx, "a", 1); + av_ripemd_final(&ctx, digest); + for (i = 0; i < lengths[j] >> 3; i++) + printf("%02X", digest[i]); + putchar('\n'); + } + switch (j) { //test vectors (from ISO:IEC 10118-3 (2004) and http://homes.esat.kuleuven.be/~bosselae/ripemd160.html) + case 0: + printf("c14a1219 9c66e4ba 84636b0f 69144c77\n" + "a1aa0689 d0fafa2d dc22e88b 49133a06\n" + "4a7f5723 f954eba1 216c9d8f 6320431f\n"); + break; + case 1: + printf("8eb208f7 e05d987a 9b044a8e 98c6b087 f15a0bfc\n" + "12a05338 4a9c0c88 e405a06c 27dcf49a da62eb2b\n" + "52783243 c1697bdb e16d37f9 7f68f083 25dc1528\n"); + break; + case 2: + printf("afbd6e22 8b9d8cbb cef5ca2d 03e6dba1 0ac0bc7d cbe4680e 1e42d2e9 75459b65\n" + "38430455 83aac6c8 c8d91285 73e7a980 9afb2a0f 34ccc36e a9e72f16 f6368e3f\n" + "ac953744 e10e3151 4c150d4d 8d7b6773 42e33399 788296e4 3ae4850c e4f97978\n"); + break; + case 3: + printf("de4c01b3 054f8930 a79d09ae 738e9230 1e5a1708 5beffdc1 b8d11671 3e74f82f a942d64c dbc4682d\n" + "d034a795 0cf72202 1ba4b84d f769a5de 2060e259 df4c9bb4 a4268c0e 935bbc74 70a969c9 d072a1ac\n" + "bdee37f4 371e2064 6b8b0d86 2dda1629 2ae36f40 965e8c85 09e63d1d bddecc50 3e2b63eb 9245bb66\n"); + break; + } + } + + return 0; +} +#endif diff --git a/libavutil/ripemd.h b/libavutil/ripemd.h new file mode 100644 index 0000000..7b0c8bc --- /dev/null +++ b/libavutil/ripemd.h @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2007 Michael Niedermayer <michaelni(a)gmx.at> + * Copyright (C) 2013 James Almer <jamrial(a)gmail.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_RIPEMD_H +#define AVUTIL_RIPEMD_H + +#include <stdint.h> + +#include "attributes.h" +#include "version.h" + +/** + * @defgroup lavu_ripemd RIPEMD + * @ingroup lavu_crypto + * @{ + */ + +extern const int av_ripemd_size; + +struct AVRIPEMD; + +/** + * Allocate an AVRIPEMD context. + */ +struct AVRIPEMD *av_ripemd_alloc(void); + +/** + * Initialize RIPEMD hashing. + * + * @param context pointer to the function context (of size av_ripemd_size) + * @param bits number of bits in digest (128, 160, 256 or 320 bits) + * @return zero if initialization succeeded, -1 otherwise + */ +int av_ripemd_init(struct AVRIPEMD* context, int bits); + +/** + * Update hash value. + * + * @param context hash function context + * @param data input data to update hash with + * @param len input data length + */ +void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, unsigned int len); + +/** + * Finish hashing and output digest value. + * + * @param context hash function context + * @param digest buffer where output digest value is stored + */ +void av_ripemd_final(struct AVRIPEMD* context, uint8_t *digest); + +/** + * @} + */ + +#endif /* AVUTIL_RIPEMD_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 9941229..ff98c69 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 35 +#define LIBAVUTIL_VERSION_MINOR 36 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 1bc1968..f29123c 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -66,6 +66,10 @@ FATE_LIBAVUTIL += fate-random_seed fate-random_seed: libavutil/random_seed-test$(EXESUF) fate-random_seed: CMD = run libavutil/random_seed-test +FATE_LIBAVUTIL += fate-ripemd +fate-ripemd: libavutil/ripemd-test$(EXESUF) +fate-ripemd: CMD = run libavutil/ripemd-test + FATE_LIBAVUTIL += fate-sha fate-sha: libavutil/sha-test$(EXESUF) fate-sha: CMD = run libavutil/sha-test diff --git a/tests/ref/fate/ripemd b/tests/ref/fate/ripemd new file mode 100644 index 0000000..947412d --- /dev/null +++ b/tests/ref/fate/ripemd @@ -0,0 +1,28 @@ +Testing RIPEMD-128 +C14A12199C66E4BA84636B0F69144C77 +A1AA0689D0FAFA2DDC22E88B49133A06 +4A7F5723F954EBA1216C9D8F6320431F +c14a1219 9c66e4ba 84636b0f 69144c77 +a1aa0689 d0fafa2d dc22e88b 49133a06 +4a7f5723 f954eba1 216c9d8f 6320431f +Testing RIPEMD-160 +8EB208F7E05D987A9B044A8E98C6B087F15A0BFC +12A053384A9C0C88E405A06C27DCF49ADA62EB2B +52783243C1697BDBE16D37F97F68F08325DC1528 +8eb208f7 e05d987a 9b044a8e 98c6b087 f15a0bfc +12a05338 4a9c0c88 e405a06c 27dcf49a da62eb2b +52783243 c1697bdb e16d37f9 7f68f083 25dc1528 +Testing RIPEMD-256 +AFBD6E228B9D8CBBCEF5CA2D03E6DBA10AC0BC7DCBE4680E1E42D2E975459B65 +3843045583AAC6C8C8D9128573E7A9809AFB2A0F34CCC36EA9E72F16F6368E3F +AC953744E10E31514C150D4D8D7B677342E33399788296E43AE4850CE4F97978 +afbd6e22 8b9d8cbb cef5ca2d 03e6dba1 0ac0bc7d cbe4680e 1e42d2e9 75459b65 +38430455 83aac6c8 c8d91285 73e7a980 9afb2a0f 34ccc36e a9e72f16 f6368e3f +ac953744 e10e3151 4c150d4d 8d7b6773 42e33399 788296e4 3ae4850c e4f97978 +Testing RIPEMD-320 +DE4C01B3054F8930A79D09AE738E92301E5A17085BEFFDC1B8D116713E74F82FA942D64CDBC4682D +D034A7950CF722021BA4B84DF769A5DE2060E259DF4C9BB4A4268C0E935BBC7470A969C9D072A1AC +BDEE37F4371E20646B8B0D862DDA16292AE36F40965E8C8509E63D1DBDDECC503E2B63EB9245BB66 +de4c01b3 054f8930 a79d09ae 738e9230 1e5a1708 5beffdc1 b8d11671 3e74f82f a942d64c dbc4682d +d034a795 0cf72202 1ba4b84d f769a5de 2060e259 df4c9bb4 a4268c0e 935bbc74 70a969c9 d072a1ac +bdee37f4 371e2064 6b8b0d86 2dda1629 2ae36f40 965e8c85 09e63d1d bddecc50 3e2b63eb 9245bb66 -- 1.8.1.5

2 4

[PATCH] avcodec/jpeg2000dec: make SOC finding code more robust
by Michael Niedermayer 04 Sep '13

04 Sep '13

Fixes file from Ticket860 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/jpeg2000dec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index c6f6f6c..d59fb5f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1623,6 +1623,9 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, bytestream2_seek(&s->g, 0, SEEK_SET); } + while(bytestream2_get_bytes_left(&s->g) >= 3 && bytestream2_peek_be16(&s->g) != JPEG2000_SOC) + bytestream2_skip(&s->g, 1); + if (bytestream2_get_be16u(&s->g) != JPEG2000_SOC) { av_log(avctx, AV_LOG_ERROR, "SOC marker not present\n"); ret = AVERROR_INVALIDDATA; -- 1.7.9.5

2 2

[PATCH] lavc/avfft: init context to 0.
by Nicolas George 04 Sep '13

04 Sep '13

Prevent an invalid free in case of init failure. Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavcodec/avfft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index 26b3d4b..2200f37 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -27,7 +27,7 @@ FFTContext *av_fft_init(int nbits, int inverse) { - FFTContext *s = av_malloc(sizeof(*s)); + FFTContext *s = av_mallocz(sizeof(*s)); if (s && ff_fft_init(s, nbits, inverse)) av_freep(&s); -- 1.7.10.4

2 2

[PATCH] TLS OPENSSL SSL_get_error
by Mirko Puliafito 04 Sep '13

04 Sep '13

do_tls_poll with openssl only covers SSL_ERROR_WANT_READ and SSL_ERROR_WANT_WRITE errors returning EIO other cases. I'm figuring out some errors like SSL_ERROR_SSL can be recovered returning EAGAIN. What do you think?

6 24

[PATCH] lavfi/drawtext: replace "draw" option with generic timeline interface.
by Clément Bœsch 03 Sep '13

03 Sep '13

--- Changelog | 1 + doc/filters.texi | 12 +----------- libavfilter/version.h | 2 +- libavfilter/vf_drawtext.c | 17 +++-------------- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/Changelog b/Changelog index 4a6c60c..4337ba2 100644 --- a/Changelog +++ b/Changelog @@ -15,6 +15,7 @@ version <next> data read from an input file - incomplete Voxware MetaSound decoder - read EXIF metadata from JPEG +- drawtext filter now uses the generic timeline interface version 2.0: diff --git a/doc/filters.texi b/doc/filters.texi index 0dc9288..8042275 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3239,16 +3239,6 @@ Either a string (e.g. "yellow") or in 0xRRGGBB[AA] format (e.g. "0xff00ff"), possibly followed by an alpha specifier. The default value of @var{boxcolor} is "white". -@item draw -Set an expression which specifies if the text should be drawn. If the -expression evaluates to 0, the text is not drawn. This is useful for -specifying that the text should be drawn only when specific conditions -are met. - -Default value is "1". - -See below for the list of accepted constants and functions. - @item expansion Select how the @var{text} is expanded. Can be either @code{none}, @code{strftime} (deprecated) or @@ -3548,7 +3538,7 @@ drawtext="fontsize=60:fontfile=FreeSerif.ttf:fontcolor=green:text=g:x=(w-max_gly @item Show text for 1 second every 3 seconds: @example -drawtext="fontfile=FreeSerif.ttf:fontcolor=white:x=100:y=x/dar:draw=lt(mod(t\,3)\,1):text='blink'" +drawtext="fontfile=FreeSerif.ttf:fontcolor=white:x=100:y=x/dar:enable=lt(mod(t\,3)\,1):text='blink'" @end example @item diff --git a/libavfilter/version.h b/libavfilter/version.h index 190ea2f..4d501b0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 82 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 69124a9..5eeb502 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -155,9 +155,6 @@ typedef struct { AVExpr *x_pexpr, *y_pexpr; ///< parsed expressions for x and y int64_t basetime; ///< base pts time in the real world for display double var_values[VAR_VARS_NB]; - char *draw_expr; ///< expression for draw - AVExpr *draw_pexpr; ///< parsed expression for draw - int draw; ///< set to zero to prevent drawing AVLFG prng; ///< random char *tc_opt_string; ///< specified timecode option string AVRational tc_rate; ///< frame rate for timecode @@ -186,7 +183,6 @@ static const AVOption drawtext_options[]= { {"shadowy", "set y", OFFSET(shadowy), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX , FLAGS}, {"tabsize", "set tab size", OFFSET(tabsize), AV_OPT_TYPE_INT, {.i64=4}, 0, INT_MAX , FLAGS}, {"basetime", "set base time", OFFSET(basetime), AV_OPT_TYPE_INT64, {.i64=AV_NOPTS_VALUE}, INT64_MIN, INT64_MAX , FLAGS}, - {"draw", "if false do not draw", OFFSET(draw_expr), AV_OPT_TYPE_STRING, {.str="1"}, CHAR_MIN, CHAR_MAX, FLAGS}, {"expansion", "set the expansion mode", OFFSET(exp_mode), AV_OPT_TYPE_INT, {.i64=EXP_NORMAL}, 0, 2, FLAGS, "expansion"}, {"none", "set no expansion", OFFSET(exp_mode), AV_OPT_TYPE_CONST, {.i64=EXP_NONE}, 0, 0, FLAGS, "expansion"}, @@ -518,8 +514,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_expr_free(s->x_pexpr); av_expr_free(s->y_pexpr); - av_expr_free(s->draw_pexpr); - s->x_pexpr = s->y_pexpr = s->draw_pexpr = NULL; av_freep(&s->positions); s->nb_positions = 0; @@ -564,13 +558,11 @@ static int config_input(AVFilterLink *inlink) av_expr_free(s->x_pexpr); av_expr_free(s->y_pexpr); - av_expr_free(s->draw_pexpr); - s->x_pexpr = s->y_pexpr = s->draw_pexpr = NULL; + s->x_pexpr = s->y_pexpr = NULL; + if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names, NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 || (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names, - NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 || - (ret = av_expr_parse(&s->draw_pexpr, s->draw_expr, var_names, NULL, NULL, fun2_names, fun2, 0, ctx)) < 0) return AVERROR(EINVAL); @@ -955,10 +947,6 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, s->x = s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, &s->prng); s->y = s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, &s->prng); s->x = s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, &s->prng); - s->draw = av_expr_eval(s->draw_pexpr, s->var_values, &s->prng); - - if(!s->draw) - return 0; box_w = FFMIN(width - 1 , max_text_line_w); box_h = FFMIN(height - 1, y + s->max_glyph_h); @@ -1042,4 +1030,5 @@ AVFilter avfilter_vf_drawtext = { .inputs = avfilter_vf_drawtext_inputs, .outputs = avfilter_vf_drawtext_outputs, .process_command = command, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; -- 1.8.3.4

3 8

[PATCH 1/4] mpl2dec: handle files with CRLF linebreaks correctly
by wm4 03 Sep '13

03 Sep '13

Skip the "\r" as normal text. Otherwise it will be the first character of the string passed to sscanf(), which then fill fail to match the timestamps. The change in mpl2_read_header() will handle "\r" like srtdec.c does. --- libavformat/mpl2dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c index b152cc8..844a38b 100644 --- a/libavformat/mpl2dec.c +++ b/libavformat/mpl2dec.c @@ -43,7 +43,7 @@ static int mpl2_probe(AVProbeData *p) if (sscanf(ptr, "[%"SCNd64"][%"SCNd64"]%c", &start, &end, &c) != 3 && sscanf(ptr, "[%"SCNd64"][]%c", &start, &c) != 2) return 0; - ptr += strcspn(ptr, "\r\n") + 1; + ptr += strcspn(ptr, "\n") + 1; if (ptr >= ptr_end) return 0; } @@ -94,7 +94,7 @@ static int mpl2_read_header(AVFormatContext *s) if (!len) break; - line[strcspn(line, "\r\n")] = 0; + line[strcspn(line, "\n")] = 0; if (!read_ts(&p, &pts_start, &duration)) { AVPacket *sub; -- 1.8.4.rc1

2 4

Relicense vf_hue from GPL >=2 to LGPL >= 2.1
by Paul B Mahol 03 Sep '13

03 Sep '13

Hi, I'm asking are you allowing (me) to relicense mentioned filter to LGPL >= 2.1. I already got permission from Michael Niedermayer. Thanks.

4 3

[PATCH] doxygen: clarify purpose of AVIOInterruptCB
by Lukasz Marek 02 Sep '13

02 Sep '13

Signed-off-by: Lukasz Marek <lukasz.m.luki(a)gmail.com> --- libavformat/avio.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavformat/avio.h b/libavformat/avio.h index 5bdbc62..0a3078b 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -47,6 +47,10 @@ * No members can be added to this struct without a major bump, if * new elements have been added after this struct in AVFormatContext * or AVIOContext. + * + * @note This functionality is not intended to be used by protocols + * nor any other in-between layers of ffmpeg. This is designed + * to be used by high-level clients like ff* tools. */ typedef struct AVIOInterruptCB { int (*callback)(void*); -- 1.7.2.5

3 2