Skip to content

F
ffmpeg.wasm-core
Commit 3b08d9d9 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

testprogs: K&R formatting cosmetics

parent 43992985
Expand all Show whitespace changes
Inline Side-by-side
Showing with 493 additions and 417 deletions
libavcodec/iirfilter.c
View file @ 3b08d9d9
...@@ -24,27 +24,29 @@ ...@@ -24,27 +24,29 @@
* different IIR filters implementation * different IIR filters implementation
*/ */
#include "iirfilter.h"
#include <math.h> #include <math.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "iirfilter.h"
/** /**
* IIR filter global parameters * IIR filter global parameters
*/ */
typedef struct FFIIRFilterCoeffs{ typedef struct FFIIRFilterCoeffs {
int order; int order;
float gain; float gain;
int *cx; int *cx;
float *cy; float *cy;
}FFIIRFilterCoeffs; } FFIIRFilterCoeffs;
/** /**
* IIR filter state * IIR filter state
*/ */
typedef struct FFIIRFilterState{ typedef struct FFIIRFilterState {
float x[1]; float x[1];
}FFIIRFilterState; } FFIIRFilterState;
/// maximum supported filter order /// maximum supported filter order
#define MAXORDER 30 #define MAXORDER 30
...@@ -73,14 +75,14 @@ static av_cold int butterworth_init_coeffs(void *avc, ...@@ -73,14 +75,14 @@ static av_cold int butterworth_init_coeffs(void *avc,
wa = 2 * tan(M_PI * 0.5 * cutoff_ratio); wa = 2 * tan(M_PI * 0.5 * cutoff_ratio);
c->cx[0] = 1; c->cx[0] = 1;
for(i = 1; i < (order >> 1) + 1; i++) for (i = 1; i < (order >> 1) + 1; i++)
c->cx[i] = c->cx[i - 1] * (order - i + 1LL) / i; c->cx[i] = c->cx[i - 1] * (order - i + 1LL) / i;
p[0][0] = 1.0; p[0][0] = 1.0;
p[0][1] = 0.0; p[0][1] = 0.0;
for(i = 1; i <= order; i++) for (i = 1; i <= order; i++)
p[i][0] = p[i][1] = 0.0; p[i][0] = p[i][1] = 0.0;
for(i = 0; i < order; i++){ for (i = 0; i < order; i++) {
double zp[2]; double zp[2];
double th = (i + (order >> 1) + 0.5) * M_PI / order; double th = (i + (order >> 1) + 0.5) * M_PI / order;
double a_re, a_im, c_re, c_im; double a_re, a_im, c_re, c_im;
...@@ -93,19 +95,18 @@ static av_cold int butterworth_init_coeffs(void *avc, ...@@ -93,19 +95,18 @@ static av_cold int butterworth_init_coeffs(void *avc,
zp[0] = (a_re * c_re + a_im * c_im) / (c_re * c_re + c_im * c_im); zp[0] = (a_re * c_re + a_im * c_im) / (c_re * c_re + c_im * c_im);
zp[1] = (a_im * c_re - a_re * c_im) / (c_re * c_re + c_im * c_im); zp[1] = (a_im * c_re - a_re * c_im) / (c_re * c_re + c_im * c_im);
for(j = order; j >= 1; j--) for (j = order; j >= 1; j--) {
{
a_re = p[j][0]; a_re = p[j][0];
a_im = p[j][1]; a_im = p[j][1];
p[j][0] = a_re*zp[0] - a_im*zp[1] + p[j-1][0]; p[j][0] = a_re * zp[0] - a_im * zp[1] + p[j - 1][0];
p[j][1] = a_re*zp[1] + a_im*zp[0] + p[j-1][1]; p[j][1] = a_re * zp[1] + a_im * zp[0] + p[j - 1][1];
} }
a_re = p[0][0]*zp[0] - p[0][1]*zp[1]; a_re = p[0][0] * zp[0] - p[0][1] * zp[1];
p[0][1] = p[0][0]*zp[1] + p[0][1]*zp[0]; p[0][1] = p[0][0] * zp[1] + p[0][1] * zp[0];
p[0][0] = a_re; p[0][0] = a_re;
} }
c->gain = p[order][0]; c->gain = p[order][0];
for(i = 0; i < order; i++){ for (i = 0; i < order; i++) {
c->gain += p[i][0]; c->gain += p[i][0];
c->cy[i] = (-p[i][0] * p[order][0] + -p[i][1] * p[order][1]) / c->cy[i] = (-p[i][0] * p[order][0] + -p[i][1] * p[order][1]) /
(p[order][0] * p[order][0] + p[order][1] * p[order][1]); (p[order][0] * p[order][0] + p[order][1] * p[order][1]);
...@@ -158,7 +159,7 @@ static av_cold int biquad_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c, ...@@ -158,7 +159,7 @@ static av_cold int biquad_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c,
return 0; return 0;
} }
av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(void *avc, av_cold struct FFIIRFilterCoeffs *ff_iir_filter_init_coeffs(void *avc,
enum IIRFilterType filt_type, enum IIRFilterType filt_type,
enum IIRFilterMode filt_mode, enum IIRFilterMode filt_mode,
int order, float cutoff_ratio, int order, float cutoff_ratio,
...@@ -172,9 +173,9 @@ av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(void *avc, ...@@ -172,9 +173,9 @@ av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(void *avc,
FF_ALLOCZ_OR_GOTO(avc, c, sizeof(FFIIRFilterCoeffs), FF_ALLOCZ_OR_GOTO(avc, c, sizeof(FFIIRFilterCoeffs),
init_fail); init_fail);
FF_ALLOC_OR_GOTO (avc, c->cx, sizeof(c->cx[0]) * ((order >> 1) + 1), FF_ALLOC_OR_GOTO(avc, c->cx, sizeof(c->cx[0]) * ((order >> 1) + 1),
init_fail); init_fail);
FF_ALLOC_OR_GOTO (avc, c->cy, sizeof(c->cy[0]) * order, FF_ALLOC_OR_GOTO(avc, c->cy, sizeof(c->cy[0]) * order,
init_fail); init_fail);
c->order = order; c->order = order;
...@@ -200,9 +201,9 @@ init_fail: ...@@ -200,9 +201,9 @@ init_fail:
return NULL; return NULL;
} }
av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order) av_cold struct FFIIRFilterState *ff_iir_filter_init_state(int order)
{ {
FFIIRFilterState* s = av_mallocz(sizeof(FFIIRFilterState) + sizeof(s->x[0]) * (order - 1)); FFIIRFilterState *s = av_mallocz(sizeof(FFIIRFilterState) + sizeof(s->x[0]) * (order - 1));
return s; return s;
} }
...@@ -211,13 +212,15 @@ av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order) ...@@ -211,13 +212,15 @@ av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order)
#define CONV_FLT(dest, source) dest = source; #define CONV_FLT(dest, source) dest = source;
#define FILTER_BW_O4_1(i0, i1, i2, i3, fmt) \ #define FILTER_BW_O4_1(i0, i1, i2, i3, fmt) \
in = *src0 * c->gain \ in = *src0 * c->gain + \
+ c->cy[0]*s->x[i0] + c->cy[1]*s->x[i1] \ c->cy[0] * s->x[i0] + \
+ c->cy[2]*s->x[i2] + c->cy[3]*s->x[i3]; \ c->cy[1] * s->x[i1] + \
res = (s->x[i0] + in )*1 \ c->cy[2] * s->x[i2] + \
+ (s->x[i1] + s->x[i3])*4 \ c->cy[3] * s->x[i3]; \
+ s->x[i2] *6; \ res = (s->x[i0] + in) * 1 + \
CONV_##fmt(*dst0, res) \ (s->x[i1] + s->x[i3]) * 4 + \
s->x[i2] * 6; \
CONV_ ## fmt(*dst0, res) \
s->x[i0] = in; \ s->x[i0] = in; \
src0 += sstep; \ src0 += sstep; \
dst0 += dstep; dst0 += dstep;
...@@ -243,14 +246,14 @@ av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order) ...@@ -243,14 +246,14 @@ av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order)
int j; \ int j; \
float in, res; \ float in, res; \
in = *src0 * c->gain; \ in = *src0 * c->gain; \
for(j = 0; j < c->order; j++) \ for (j = 0; j < c->order; j++) \
in += c->cy[j] * s->x[j]; \ in += c->cy[j] * s->x[j]; \
res = s->x[0] + in + s->x[c->order >> 1] * c->cx[c->order >> 1]; \ res = s->x[0] + in + s->x[c->order >> 1] * c->cx[c->order >> 1]; \
for(j = 1; j < c->order >> 1; j++) \ for (j = 1; j < c->order >> 1; j++) \
res += (s->x[j] + s->x[c->order - j]) * c->cx[j]; \ res += (s->x[j] + s->x[c->order - j]) * c->cx[j]; \
for(j = 0; j < c->order - 1; j++) \ for (j = 0; j < c->order - 1; j++) \
s->x[j] = s->x[j + 1]; \ s->x[j] = s->x[j + 1]; \
CONV_##fmt(*dst0, res) \ CONV_ ## fmt(*dst0, res) \
s->x[c->order - 1] = in; \ s->x[c->order - 1] = in; \
src0 += sstep; \ src0 += sstep; \
dst0 += dstep; \ dst0 += dstep; \
...@@ -265,7 +268,7 @@ av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order) ...@@ -265,7 +268,7 @@ av_cold struct FFIIRFilterState* ff_iir_filter_init_state(int order)
float in = *src0 * c->gain + \ float in = *src0 * c->gain + \
s->x[0] * c->cy[0] + \ s->x[0] * c->cy[0] + \
s->x[1] * c->cy[1]; \ s->x[1] * c->cy[1]; \
CONV_##fmt(*dst0, s->x[0] + in + s->x[1] * c->cx[1]) \ CONV_ ## fmt(*dst0, s->x[0] + in + s->x[1] * c->cx[1]) \
s->x[0] = s->x[1]; \ s->x[0] = s->x[1]; \
s->x[1] = in; \ s->x[1] = in; \
src0 += sstep; \ src0 += sstep; \
...@@ -306,7 +309,7 @@ av_cold void ff_iir_filter_free_state(struct FFIIRFilterState *state) ...@@ -306,7 +309,7 @@ av_cold void ff_iir_filter_free_state(struct FFIIRFilterState *state)
av_cold void ff_iir_filter_free_coeffs(struct FFIIRFilterCoeffs *coeffs) av_cold void ff_iir_filter_free_coeffs(struct FFIIRFilterCoeffs *coeffs)
{ {
if(coeffs){ if (coeffs) {
av_free(coeffs->cx); av_free(coeffs->cx);
av_free(coeffs->cy); av_free(coeffs->cy);
} }
...@@ -331,9 +334,8 @@ int main(void) ...@@ -331,9 +334,8 @@ int main(void)
cutoff_coeff, 0.0, 0.0); cutoff_coeff, 0.0, 0.0);
fstate = ff_iir_filter_init_state(FILT_ORDER); fstate = ff_iir_filter_init_state(FILT_ORDER);
for (i = 0; i < SIZE; i++) { for (i = 0; i < SIZE; i++)
x[i] = lrint(0.75 * INT16_MAX * sin(0.5*M_PI*i*i/SIZE)); x[i] = lrint(0.75 * INT16_MAX * sin(0.5 * M_PI * i * i / SIZE));
}
ff_iir_filter(fcoeffs, fstate, SIZE, x, 1, y, 1); ff_iir_filter(fcoeffs, fstate, SIZE, x, 1, y, 1);
......
libavutil/aes.c
View file @ 3b08d9d9
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
*/ */
#include "common.h" #include "common.h"
#include "aes.h"
#include "intreadwrite.h" #include "intreadwrite.h"
#include "timer.h" #include "timer.h"
#include "aes.h"
typedef union { typedef union {
uint64_t u64[2]; uint64_t u64[2];
...@@ -109,7 +109,8 @@ static void subshift(av_aes_block s0[2], int s, const uint8_t *box) ...@@ -109,7 +109,8 @@ static void subshift(av_aes_block s0[2], int s, const uint8_t *box)
s3[0].u8[ 5] = box[s3[1].u8[ 1]]; s3[0].u8[ 5] = box[s3[1].u8[ 1]];
} }
static inline int mix_core(uint32_t multbl[][256], int a, int b, int c, int d){ static inline int mix_core(uint32_t multbl[][256], int a, int b, int c, int d)
{
#if CONFIG_SMALL #if CONFIG_SMALL
return multbl[0][a] ^ ROT(multbl[0][b], 8) ^ ROT(multbl[0][c], 16) ^ ROT(multbl[0][d], 24); return multbl[0][a] ^ ROT(multbl[0][b], 8) ^ ROT(multbl[0][c], 16) ^ ROT(multbl[0][d], 24);
#else #else
...@@ -117,12 +118,13 @@ static inline int mix_core(uint32_t multbl[][256], int a, int b, int c, int d){ ...@@ -117,12 +118,13 @@ static inline int mix_core(uint32_t multbl[][256], int a, int b, int c, int d){
#endif #endif
} }
static inline void mix(av_aes_block state[2], uint32_t multbl[][256], int s1, int s3){ static inline void mix(av_aes_block state[2], uint32_t multbl[][256], int s1, int s3)
{
uint8_t (*src)[4] = state[1].u8x4; uint8_t (*src)[4] = state[1].u8x4;
state[0].u32[0] = mix_core(multbl, src[0][0], src[s1 ][1], src[2][2], src[s3 ][3]); state[0].u32[0] = mix_core(multbl, src[0][0], src[s1 ][1], src[2][2], src[s3 ][3]);
state[0].u32[1] = mix_core(multbl, src[1][0], src[s3-1][1], src[3][2], src[s1-1][3]); state[0].u32[1] = mix_core(multbl, src[1][0], src[s3 - 1][1], src[3][2], src[s1 - 1][3]);
state[0].u32[2] = mix_core(multbl, src[2][0], src[s3 ][1], src[0][2], src[s1 ][3]); state[0].u32[2] = mix_core(multbl, src[2][0], src[s3 ][1], src[0][2], src[s1 ][3]);
state[0].u32[3] = mix_core(multbl, src[3][0], src[s1-1][1], src[1][2], src[s3-1][3]); state[0].u32[3] = mix_core(multbl, src[3][0], src[s1 - 1][1], src[1][2], src[s3 - 1][3]);
} }
static inline void crypt(AVAES *a, int s, const uint8_t *sbox, static inline void crypt(AVAES *a, int s, const uint8_t *sbox,
...@@ -178,7 +180,7 @@ static void init_multbl2(uint32_t tbl[][256], const int c[4], ...@@ -178,7 +180,7 @@ static void init_multbl2(uint32_t tbl[][256], const int c[4],
l = alog8[x + log8[c[1]]]; l = alog8[x + log8[c[1]]];
m = alog8[x + log8[c[2]]]; m = alog8[x + log8[c[2]]];
n = alog8[x + log8[c[3]]]; n = alog8[x + log8[c[3]]];
tbl[0][i] = AV_NE(MKBETAG(k,l,m,n), MKTAG(k,l,m,n)); tbl[0][i] = AV_NE(MKBETAG(k, l, m, n), MKTAG(k, l, m, n));
#if !CONFIG_SMALL #if !CONFIG_SMALL
tbl[1][i] = ROT(tbl[0][i], 8); tbl[1][i] = ROT(tbl[0][i], 8);
tbl[2][i] = ROT(tbl[0][i], 16); tbl[2][i] = ROT(tbl[0][i], 16);
...@@ -198,7 +200,7 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) ...@@ -198,7 +200,7 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
uint8_t log8[256]; uint8_t log8[256];
uint8_t alog8[512]; uint8_t alog8[512];
if (!enc_multbl[FF_ARRAY_ELEMS(enc_multbl)-1][FF_ARRAY_ELEMS(enc_multbl[0])-1]) { if (!enc_multbl[FF_ARRAY_ELEMS(enc_multbl) - 1][FF_ARRAY_ELEMS(enc_multbl[0]) - 1]) {
j = 1; j = 1;
for (i = 0; i < 255; i++) { for (i = 0; i < 255; i++) {
alog8[i] = alog8[i + 255] = j; alog8[i] = alog8[i + 255] = j;
...@@ -254,9 +256,8 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) ...@@ -254,9 +256,8 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
a->round_key[i] = tmp[0]; a->round_key[i] = tmp[0];
} }
} else { } else {
for (i = 0; i < (rounds + 1) >> 1; i++) { for (i = 0; i < (rounds + 1) >> 1; i++)
FFSWAP(av_aes_block, a->round_key[i], a->round_key[rounds-i]); FFSWAP(av_aes_block, a->round_key[i], a->round_key[rounds - i]);
}
} }
return 0; return 0;
...@@ -264,6 +265,7 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) ...@@ -264,6 +265,7 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
#ifdef TEST #ifdef TEST
#include <string.h> #include <string.h>
#include "lfg.h" #include "lfg.h"
#include "log.h" #include "log.h"
...@@ -276,12 +278,12 @@ int main(int argc, char **argv) ...@@ -276,12 +278,12 @@ int main(int argc, char **argv)
{ 0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, { 0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3,
0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59 } 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59 }
}; };
uint8_t pt[16], rpt[2][16]= { uint8_t pt[16], rpt[2][16] = {
{ 0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad, { 0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad,
0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3 }, 0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3 },
{ 0 } { 0 }
}; };
uint8_t rct[2][16]= { uint8_t rct[2][16] = {
{ 0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, { 0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7,
0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf }, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf },
{ 0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, { 0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0,
...@@ -313,9 +315,8 @@ int main(int argc, char **argv) ...@@ -313,9 +315,8 @@ int main(int argc, char **argv)
av_lfg_init(&prng, 1); av_lfg_init(&prng, 1);
for (i = 0; i < 10000; i++) { for (i = 0; i < 10000; i++) {
for (j = 0; j < 16; j++) { for (j = 0; j < 16; j++)
pt[j] = av_lfg_get(&prng); pt[j] = av_lfg_get(&prng);
}
{ {
START_TIMER; START_TIMER;
av_aes_crypt(&ae, temp, pt, 1, NULL, 0); av_aes_crypt(&ae, temp, pt, 1, NULL, 0);
......
libavutil/crc.c
View file @ 3b08d9d9
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
*/ */
#include "config.h" #include "config.h"
#include "common.h"
#include "bswap.h" #include "bswap.h"
#include "common.h"
#include "crc.h" #include "crc.h"
#if CONFIG_HARDCODED_TABLES #if CONFIG_HARDCODED_TABLES
...@@ -287,7 +288,7 @@ int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size) ...@@ -287,7 +288,7 @@ int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size)
if (ctx_size >= sizeof(AVCRC) * 1024) if (ctx_size >= sizeof(AVCRC) * 1024)
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
ctx[256 *(j + 1) + i] = ctx[256 * (j + 1) + i] =
(ctx[256 * j + i] >> 8) ^ ctx[ctx[256 * j + i] & 0xFF]; (ctx[256 * j + i] >> 8) ^ ctx[ctx[256 * j + i] & 0xFF];
#endif #endif
...@@ -338,11 +339,12 @@ int main(void) ...@@ -338,11 +339,12 @@ int main(void)
{ {
uint8_t buf[1999]; uint8_t buf[1999];
int i; int i;
int p[5][3] = { { AV_CRC_32_IEEE_LE, 0xEDB88320, 0x3D5CDD04 }, int p[5][3] = {
{ AV_CRC_32_IEEE , 0x04C11DB7, 0xC0F5BAE0 }, { AV_CRC_32_IEEE_LE, 0xEDB88320, 0x3D5CDD04 },
{ AV_CRC_16_ANSI_LE, 0xA001 , 0xBFD8 }, { AV_CRC_32_IEEE, 0x04C11DB7, 0xC0F5BAE0 },
{ AV_CRC_16_ANSI , 0x8005 , 0x1FBB }, { AV_CRC_16_ANSI_LE, 0xA001, 0xBFD8 },
{ AV_CRC_8_ATM , 0x07 , 0xE3 } { AV_CRC_16_ANSI, 0x8005, 0x1FBB },
{ AV_CRC_8_ATM, 0x07, 0xE3 }
}; };
const AVCRC *ctx; const AVCRC *ctx;
......
libavutil/des.c
View file @ 3b08d9d9
This diff is collapsed.
libavutil/md5.c
View file @ 3b08d9d9
...@@ -31,12 +31,13 @@ ...@@ -31,12 +31,13 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include "bswap.h" #include "bswap.h"
#include "intreadwrite.h" #include "intreadwrite.h"
#include "md5.h"
#include "mem.h" #include "mem.h"
#include "md5.h"
typedef struct AVMD5{ typedef struct AVMD5 {
uint64_t len; uint64_t len;
uint8_t block[64]; uint8_t block[64];
uint32_t ABCD[4]; uint32_t ABCD[4];
...@@ -76,16 +77,21 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32) ...@@ -76,16 +77,21 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32)
0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
}; };
#define CORE(i, a, b, c, d) do { \ #define CORE(i, a, b, c, d) \
do { \
t = S[i >> 4][i & 3]; \ t = S[i >> 4][i & 3]; \
a += T[i]; \ a += T[i]; \
\ \
if (i < 32) { \ if (i < 32) { \
if (i < 16) a += (d ^ (b & (c ^ d))) + X[ i & 15]; \ if (i < 16) \
else a += (c ^ (d & (c ^ b))) + X[(1 + 5*i) & 15]; \ a += (d ^ (b & (c ^ d))) + X[i & 15]; \
else \
a += (c ^ (d & (c ^ b))) + X[(1 + 5 * i) & 15]; \
} else { \ } else { \
if (i < 48) a += (b ^ c ^ d) + X[(5 + 3*i) & 15]; \ if (i < 48) \
else a += (c ^ (b | ~d)) + X[( 7*i) & 15]; \ a += (b ^ c ^ d) + X[(5 + 3 * i) & 15]; \
else \
a += (c ^ (b | ~d)) + X[(7 * i) & 15]; \
} \ } \
a = b + (a << t | a >> (32 - t)); \ a = b + (a << t | a >> (32 - t)); \
} while (0) } while (0)
...@@ -115,10 +121,13 @@ static void body(uint32_t ABCD[4], uint32_t X[16]) ...@@ -115,10 +121,13 @@ static void body(uint32_t ABCD[4], uint32_t X[16])
} }
#else #else
#define CORE2(i) \ #define CORE2(i) \
CORE( i, a,b,c,d); CORE((i+1),d,a,b,c); \ CORE(i, a, b, c, d); CORE((i + 1), d, a, b, c); \
CORE((i+2),c,d,a,b); CORE((i+3),b,c,d,a) CORE((i + 2), c, d, a, b); CORE((i + 3), b, c, d, a)
#define CORE4(i) CORE2(i); CORE2((i+4)); CORE2((i+8)); CORE2((i+12)) #define CORE4(i) CORE2(i); CORE2((i + 4)); CORE2((i + 8)); CORE2((i + 12))
CORE4(0); CORE4(16); CORE4(32); CORE4(48); CORE4(0);
CORE4(16);
CORE4(32);
CORE4(48);
#endif #endif
ABCD[0] += d; ABCD[0] += d;
...@@ -162,10 +171,10 @@ void av_md5_final(AVMD5 *ctx, uint8_t *dst) ...@@ -162,10 +171,10 @@ void av_md5_final(AVMD5 *ctx, uint8_t *dst)
while ((ctx->len & 63) != 56) while ((ctx->len & 63) != 56)
av_md5_update(ctx, "", 1); av_md5_update(ctx, "", 1);
av_md5_update(ctx, (uint8_t *)&finalcount, 8); av_md5_update(ctx, (uint8_t *) &finalcount, 8);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
AV_WL32(dst + 4*i, ctx->ABCD[3 - i]); AV_WL32(dst + 4 * i, ctx->ABCD[3 - i]);
} }
void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len) void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len)
...@@ -188,20 +197,26 @@ static void print_md5(uint8_t *md5) ...@@ -188,20 +197,26 @@ static void print_md5(uint8_t *md5)
printf("\n"); printf("\n");
} }
int main(void){ int main(void)
{
uint8_t md5val[16]; uint8_t md5val[16];
int i; int i;
uint8_t in[1000]; uint8_t in[1000];
for (i = 0; i < 1000; i++) for (i = 0; i < 1000; i++)
in[i] = i * i; in[i] = i * i;
av_md5_sum(md5val, in, 1000); print_md5(md5val); av_md5_sum(md5val, in, 1000);
av_md5_sum(md5val, in, 63); print_md5(md5val); print_md5(md5val);
av_md5_sum(md5val, in, 64); print_md5(md5val); av_md5_sum(md5val, in, 63);
av_md5_sum(md5val, in, 65); print_md5(md5val); print_md5(md5val);
av_md5_sum(md5val, in, 64);
print_md5(md5val);
av_md5_sum(md5val, in, 65);
print_md5(md5val);
for (i = 0; i < 1000; i++) for (i = 0; i < 1000; i++)
in[i] = i % 127; in[i] = i % 127;
av_md5_sum(md5val, in, 999); print_md5(md5val); av_md5_sum(md5val, in, 999);
print_md5(md5val);
return 0; return 0;
} }
......
libavutil/opt.c
View file @ 3b08d9d9
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment