Commit 497559ec authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: K&R coding style, prettyprinting

Originally committed as revision 19906 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f9337897
...@@ -25,21 +25,22 @@ ...@@ -25,21 +25,22 @@
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
static int score_array[1000]; //this must be larger than the number of formats static int score_array[1000]; //this must be larger than the number of formats
static int failures=0; static int failures = 0;
static void probe(AVProbeData *pd, int type, int p, int size) static void probe(AVProbeData *pd, int type, int p, int size)
{ {
int i = 0; int i = 0;
AVInputFormat *fmt; AVInputFormat *fmt;
for(fmt = first_iformat; fmt != NULL; fmt = fmt->next) { for (fmt = first_iformat; fmt != NULL; fmt = fmt->next) {
if (fmt->flags & AVFMT_NOFILE) if (fmt->flags & AVFMT_NOFILE)
continue; continue;
if (fmt->read_probe) { if (fmt->read_probe) {
int score = fmt->read_probe(pd); int score = fmt->read_probe(pd);
if(score > score_array[i] && score > AVPROBE_SCORE_MAX/4){ if (score > score_array[i] && score > AVPROBE_SCORE_MAX / 4) {
score_array[i]= score; score_array[i] = score;
fprintf(stderr, "Failure of %s probing code with score=%d type=%d p=%X size=%d\n", fmt->name, score, type, p, size); fprintf(stderr, "Failure of %s probing code with score=%d type=%d p=%X size=%d\n",
fmt->name, score, type, p, size);
failures++; failures++;
} }
} }
...@@ -59,54 +60,54 @@ int main(int argc, char **argv) ...@@ -59,54 +60,54 @@ int main(int argc, char **argv)
av_lfg_init(&state, 0xdeadbeef); av_lfg_init(&state, 0xdeadbeef);
pd.buf= NULL; pd.buf = NULL;
for(size= 1; size < 65537; size*=2){ for (size = 1; size < 65537; size *= 2) {
pd.buf_size= size; pd.buf_size = size;
pd.buf= av_realloc(pd.buf, size + AVPROBE_PADDING_SIZE); pd.buf = av_realloc(pd.buf, size + AVPROBE_PADDING_SIZE);
pd.filename= ""; pd.filename = "";
fprintf(stderr, "testing size=%d\n", size); fprintf(stderr, "testing size=%d\n", size);
for(retry=0; retry<4097; retry+= FFMAX(size,32)){ for (retry = 0; retry < 4097; retry += FFMAX(size, 32)) {
for(type=0; type < 4; type++){ for (type = 0; type < 4; type++) {
for(p=0; p<4096; p++){ for (p = 0; p < 4096; p++) {
unsigned hist=0; unsigned hist = 0;
init_put_bits(&pb, pd.buf, size); init_put_bits(&pb, pd.buf, size);
switch(type){ switch (type) {
case 0: case 0:
for(i=0; i<size*8; i++){ for (i = 0; i < size * 8; i++) {
put_bits(&pb, 1, (av_lfg_get(&state)&0xFFFFFFFF) > p<<20); put_bits(&pb, 1, (av_lfg_get(&state) & 0xFFFFFFFF) > p << 20);
} }
break; break;
case 1: case 1:
for(i=0; i<size*8; i++){ for (i = 0; i < size * 8; i++) {
unsigned int p2= hist ? p&0x3F : (p>>6); unsigned int p2 = hist ? p & 0x3F : (p >> 6);
unsigned int v= (av_lfg_get(&state)&0xFFFFFFFF) > p2<<26; unsigned int v = (av_lfg_get(&state) & 0xFFFFFFFF) > p2 << 26;
put_bits(&pb, 1, v); put_bits(&pb, 1, v);
hist= v; hist = v;
} }
break; break;
case 2: case 2:
for(i=0; i<size*8; i++){ for (i = 0; i < size * 8; i++) {
unsigned int p2= (p >> (hist*3)) & 7; unsigned int p2 = (p >> (hist*3)) & 7;
unsigned int v= (av_lfg_get(&state)&0xFFFFFFFF) > p2<<29; unsigned int v = (av_lfg_get(&state) & 0xFFFFFFFF) > p2 << 29;
put_bits(&pb, 1, v); put_bits(&pb, 1, v);
hist= (2*hist + v)&3; hist = (2*hist + v) & 3;
} }
break; break;
case 3: case 3:
for(i=0; i<size; i++){ for (i = 0; i < size; i++) {
int c=0; int c = 0;
while(p&63){ while (p & 63) {
c= (av_lfg_get(&state)&0xFFFFFFFF)>>24; c = (av_lfg_get(&state) & 0xFFFFFFFF) >> 24;
if (c >= 'a' && c <= 'z' && (p&1)) break; if (c >= 'a' && c <= 'z' && (p & 1)) break;
else if(c >= 'A' && c <= 'Z' && (p&2)) break; else if(c >= 'A' && c <= 'Z' && (p & 2)) break;
else if(c >= '0' && c <= '9' && (p&4)) break; else if(c >= '0' && c <= '9' && (p & 4)) break;
else if(c == ' '&& (p&8)) break; else if(c == ' ' && (p & 8)) break;
else if(c == 0 && (p&16)) break; else if(c == 0 && (p & 16)) break;
else if(c == 1 && (p&32)) break; else if(c == 1 && (p & 32)) break;
} }
pd.buf[i]= c; pd.buf[i] = c;
} }
} }
flush_put_bits(&pb); flush_put_bits(&pb);
......
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