May 2018 - ffmpeg-cvslog - lists.ffmpeg.org

doc/ffmpeg: remove non-existent vdt option
by Gyan Doshi 31 May '18

31 May '18

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Fri Jun 1 01:41:12 2018 +0530| [04b570817b2b38e35675b17328239746212f4c3f] | committer: Gyan Doshi doc/ffmpeg: remove non-existent vdt option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04b570817b2b38e35… --- doc/ffmpeg.texi | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index dc0bc00b10..d9dd256ad7 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -632,8 +632,6 @@ as the input (or graph output) and automatic conversions are disabled. @item -sws_flags @var{flags} (@emph{input/output}) Set SwScaler flags. -@item -vdt @var{n} -Discard threshold. @item -rc_override[:@var{stream_specifier}] @var{override} (@emph{output,per-stream}) Rate control override for specific intervals, formatted as "int,int,int"

1 0

avfilter: use av_clip_uintp2_c where clip is variable
by John Cox 31 May '18

31 May '18

ffmpeg | branch: master | John Cox <jc(a)kynesim.co.uk> | Thu May 31 16:22:59 2018 +0200| [8d4fc2ea06a7c69efa35b032e3fb2ad853ea3daf] | committer: Paul B Mahol avfilter: use av_clip_uintp2_c where clip is variable Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d4fc2ea06a7c69ef… --- libavfilter/vf_amplify.c | 2 +- libavfilter/vf_colorbalance.c | 18 +++++++++--------- libavfilter/vf_fftdnoiz.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c index d1e105ef17..f16267fdcd 100644 --- a/libavfilter/vf_amplify.c +++ b/libavfilter/vf_amplify.c @@ -186,7 +186,7 @@ static int amplify_frame(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs } else { amp = FFMIN(FFABS(diff * factor), hlimit); } - dst[x] = av_clip_uintp2(src + amp, depth); + dst[x] = av_clip_uintp2_c(src + amp, depth); } else { dst[x] = src; } diff --git a/libavfilter/vf_colorbalance.c b/libavfilter/vf_colorbalance.c index dd8189f548..fd003fdc21 100644 --- a/libavfilter/vf_colorbalance.c +++ b/libavfilter/vf_colorbalance.c @@ -297,17 +297,17 @@ static int config_output(AVFilterLink *outlink) for (i = 0; i < max; i++) { r = g = b = i; - r = av_clip_uintp2(r + s->cyan_red.shadows * shadows[r], depth); - r = av_clip_uintp2(r + s->cyan_red.midtones * midtones[r], depth); - r = av_clip_uintp2(r + s->cyan_red.highlights * highlights[r], depth); + r = av_clip_uintp2_c(r + s->cyan_red.shadows * shadows[r], depth); + r = av_clip_uintp2_c(r + s->cyan_red.midtones * midtones[r], depth); + r = av_clip_uintp2_c(r + s->cyan_red.highlights * highlights[r], depth); - g = av_clip_uintp2(g + s->magenta_green.shadows * shadows[g], depth); - g = av_clip_uintp2(g + s->magenta_green.midtones * midtones[g], depth); - g = av_clip_uintp2(g + s->magenta_green.highlights * highlights[g], depth); + g = av_clip_uintp2_c(g + s->magenta_green.shadows * shadows[g], depth); + g = av_clip_uintp2_c(g + s->magenta_green.midtones * midtones[g], depth); + g = av_clip_uintp2_c(g + s->magenta_green.highlights * highlights[g], depth); - b = av_clip_uintp2(b + s->yellow_blue.shadows * shadows[b], depth); - b = av_clip_uintp2(b + s->yellow_blue.midtones * midtones[b], depth); - b = av_clip_uintp2(b + s->yellow_blue.highlights * highlights[b], depth); + b = av_clip_uintp2_c(b + s->yellow_blue.shadows * shadows[b], depth); + b = av_clip_uintp2_c(b + s->yellow_blue.midtones * midtones[b], depth); + b = av_clip_uintp2_c(b + s->yellow_blue.highlights * highlights[b], depth); s->lut[R][i] = r; s->lut[G][i] = g; diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index 05a564e406..7ee7dbc19b 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -176,7 +176,7 @@ static void export_row16(FFTComplex *src, uint8_t *dstp, int rw, float scale, in int j; for (j = 0; j < rw; j++) - dst[j] = av_clip_uintp2(src[j].re * scale, depth); + dst[j] = av_clip_uintp2_c(src[j].re * scale, depth); } static int config_input(AVFilterLink *inlink)

1 0

avformat/mxfdec: add some missing picture_essence_container_uls
by Marton Balint 30 May '18

30 May '18

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sun May 20 18:32:11 2018 +0200| [1616b1be5a120bfaa0f05982071c74ee9574f65b] | committer: Marton Balint avformat/mxfdec: add some missing picture_essence_container_uls Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1616b1be5a120bfaa… --- libavformat/mxfdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 78a2aa7289..bd46572e48 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1231,7 +1231,10 @@ static const MXFCodecUL mxf_picture_essence_container_uls[] = { // video essence container uls { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x10,0x60,0x01 }, 14, AV_CODEC_ID_H264 }, /* H.264 frame wrapped */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, 14, AV_CODEC_ID_DNXHD }, /* VC-3 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x12,0x01,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC-1 frame wrapped */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x14,0x01,0x00 }, 14, AV_CODEC_ID_TIFF }, /* TIFF */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x15,0x01,0x00 }, 14, AV_CODEC_ID_DIRAC }, /* VC-2 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MPEG-ES frame wrapped */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x01,0x04,0x01 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* Type D-10 mapping of 40Mbps 525/60-I */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, 14, AV_CODEC_ID_DVVIDEO }, /* DV 625 25mbps */

1 0

avformat/mxfdec: use int math for sample count calculation
by Marton Balint 30 May '18

30 May '18

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sat May 26 10:51:16 2018 +0200| [e7498792b65683aa723ca1877f30e20e640e3467] | committer: Marton Balint avformat/mxfdec: use int math for sample count calculation This also changes the rounding to nearest. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7498792b65683aa7… --- libavformat/mxfdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 40c9e0c3a9..78a2aa7289 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3167,8 +3167,7 @@ static int mxf_compute_sample_count(MXFContext *mxf, int stream_index, if (!spf) { int remainder = (sample_rate.num * time_base.num) % (time_base.den * sample_rate.den); - *sample_count = av_q2d(av_mul_q((AVRational){mxf->current_edit_unit, 1}, - av_mul_q(sample_rate, time_base))); + *sample_count = av_rescale_q(mxf->current_edit_unit, sample_rate, track->edit_rate); if (remainder) av_log(mxf->fc, AV_LOG_WARNING, "seeking detected on stream #%d with time base (%d/%d) and "

1 0

avformat/mxfdec: fix klv_decode_ber_length return value usage
by Marton Balint 30 May '18

30 May '18

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sun May 27 20:39:09 2018 +0200| [f932e49aab09ffb150aab45746ac7ee669b22b14] | committer: Marton Balint avformat/mxfdec: fix klv_decode_ber_length return value usage Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f932e49aab09ffb15… --- libavformat/mxfdec.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 7a42555562..40c9e0c3a9 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -372,6 +372,8 @@ static int64_t klv_decode_ber_length(AVIOContext *pb) while (bytes_num--) size = size << 8 | avio_r8(pb); } + if (size > INT64_MAX) + return AVERROR_INVALIDDATA; return size; } @@ -390,13 +392,17 @@ static int mxf_read_sync(AVIOContext *pb, const uint8_t *key, unsigned size) static int klv_read_packet(KLVPacket *klv, AVIOContext *pb) { + int64_t length; if (!mxf_read_sync(pb, mxf_klv_key, 4)) return AVERROR_INVALIDDATA; klv->offset = avio_tell(pb) - 4; memcpy(klv->key, mxf_klv_key, 4); avio_read(pb, klv->key + 4, 12); - klv->length = klv_decode_ber_length(pb); - return klv->length == -1 ? -1 : 0; + length = klv_decode_ber_length(pb); + if (length < 0) + return length; + klv->length = length; + return 0; } static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv, int body_sid) @@ -486,7 +492,10 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv av_aes_init(mxf->aesc, s->key, 128, 1); } // crypto context - avio_skip(pb, klv_decode_ber_length(pb)); + size = klv_decode_ber_length(pb); + if (size < 0) + return size; + avio_skip(pb, size); // plaintext offset klv_decode_ber_length(pb); plaintext_size = avio_rb64(pb);

1 0

tools/crypto_bench: add missing RC4 implementation from tomcrypt
by James Almer 30 May '18

30 May '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed May 30 14:34:57 2018 -0300| [e3734aa6a33be64c88e10a11fd9d51d23cf6ee6f] | committer: James Almer tools/crypto_bench: add missing RC4 implementation from tomcrypt Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3734aa6a33be64c8… --- tools/crypto_bench.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index ecbe45f36a..aca8bbb1a8 100644 --- a/tools/crypto_bench.c +++ b/tools/crypto_bench.c @@ -528,6 +528,16 @@ static void run_tomcrypt_des(uint8_t *output, des_ecb_encrypt(input + i, output + i, &des); } +static void run_tomcrypt_rc4(uint8_t *output, + const uint8_t *input, unsigned size) +{ + rc4_state rc4; + + rc4_stream_setup(&rc4, hardcoded_key, 16); + rc4_stream_crypt(&rc4, input, size, output); + rc4_stream_done(&rc4); +} + static void run_tomcrypt_twofish(uint8_t *output, const uint8_t *input, unsigned size) { @@ -647,10 +657,7 @@ struct hash_impl implementations[] = { IMPL(lavu, "TWOFISH", twofish, "crc:9edbd5c1") IMPL(gcrypt, "TWOFISH", twofish, "crc:9edbd5c1") IMPL(tomcrypt, "TWOFISH", twofish, "crc:9edbd5c1") - IMPL(lavu, "RC4", rc4, "crc:538d37b2") - IMPL(crypto, "RC4", rc4, "crc:538d37b2") - IMPL(gcrypt, "RC4", rc4, "crc:538d37b2") - IMPL(mbedcrypto, "RC4", rc4, "crc:538d37b2") + IMPL_ALL("RC4", rc4, "crc:538d37b2") IMPL(lavu, "XTEA", xtea, "crc:931fc270") IMPL(mbedcrypto, "XTEA", xtea, "crc:931fc270") IMPL(tomcrypt, "XTEA", xtea, "crc:931fc270")

1 0

tools/crypto_bench: add missing RC4 implementation from gcrypt
by James Almer 30 May '18

30 May '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed May 30 13:52:28 2018 -0300| [5420c8f76e70f5b390c8df07ab70e8b1e6d7fb75] | committer: James Almer tools/crypto_bench: add missing RC4 implementation from gcrypt Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5420c8f76e70f5b39… --- tools/crypto_bench.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index fc50229809..ecbe45f36a 100644 --- a/tools/crypto_bench.c +++ b/tools/crypto_bench.c @@ -312,23 +312,24 @@ DEFINE_GCRYPT_WRAPPER(sha256, SHA256) DEFINE_GCRYPT_WRAPPER(sha512, SHA512) DEFINE_GCRYPT_WRAPPER(ripemd160, RMD160) -#define DEFINE_GCRYPT_CYPHER_WRAPPER(suffix, cypher, sz) \ +#define DEFINE_GCRYPT_CYPHER_WRAPPER(suffix, cypher, mode, sz) \ static void run_gcrypt_ ## suffix(uint8_t *output, \ const uint8_t *input, unsigned size) \ { \ static gcry_cipher_hd_t suffix; \ if (!suffix) \ - gcry_cipher_open(&suffix, GCRY_CIPHER_ ## cypher, GCRY_CIPHER_MODE_ECB, 0); \ + gcry_cipher_open(&suffix, GCRY_CIPHER_ ## cypher, GCRY_CIPHER_MODE_ ## mode, 0); \ gcry_cipher_setkey(suffix, hardcoded_key, sz); \ gcry_cipher_encrypt(suffix, output, size, input, size); \ } -DEFINE_GCRYPT_CYPHER_WRAPPER(aes128, AES128, 16) -DEFINE_GCRYPT_CYPHER_WRAPPER(blowfish, BLOWFISH, 16) -DEFINE_GCRYPT_CYPHER_WRAPPER(camellia, CAMELLIA128, 16) -DEFINE_GCRYPT_CYPHER_WRAPPER(cast128, CAST5, 16) -DEFINE_GCRYPT_CYPHER_WRAPPER(des, DES, 8) -DEFINE_GCRYPT_CYPHER_WRAPPER(twofish, TWOFISH128, 16) +DEFINE_GCRYPT_CYPHER_WRAPPER(aes128, AES128, ECB, 16) +DEFINE_GCRYPT_CYPHER_WRAPPER(blowfish, BLOWFISH, ECB, 16) +DEFINE_GCRYPT_CYPHER_WRAPPER(camellia, CAMELLIA128, ECB, 16) +DEFINE_GCRYPT_CYPHER_WRAPPER(cast128, CAST5, ECB, 16) +DEFINE_GCRYPT_CYPHER_WRAPPER(des, DES, ECB, 8) +DEFINE_GCRYPT_CYPHER_WRAPPER(twofish, TWOFISH128, ECB, 16) +DEFINE_GCRYPT_CYPHER_WRAPPER(rc4, ARCFOUR, STREAM, 16) #define IMPL_USE_gcrypt(...) IMPL_USE(__VA_ARGS__) #else @@ -648,6 +649,7 @@ struct hash_impl implementations[] = { IMPL(tomcrypt, "TWOFISH", twofish, "crc:9edbd5c1") IMPL(lavu, "RC4", rc4, "crc:538d37b2") IMPL(crypto, "RC4", rc4, "crc:538d37b2") + IMPL(gcrypt, "RC4", rc4, "crc:538d37b2") IMPL(mbedcrypto, "RC4", rc4, "crc:538d37b2") IMPL(lavu, "XTEA", xtea, "crc:931fc270") IMPL(mbedcrypto, "XTEA", xtea, "crc:931fc270")

1 0

tools/crypto_bench: add support for mbedcrypto
by James Almer 30 May '18

30 May '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun May 27 18:17:54 2018 -0300| [cd62f9d557f647baa06c78cb673c7ce0501fdfea] | committer: James Almer tools/crypto_bench: add support for mbedcrypto Requires mbed TLS 2.7.0 or newer Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd62f9d557f647baa… --- tools/crypto_bench.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 121 insertions(+), 3 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index 203bffe198..fc50229809 100644 --- a/tools/crypto_bench.c +++ b/tools/crypto_bench.c @@ -23,6 +23,7 @@ #define USE_crypto 0x01 /* OpenSSL's libcrypto */ #define USE_gcrypt 0x02 /* GnuTLS's libgcrypt */ #define USE_tomcrypt 0x04 /* LibTomCrypt */ +#define USE_mbedcrypto 0x08 /* mbed TLS */ #include <stdlib.h> #include <math.h> @@ -335,6 +336,116 @@ DEFINE_GCRYPT_CYPHER_WRAPPER(twofish, TWOFISH128, 16) #endif /*************************************************************************** + * mbedcrypto: mbed TLS + ***************************************************************************/ + +#if (USE_EXT_LIBS) & USE_mbedcrypto + +#include <mbedtls/aes.h> +#include <mbedtls/arc4.h> +#include <mbedtls/blowfish.h> +#include <mbedtls/camellia.h> +#include <mbedtls/des.h> +#include <mbedtls/md5.h> +#include <mbedtls/ripemd160.h> +#include <mbedtls/sha1.h> +#include <mbedtls/sha256.h> +#include <mbedtls/sha512.h> +#include <mbedtls/xtea.h> + +#define DEFINE_MBEDCRYPTO_WRAPPER(suffix) \ +static void run_mbedcrypto_ ## suffix(uint8_t *output, \ + const uint8_t *input, unsigned size) \ +{ \ + mbedtls_ ## suffix ## _ret(input, size, output); \ +} + +#define DEFINE_MBEDCRYPTO_WRAPPER_SHA2(suffix) \ +static void run_mbedcrypto_ ## suffix(uint8_t *output, \ + const uint8_t *input, unsigned size) \ +{ \ + mbedtls_ ## suffix ## _ret(input, size, output, 0); \ +} + +DEFINE_MBEDCRYPTO_WRAPPER(md5) +DEFINE_MBEDCRYPTO_WRAPPER(ripemd160) +DEFINE_MBEDCRYPTO_WRAPPER(sha1) +DEFINE_MBEDCRYPTO_WRAPPER_SHA2(sha256) +DEFINE_MBEDCRYPTO_WRAPPER_SHA2(sha512) + + +#define DEFINE_MBEDCRYPTO_CYPHER_WRAPPER(suffix, cypher, algo) \ +static void run_mbedcrypto_ ## suffix(uint8_t *output, \ + const uint8_t *input, unsigned size) \ +{ \ + mbedtls_ ## cypher ## _context cypher; \ + \ + mbedtls_ ## cypher ## _init(&cypher); \ + mbedtls_ ## cypher ## _setkey_enc(&cypher, hardcoded_key, 128); \ + for (int i = 0; i < size; i += 16) \ + mbedtls_ ## cypher ## _crypt_ecb(&cypher, MBEDTLS_ ## algo ## _ENCRYPT, \ + input + i, output + i); \ + mbedtls_ ## cypher ## _free(&cypher); \ +} + +DEFINE_MBEDCRYPTO_CYPHER_WRAPPER(aes128, aes, AES) +DEFINE_MBEDCRYPTO_CYPHER_WRAPPER(camellia, camellia, CAMELLIA) + +static void run_mbedcrypto_blowfish(uint8_t *output, + const uint8_t *input, unsigned size) +{ + mbedtls_blowfish_context blowfish; + + mbedtls_blowfish_init(&blowfish); + mbedtls_blowfish_setkey(&blowfish, hardcoded_key, 128); + for (int i = 0; i < size; i += 8) + mbedtls_blowfish_crypt_ecb(&blowfish, MBEDTLS_BLOWFISH_ENCRYPT, + input + i, output + i); + mbedtls_blowfish_free(&blowfish); +} + +static void run_mbedcrypto_des(uint8_t *output, + const uint8_t *input, unsigned size) +{ + mbedtls_des_context des; + + mbedtls_des_init(&des); + mbedtls_des_setkey_enc(&des, hardcoded_key); + for (int i = 0; i < size; i += 8) + mbedtls_des_crypt_ecb(&des, input + i, output + i); + mbedtls_des_free(&des); +} + +static void run_mbedcrypto_rc4(uint8_t *output, + const uint8_t *input, unsigned size) +{ + mbedtls_arc4_context rc4; + + mbedtls_arc4_init(&rc4); + mbedtls_arc4_setup(&rc4, hardcoded_key, 16); + mbedtls_arc4_crypt(&rc4, size, input, output); + mbedtls_arc4_free(&rc4); +} + +static void run_mbedcrypto_xtea(uint8_t *output, + const uint8_t *input, unsigned size) +{ + mbedtls_xtea_context xtea; + + mbedtls_xtea_init(&xtea); + mbedtls_xtea_setup(&xtea, hardcoded_key); + for (int i = 0; i < size; i += 8) + mbedtls_xtea_crypt_ecb(&xtea, MBEDTLS_XTEA_ENCRYPT, + input + i, output + i); + mbedtls_xtea_free(&xtea); +} + +#define IMPL_USE_mbedcrypto(...) IMPL_USE(__VA_ARGS__) +#else +#define IMPL_USE_mbedcrypto(...) /* ignore */ +#endif + +/*************************************************************************** * tomcrypt: LibTomCrypt ***************************************************************************/ @@ -512,6 +623,7 @@ static void run_implementation(const uint8_t *input, uint8_t *output, IMPL(lavu, __VA_ARGS__) \ IMPL(crypto, __VA_ARGS__) \ IMPL(gcrypt, __VA_ARGS__) \ + IMPL(mbedcrypto, __VA_ARGS__) \ IMPL(tomcrypt, __VA_ARGS__) struct hash_impl implementations[] = { @@ -525,7 +637,10 @@ struct hash_impl implementations[] = { IMPL_ALL("RIPEMD-160", ripemd160, "62a5321e4fc8784903bb43ab7752c75f8b25af00") IMPL_ALL("AES-128", aes128, "crc:ff6bc888") IMPL_ALL("CAMELLIA", camellia, "crc:7abb59a7") - IMPL_ALL("CAST-128", cast128, "crc:456aa584") + IMPL(lavu, "CAST-128", cast128, "crc:456aa584") + IMPL(crypto, "CAST-128", cast128, "crc:456aa584") + IMPL(gcrypt, "CAST-128", cast128, "crc:456aa584") + IMPL(tomcrypt, "CAST-128", cast128, "crc:456aa584") IMPL_ALL("BLOWFISH", blowfish, "crc:33e8aa74") IMPL_ALL("DES", des, "crc:31291e0b") IMPL(lavu, "TWOFISH", twofish, "crc:9edbd5c1") @@ -533,7 +648,9 @@ struct hash_impl implementations[] = { IMPL(tomcrypt, "TWOFISH", twofish, "crc:9edbd5c1") IMPL(lavu, "RC4", rc4, "crc:538d37b2") IMPL(crypto, "RC4", rc4, "crc:538d37b2") + IMPL(mbedcrypto, "RC4", rc4, "crc:538d37b2") IMPL(lavu, "XTEA", xtea, "crc:931fc270") + IMPL(mbedcrypto, "XTEA", xtea, "crc:931fc270") IMPL(tomcrypt, "XTEA", xtea, "crc:931fc270") }; @@ -561,15 +678,16 @@ int main(int argc, char **argv) argv[0]); if ((USE_EXT_LIBS)) { char buf[1024]; - snprintf(buf, sizeof(buf), "%s%s%s", + snprintf(buf, sizeof(buf), "%s%s%s%s", ((USE_EXT_LIBS) & USE_crypto) ? "+crypto" : "", ((USE_EXT_LIBS) & USE_gcrypt) ? "+gcrypt" : "", + ((USE_EXT_LIBS) & USE_mbedcrypto) ? "+mbedcrypto" : "", ((USE_EXT_LIBS) & USE_tomcrypt) ? "+tomcrypt" : ""); fprintf(stderr, "Built with the following external libraries:\n" "make VERSUS=%s\n", buf + 1); } else { fprintf(stderr, "Built without external libraries; use\n" - "make VERSUS=crypto+gcrypt+tomcrypt tools/crypto_bench\n" + "make VERSUS=crypto+gcrypt+mbedcrypto+tomcrypt tools/crypto_bench\n" "to enable them.\n"); } exit(opt != 'h');

1 0

avcodec/h263dec: Reinitialize idct context if it has not been setup for the active profile
by Michael Niedermayer 30 May '18

30 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon May 28 22:29:58 2018 +0200| [44a2415a6d94f841f2026bb70b8b3c19ba68aa72] | committer: Michael Niedermayer avcodec/h263dec: Reinitialize idct context if it has not been setup for the active profile The profile after reading headers can be different from when the context was initialized Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44a2415a6d94f841f… --- libavcodec/h263dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index c082af1c52..f8a38083f2 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -546,6 +546,8 @@ retry: if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { if (ff_mpeg4_workaround_bugs(avctx) == 1) goto retry; + if (s->studio_profile != (s->idsp.idct == NULL)) + ff_mpv_idct_init(s); } /* After H.263 & MPEG-4 header decode we have the height, width,

1 0

avcodec/idctdsp: Clear idct/idct_add for studio profile
by Michael Niedermayer 30 May '18

30 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon May 28 22:29:57 2018 +0200| [8c50d0cccfe4c9f25a8494f76da55dcdc2275058] | committer: Michael Niedermayer avcodec/idctdsp: Clear idct/idct_add for studio profile This does not leave them "as before" which may be a value from a previous profile Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c50d0cccfe4c9f25… --- libavcodec/idctdsp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index 954066a5e3..846ed0b0f8 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -258,9 +258,11 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) if (avctx->bits_per_raw_sample == 10 || avctx->bits_per_raw_sample == 9) { /* 10-bit MPEG-4 Simple Studio Profile requires a higher precision IDCT However, it only uses idct_put */ - if (c->mpeg4_studio_profile) + if (c->mpeg4_studio_profile) { c->idct_put = ff_simple_idct_put_int32_10bit; - else { + c->idct_add = NULL; + c->idct = NULL; + } else { c->idct_put = ff_simple_idct_put_int16_10bit; c->idct_add = ff_simple_idct_add_int16_10bit; c->idct = ff_simple_idct_int16_10bit;

1 0