diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:26:13 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:34:35 +0300 |
commit | 0eb321bf2c1cc0e048faff26a01f86cdd3ec254f (patch) | |
tree | 71cb9bd9ed121156d3382066c0722c73189afe04 /TOOLS | |
parent | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (diff) | |
download | mpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.bz2 mpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.xz |
Remove trailing whitespace from most files
Diffstat (limited to 'TOOLS')
-rwxr-xr-x | TOOLS/aconvert.sh | 2 | ||||
-rw-r--r-- | TOOLS/asfinfo.c | 1 | ||||
-rw-r--r-- | TOOLS/avisubdump.c | 1 | ||||
-rw-r--r-- | TOOLS/bmovl-test.c | 8 | ||||
-rwxr-xr-x | TOOLS/calcbpp.pl | 2 | ||||
-rw-r--r-- | TOOLS/compare.c | 1 | ||||
-rwxr-xr-x | TOOLS/divx2svcd.sh | 2 | ||||
-rwxr-xr-x | TOOLS/mencvcd.sh | 18 | ||||
-rw-r--r-- | TOOLS/modify_reg.c | 3 | ||||
-rw-r--r-- | TOOLS/movinfo.c | 28 | ||||
-rw-r--r-- | TOOLS/netstream.c | 14 | ||||
-rwxr-xr-x | TOOLS/plotpsnr.pl | 2 | ||||
-rwxr-xr-x | TOOLS/qepdvcd.sh | 12 | ||||
-rw-r--r-- | TOOLS/realcodecs/14_4.c | 10 | ||||
-rw-r--r-- | TOOLS/realcodecs/28_8.c | 10 | ||||
-rw-r--r-- | TOOLS/realcodecs/cook.c | 11 | ||||
-rw-r--r-- | TOOLS/realcodecs/drv2.c | 34 | ||||
-rw-r--r-- | TOOLS/realcodecs/drv3.c | 24 | ||||
-rw-r--r-- | TOOLS/realcodecs/drv4.c | 25 | ||||
-rw-r--r-- | TOOLS/realcodecs/ra.c | 7 | ||||
-rw-r--r-- | TOOLS/realcodecs/rv30.c | 5 | ||||
-rw-r--r-- | TOOLS/realcodecs/sipr.c | 11 | ||||
-rw-r--r-- | TOOLS/subrip.c | 2 | ||||
-rw-r--r-- | TOOLS/vivodump.c | 10 | ||||
-rwxr-xr-x | TOOLS/vobshift.py | 6 | ||||
-rwxr-xr-x | TOOLS/w32codec_dl.pl | 17 |
26 files changed, 128 insertions, 138 deletions
diff --git a/TOOLS/aconvert.sh b/TOOLS/aconvert.sh index 37a031115f..1cae2732eb 100755 --- a/TOOLS/aconvert.sh +++ b/TOOLS/aconvert.sh @@ -9,5 +9,5 @@ if [ "$1" = "" ]; then fi options=${3:-"-oac mp3lame"} - + mencoder -demuxer rawvideo -rawvideo w=1:h=1 -ovc copy -of rawaudio -endpos `mplayer -identify $1 -frames 0 2>&1 | grep ID_LENGTH | cut -d "=" -f 2` -audiofile $1 -o $2 $options $1 diff --git a/TOOLS/asfinfo.c b/TOOLS/asfinfo.c index fc5c76cc79..37eb7c39e7 100644 --- a/TOOLS/asfinfo.c +++ b/TOOLS/asfinfo.c @@ -270,4 +270,3 @@ int main(int argc, char* argv[]){ return 0; } - diff --git a/TOOLS/avisubdump.c b/TOOLS/avisubdump.c index 9606137e0c..8afd12ec5b 100644 --- a/TOOLS/avisubdump.c +++ b/TOOLS/avisubdump.c @@ -180,4 +180,3 @@ int main(int argc,char* argv[]) return 0; } - diff --git a/TOOLS/bmovl-test.c b/TOOLS/bmovl-test.c index cb4b4ebf8b..45fa409dce 100644 --- a/TOOLS/bmovl-test.c +++ b/TOOLS/bmovl-test.c @@ -15,10 +15,10 @@ blit(int fifo, unsigned char *bitmap, int width, int height, { char str[100]; int nbytes; - + sprintf(str, "RGBA32 %d %d %d %d %d %d\n", width, height, xpos, ypos, alpha, clear); - + if(DEBUG) printf("Sending %s", str); write(fifo, str, strlen(str)); @@ -33,7 +33,7 @@ set_alpha(int fifo, int width, int height, int xpos, int ypos, int alpha) { sprintf(str, "ALPHA %d %d %d %d %d\n", width, height, xpos, ypos, alpha); - + if(DEBUG) printf("Sending %s", str); write(fifo, str, strlen(str)); @@ -110,7 +110,7 @@ int main(int argc, char **argv) { for(i=-255; i <= 0; i++) set_alpha(fifo, image->w, image->h, (width/2)-(image->w/2), (height/2)-(image->h/2), i); - + // Clean up free(bitmap); diff --git a/TOOLS/calcbpp.pl b/TOOLS/calcbpp.pl index 85fbb7a683..e1626f8ce8 100755 --- a/TOOLS/calcbpp.pl +++ b/TOOLS/calcbpp.pl @@ -4,7 +4,7 @@ use POSIX; sub round { my $v = shift; - + return floor($v + 0.5); } diff --git a/TOOLS/compare.c b/TOOLS/compare.c index 67aa8ac1c2..8a48bc8255 100644 --- a/TOOLS/compare.c +++ b/TOOLS/compare.c @@ -71,4 +71,3 @@ int main(int argc, char **argv) printf("%d (+/-1)differences found\n", dif); exit(0); } - diff --git a/TOOLS/divx2svcd.sh b/TOOLS/divx2svcd.sh index 4782dd679c..4192e0f782 100755 --- a/TOOLS/divx2svcd.sh +++ b/TOOLS/divx2svcd.sh @@ -315,7 +315,7 @@ if [ "$burning" = 1 ]; then cat <<EOF Please insert a blank cd in your cdwriter. -(If you are using a rewritable media, +(If you are using a rewritable media, don't forgot to blank it before using divx2svcd.) Press any key when your are ready. EOF diff --git a/TOOLS/mencvcd.sh b/TOOLS/mencvcd.sh index 95cfbb2ebf..c03f3486a6 100755 --- a/TOOLS/mencvcd.sh +++ b/TOOLS/mencvcd.sh @@ -31,7 +31,7 @@ done ################################################################################ # # 2002/04/11 v0.1.0: first version -# 2002/04/12 v0.1.1: +# 2002/04/12 v0.1.1: # 2002/04/14 v0.1.2: # - handles now multiple vcd's # - support's mp3 audio as option @@ -81,7 +81,7 @@ done TMPDIR="." # path to directory for creating temporary files, recommended 2-3GB space CDDRV="generic-mmc" # cdrdao: cdwriter driver -CDDEV="--device 0,1,0" # or comment out and create link /dev/cdrecorder +CDDEV="--device 0,1,0" # or comment out and create link /dev/cdrecorder # to your cdwriter dev CDMAXSIZE=800 @@ -170,7 +170,7 @@ usage() { HOWCALLED=`basename $0` if [ $# -le 1 ]; then - usage + usage exit 1 fi case $1 in @@ -359,19 +359,19 @@ if [ $burnonly -eq 0 ]; then command="mplayer -noframedrop -vo yuv4mpeg -ao pcm:waveheader -v -osdlevel 0 $sub $params" echo "$command" $command & - + # mjpegtools ($denoise < $VIDEO | \ yuvscaler -v 0 $wide -O $vnorm $size $yuvin | \ mpeg2enc -v 0 -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 -r 16 \ $pd $framerate $yuvin -4 2 -2 1 -o $NAME.mpv) & - + # wait for finishing the subprocesses wait # normalize sound [ $norm -eq 1 ] && (echo "normalizing sound..."; normalize $AUDIO) - + # do resampling with sox if [ $sox -ne 0 ]; then echo "wait, do resampling with sox..." @@ -384,7 +384,7 @@ if [ $burnonly -eq 0 ]; then echo "wait, encoding to mp2 audio with toolame..." toolame -b $abr $AUDIO mv -f `basename $AUDIO .wav`.mp2 $NAME.mpa - elif [ $toolame -eq 0 -a $mp3 -eq 0 ]; then + elif [ $toolame -eq 0 -a $mp3 -eq 0 ]; then # mp2enc/lame can't read audiodump.wav directly from named pipe, # we have to read the whole file. echo "wait, encoding to mp2 audio with mp2enc..." @@ -405,12 +405,12 @@ if [ $burnonly -eq 0 ]; then # remove pipe, won't need anymore! rm -f $VIDEO - + # should i create only the mpeg file? [ $mpgonly -eq 1 ] && exit 0 # create cd images - for mpg in ${NAME}*.mpg; do + for mpg in ${NAME}*.mpg; do [ -f $mpg ] || exit 1 cue="`basename $mpg .mpg`.cue" bin="`basename $mpg .mpg`.bin" diff --git a/TOOLS/modify_reg.c b/TOOLS/modify_reg.c index 2bd40a91f0..888d9eac32 100644 --- a/TOOLS/modify_reg.c +++ b/TOOLS/modify_reg.c @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) { if (c == EOF) break; switch(c) { - case 'r': + case 'r': localregpathname = optarg; break; case 'l': @@ -180,4 +180,3 @@ int main(int argc, char *argv[]) { } return 0; } - diff --git a/TOOLS/movinfo.c b/TOOLS/movinfo.c index a021dc78bb..3f840bfea3 100644 --- a/TOOLS/movinfo.c +++ b/TOOLS/movinfo.c @@ -8,9 +8,9 @@ By older files, mdat is at the beginning, and moov follows it later, by newer files, moov is at the begininng. - + Fontosabb typeok: - + trak: track: ezeken belul van egy-egy stream (video/audio) tkhd: track header: fps (video esten picture size is itt van) vmhd: video media handler (video stream informaciok) @@ -113,7 +113,7 @@ static void userdata_info(FILE *f, int len, int pos, int level) { atom_size=read_dword(f);// if(fread(&atom_size_b,4,1,f)<=0) break; if(fread(&atom_type,4,1,f)<=0) break; - + if(atom_size<8) break; // error // printf("%08X: %*s %.4s (%08X) %05d (begin: %08X)\n",pos,level*2,"", @@ -124,7 +124,7 @@ static void userdata_info(FILE *f, int len, int pos, int level) case 0x797063A9: /* cpy (copyright) */ { char *data = malloc(atom_size-8); - + fseek(f, pos+6, SEEK_SET); fread(data, atom_size-8, 1, f); printf(" Copyright: %s\n", data); @@ -134,7 +134,7 @@ static void userdata_info(FILE *f, int len, int pos, int level) case 0x666E69A9: /* inf (information) */ { char data[atom_size-8]; - + fread(&data, 1, atom_size-8, f); printf(" Owner: %s\n", &data); } @@ -142,7 +142,7 @@ static void userdata_info(FILE *f, int len, int pos, int level) case 0x6D616EA9: /* nam (name) */ { char data[atom_size-8]; - + fread(&data, 1, atom_size-8, f); printf(" Name: %s\n", &data); } @@ -164,9 +164,9 @@ static void lschunks(FILE *f,int level,unsigned int endpos){ pos=ftell(f); atom_size=read_dword(f);// if(fread(&atom_size_b,4,1,f)<=0) break; if(fread(&atom_type,4,1,f)<=0) break; - + if(atom_size<8) break; // error - + printf("%08X: %*s %.4s (%08X) %05d [%s] (begin: %08X)\n",pos,level*2,"",&atom_type,atom_type,atom_size, atom2human_type(atom_type), pos+8); // 8: atom_size fields (4) + atom_type fields (4) @@ -177,7 +177,7 @@ static void lschunks(FILE *f,int level,unsigned int endpos){ if (atom_type == 0x6468646D) { char data[4]; - + fread(&data, 1, 1, f); // char printf("mdhd version %d\n", data[0]); fread(&data, 3, 1, f); // int24 @@ -196,7 +196,7 @@ static void lschunks(FILE *f,int level,unsigned int endpos){ stream = S_VIDEO; printf(" Found VIDEO Stream #%d\n", v_stream++); } - + if (atom_type == 0x64686D73) { stream = S_AUDIO; @@ -219,7 +219,7 @@ static void lschunks(FILE *f,int level,unsigned int endpos){ if (x == 0 && y == 0) printf(" Possible audio stream!\n"); } - + if(atom_type==0x64737473) { // stsd unsigned int tmp; unsigned int count; @@ -240,7 +240,7 @@ static void lschunks(FILE *f,int level,unsigned int endpos){ fseek(f,len-8,SEEK_CUR); } } - + if(atom_type==0x6F637473) { // stco int len,i; read_dword(f); @@ -292,7 +292,7 @@ static void lschunks(FILE *f,int level,unsigned int endpos){ } } #endif - + #if 1 switch(atom_type){ case 0x7461646D: // mdat Movie data @@ -326,7 +326,7 @@ static void lschunks(FILE *f,int level,unsigned int endpos){ int main(int argc,char* argv[]) { FILE *f; - + if ((f = fopen(argc>1?argv[1]:"Akira.mov","rb")) == NULL) return 1; diff --git a/TOOLS/netstream.c b/TOOLS/netstream.c index 300b1d3f80..e7f95817e5 100644 --- a/TOOLS/netstream.c +++ b/TOOLS/netstream.c @@ -108,7 +108,7 @@ static int net_stream_open(client_t* cl,char* url) { static int net_stream_fill_buffer(client_t* cl,uint16_t max_len) { int r; mp_net_stream_packet_t *pack; - + if(!cl->stream) { if(!write_error(cl->fd,"No stream is currently opened\n")) return 0; @@ -132,7 +132,7 @@ static int net_stream_fill_buffer(client_t* cl,uint16_t max_len) { } static int net_stream_seek(client_t* cl, uint64_t pos) { - + if(!cl->stream) { if(!write_error(cl->fd,"No stream is currently opened\n")) return 0; @@ -180,7 +180,7 @@ static int handle_client(client_t* cl,mp_net_stream_packet_t* pack) { if(!pack) return 0; - + switch(pack->cmd) { case NET_STREAM_OPEN: if(((char*)pack)[pack->len-1] != '\0') { @@ -239,7 +239,7 @@ static int make_fd_set(fd_set* fds, client_t** _cl, int listen) { if(cl->stream) free_stream(cl->stream); if(!cl->prev) // Remove the head *_cl = cl->next; - cl = cl->next; + cl = cl->next; free(f); continue; } @@ -276,7 +276,7 @@ static int main_loop(int listen_fd) { signal(SIGHUP,exit_sig); // kill -HUP / xterm closed signal(SIGINT,exit_sig); // Interrupt from keyboard signal(SIGQUIT,exit_sig); // Quit from keyboard -#endif +#endif while(run_server) { int sel_n = make_fd_set(&fds,&clients,listen_fd); @@ -338,7 +338,7 @@ int main(void) { mp_msg_init(); // mp_msg_set_level(verbose+MSGL_STATUS); - + #ifdef __MINGW32__ WSADATA wsaData; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -356,7 +356,7 @@ int main(void) { mp_msg(MSGT_NETST,MSGL_FATAL,"Failed to bind listen socket: %s\n",strerror(errno)); return -1; } - + if(listen(listen_fd,1)) { mp_msg(MSGT_NETST,MSGL_FATAL,"Failed to turn the socket in listen state: %s\n",strerror(errno)); diff --git a/TOOLS/plotpsnr.pl b/TOOLS/plotpsnr.pl index 321dc3bf39..8124d317b5 100755 --- a/TOOLS/plotpsnr.pl +++ b/TOOLS/plotpsnr.pl @@ -216,7 +216,7 @@ sub commandline { "iframes" => \$options{iframes}, "pframes" => \$options{pframes}, "bframes" => \$options{bframes}, - "aframes" => sub { $options{iframes} = 1; + "aframes" => sub { $options{iframes} = 1; $options{pframes} = 1; $options{bframes} = 1; }, "qs=s" => \$options{qs}, diff --git a/TOOLS/qepdvcd.sh b/TOOLS/qepdvcd.sh index a436e17c37..0cc1e187e5 100755 --- a/TOOLS/qepdvcd.sh +++ b/TOOLS/qepdvcd.sh @@ -3,23 +3,23 @@ # QEPDVCD # # Most of this stuff comes straight from MPlayer documentation. -# Options are limited only to a small useful subset, if you +# Options are limited only to a small useful subset, if you # want more control, RTFM and DIY. # # Version: 0.1 # # Licence: GPL # -# Author: Reynaldo H. Verdejo Pinochet <reynaldo@opendot.cl> +# Author: Reynaldo H. Verdejo Pinochet <reynaldo@opendot.cl> # -# Script: MPlayer Sources. Anything supported to vcd/svcd pal/ntsc +# Script: MPlayer Sources. Anything supported to vcd/svcd pal/ntsc # # requires: mencoder # -# sugests: vcdimager / cdrecord +# sugests: vcdimager / cdrecord # # Thanks to: Carlos Navarro Salas - name author ;) -# +# # # Defaults @@ -276,7 +276,7 @@ for j in $(seq 0 $CICLES); do fi done fi - + # Mencoder Time ;-) ################################################### mencoder \ diff --git a/TOOLS/realcodecs/14_4.c b/TOOLS/realcodecs/14_4.c index 6def97af46..f0e1762f4e 100644 --- a/TOOLS/realcodecs/14_4.c +++ b/TOOLS/realcodecs/14_4.c @@ -137,7 +137,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -157,7 +157,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -177,7 +177,7 @@ static int pkno=0; ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); fprintf(stderr, "ulong src=0x%0lx,\n", p2); fprintf(stderr, "ulong len=0x%0lx,", p3); @@ -261,7 +261,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) { // memset(temp2,0x77,256); // memcpy(temp2,temp[6],16); // temp[6]=temp2; - + result=(*raInitDecoder)(p1,/*temp*/p2); // hexdump((void*)temp[6], 32); // memcpy(p2,temp,4*11); @@ -310,6 +310,6 @@ ulong RASetFlavor(ulong p1) { fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); #endif - + return result; } diff --git a/TOOLS/realcodecs/28_8.c b/TOOLS/realcodecs/28_8.c index 6634c4afde..c9aa525bb9 100644 --- a/TOOLS/realcodecs/28_8.c +++ b/TOOLS/realcodecs/28_8.c @@ -137,7 +137,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -157,7 +157,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -177,7 +177,7 @@ static int pkno=0; ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); fprintf(stderr, "ulong src=0x%0lx,\n", p2); fprintf(stderr, "ulong len=0x%0lx,", p3); @@ -261,7 +261,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) { // memset(temp2,0x77,256); // memcpy(temp2,temp[6],16); // temp[6]=temp2; - + result=(*raInitDecoder)(p1,/*temp*/p2); // hexdump((void*)temp[6], 32); // memcpy(p2,temp,4*11); @@ -310,6 +310,6 @@ ulong RASetFlavor(ulong p1) { fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); #endif - + return result; } diff --git a/TOOLS/realcodecs/cook.c b/TOOLS/realcodecs/cook.c index 8a8310d72e..ede9a33aca 100644 --- a/TOOLS/realcodecs/cook.c +++ b/TOOLS/realcodecs/cook.c @@ -184,7 +184,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -204,7 +204,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -224,7 +224,7 @@ static int pkno=0; ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); fprintf(stderr, "ulong src=0x%0lx,\n", p2); fprintf(stderr, "ulong len=0x%0lx,", p3); @@ -344,7 +344,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) { memset(temp2,0x77,256); memcpy(temp2,temp[6],16); temp[6]=temp2; - + result=(*raInitDecoder)(p1,temp); hexdump((void*)temp[6], 32); // memcpy(p2,temp,4*11); @@ -414,7 +414,7 @@ ulong RASetFlavor(ulong p1,ulong p2) { fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); #endif - + return result; } @@ -426,4 +426,3 @@ void SetDLLAccessPath(ulong p1) { hexdump((void*)p1, 44); fprintf(stderr, "--> void\n\n\n"); } - diff --git a/TOOLS/realcodecs/drv2.c b/TOOLS/realcodecs/drv2.c index c4de76f1f2..278188afea 100644 --- a/TOOLS/realcodecs/drv2.c +++ b/TOOLS/realcodecs/drv2.c @@ -161,7 +161,7 @@ static void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); + fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -181,7 +181,7 @@ static void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -195,15 +195,15 @@ ulong RV20toYUV420CustomMessage(ulong* p1,ulong p2) { /* if(p1[0]!=17) return 0; - + if(p1[1]!=1) return 0; - + if(p1[0]==105) return 0; if(p1[0]==3) return 0; if(p1[0]==18) return 0; if(p1[0]==30) return 0; */ - + if(p1[0]==0x24){ #if 1 hexdump(p1[2],64); @@ -257,9 +257,9 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // hexdump((void*)p1, sizeof(struct init_data)); fprintf(stderr,">HIVE %ld %p\n",p1[0],p1[1]); - + if(p1[0]!=0) return 0; - + p1[1]=0x10000000; return 0; @@ -267,7 +267,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { memset(h_temp,0x77,1000); memcpy(h_temp,p1,4); // fprintf(stderr,"COPY OK!\n"); - + // tic(); // result=(*rvyuvHiveMessage)(p1,p2); result=(*rvyuvHiveMessage)(h_temp,p2); @@ -281,7 +281,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // p1[0]=0; // p1[1]=0x20000000; - + fprintf(stderr,"<HIVE %ld %p\n",p1[0],p1[1]); // hexdump((void*)p1, sizeof(struct init_data)); @@ -387,28 +387,28 @@ ulong RV20toYUV420Transform(ulong p1,ulong p2,ulong p3,ulong p4,ulong p5) { pch=p1; crc_src=build_crc(pch, pp3[0]); - pp4=pp3[3]; + pp4=pp3[3]; fprintf(stderr,"transin1[%p]: {%ld/%ld} ",pp4,pp3[2],pp3[0]); // pp4[0],pp4[1],pp4[2],pp4[3], // pp4[4],pp4[5],pp4[6],pp4[7]); - + memset(temp,0x77,128*4); - + memcpy(temp,pp4,8*(pp3[2]+1)); for(i=0;i<=pp3[2];i++){ fprintf(stderr," %p(%ld)",temp[i*2],temp[i*2+1]); } fprintf(stderr,"\n"); - + pp3[3]=pp4=temp; - + // pp4[2]= // pp4[3]= // pp4[4]=NULL; - + //pp4[6]=pp4[5]; - + v=p5; /* fprintf(stderr, "rvyuvMain=0x%0x\n", v); v+=0x3c; @@ -431,7 +431,7 @@ ulong RV20toYUV420Transform(ulong p1,ulong p2,ulong p3,ulong p4,ulong p5) { fprintf(stderr, "[$+178h]=0x%0x\n", v); hexdump(v, 128); } -*/ +*/ // tic(); result=(*rvyuvTransform)(p1,p2,p3,p4,p5); // toc(); diff --git a/TOOLS/realcodecs/drv3.c b/TOOLS/realcodecs/drv3.c index 5d03a023d5..25556d4f42 100644 --- a/TOOLS/realcodecs/drv3.c +++ b/TOOLS/realcodecs/drv3.c @@ -161,7 +161,7 @@ static void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); + fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -181,7 +181,7 @@ static void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -242,7 +242,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { memset(h_temp,0x77,1000); memcpy(h_temp,p1,4); fprintf(stderr,"COPY OK!\n"); - + // tic(); // result=(*rvyuvHiveMessage)(p1,p2); result=(*rvyuvHiveMessage)(h_temp,p2); @@ -256,7 +256,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // p1[0]=0; // p1[1]=0x20000000; - + fprintf(stderr,"<HIVE %ld %p\n",p1[0],p1[1]); // hexdump((void*)p1, sizeof(struct init_data)); @@ -362,28 +362,28 @@ ulong RV20toYUV420Transform(ulong p1,ulong p2,ulong p3,ulong p4,ulong p5) { pch=p1; crc_src=build_crc(pch, pp3[0]); - pp4=pp3[3]; + pp4=pp3[3]; fprintf(stderr,"transin1[%p]: {%ld/%ld} ",pp4,pp3[2],pp3[0]); // pp4[0],pp4[1],pp4[2],pp4[3], // pp4[4],pp4[5],pp4[6],pp4[7]); - + memset(temp,0x77,128*4); - + memcpy(temp,pp4,8*(pp3[2]+1)); for(i=0;i<=pp3[2];i++){ fprintf(stderr," %p(%ld)",temp[i*2],temp[i*2+1]); } fprintf(stderr,"\n"); - + pp3[3]=pp4=temp; - + // pp4[2]= // pp4[3]= // pp4[4]=NULL; - + //pp4[6]=pp4[5]; - + v=p5; /* fprintf(stderr, "rvyuvMain=0x%0x\n", v); v+=0x3c; @@ -406,7 +406,7 @@ ulong RV20toYUV420Transform(ulong p1,ulong p2,ulong p3,ulong p4,ulong p5) { fprintf(stderr, "[$+178h]=0x%0x\n", v); hexdump(v, 128); } -*/ +*/ // tic(); result=(*rvyuvTransform)(p1,p2,p3,p4,p5); // toc(); diff --git a/TOOLS/realcodecs/drv4.c b/TOOLS/realcodecs/drv4.c index 63eab69a21..ad68c1ac36 100644 --- a/TOOLS/realcodecs/drv4.c +++ b/TOOLS/realcodecs/drv4.c @@ -133,7 +133,7 @@ static void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); + fprintf(stderr, "#R# %0x ", (int)cpos-(int)pos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -153,7 +153,7 @@ static void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); } @@ -214,7 +214,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { memset(h_temp,0x77,1000); memcpy(h_temp,p1,4); fprintf(stderr,"COPY OK!\n"); - + // tic(); // result=(*rvyuvHiveMessage)(p1,p2); result=(*rvyuvHiveMessage)(h_temp,p2); @@ -228,7 +228,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,ulong p2) { // p1[0]=0; // p1[1]=0x20000000; - + fprintf(stderr,"<HIVE %ld %p\n",p1[0],p1[1]); // hexdump((void*)p1, sizeof(struct init_data)); @@ -334,28 +334,28 @@ ulong RV20toYUV420Transform(ulong p1,ulong p2,ulong p3,ulong p4,ulong p5) { pch=p1; crc_src=build_crc(pch, pp3[0]); - pp4=pp3[3]; + pp4=pp3[3]; fprintf(stderr,"transin1[%p]: {%ld/%ld} ",pp4,pp3[2],pp3[0]); // pp4[0],pp4[1],pp4[2],pp4[3], // pp4[4],pp4[5],pp4[6],pp4[7]); - + memset(temp,0x77,128*4); - + memcpy(temp,pp4,8*(pp3[2]+1)); for(i=0;i<=pp3[2];i++){ fprintf(stderr," %p(%ld)",temp[i*2],temp[i*2+1]); } fprintf(stderr,"\n"); - + pp3[3]=pp4=temp; - + // pp4[2]= // pp4[3]= // pp4[4]=NULL; - + //pp4[6]=pp4[5]; - + v=p5; /* fprintf(stderr, "rvyuvMain=0x%0x\n", v); v+=0x3c; @@ -378,7 +378,7 @@ ulong RV20toYUV420Transform(ulong p1,ulong p2,ulong p3,ulong p4,ulong p5) { fprintf(stderr, "[$+178h]=0x%0x\n", v); hexdump(v, 128); } -*/ +*/ // tic(); result=(*rvyuvTransform)(p1,p2,p3,p4,p5); // toc(); @@ -402,4 +402,3 @@ ulong RV20toYUV420Transform(ulong p1,ulong p2,ulong p3,ulong p4,ulong p5) { // fprintf(stderr, "RV20toYUV420Transform --> 0x%0lx(%ld)\n\n\n", result, result); return result; } - diff --git a/TOOLS/realcodecs/ra.c b/TOOLS/realcodecs/ra.c index 816a6c1802..fd6d55a688 100644 --- a/TOOLS/realcodecs/ra.c +++ b/TOOLS/realcodecs/ra.c @@ -183,7 +183,7 @@ void hexdump(void *pos, int len) { int lines=(len+15)>>4; while(lines--) { int len1=len, i; - fprintf(stderr, "%0x ", cpos); + fprintf(stderr, "%0x ", cpos); cpos1=cpos; for (i=0;i<16;i++) { if (len1>0) { @@ -203,7 +203,7 @@ void hexdump(void *pos, int len) { } len--; } - fputs("\n", stderr); + fputs("\n", stderr); } fputc('\n', stderr); |