[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[410] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[410] mplayerxp
|
From: <nic...@us...> - 2012-11-19 13:14:31
|
Revision: 410
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=410&view=rev
Author: nickols_k
Date: 2012-11-19 13:14:21 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
cleanups
Modified Paths:
--------------
mplayerxp/libmpdemux/Makefile
mplayerxp/libmpstream/mrl.c
mplayerxp/libmpstream/realrtsp/md5.c
mplayerxp/libmpsub/subreader.c
mplayerxp/libvo/jpeg_enc.c
mplayerxp/loader/dshow/Makefile
Added Paths:
-----------
TOOLS/examples/
TOOLS/examples/demux_test.c
TOOLS/examples/dshow_test.c
TOOLS/examples/dump_subs.c
TOOLS/examples/test.divx
TOOLS/examples/test_av_md5.c
TOOLS/examples/test_jpegenc.c
TOOLS/examples/test_mrl.c
Removed Paths:
-------------
mplayerxp/libmpdemux/test.c
mplayerxp/loader/dshow/test.c
mplayerxp/loader/dshow/test.divx
Copied: TOOLS/examples/demux_test.c (from rev 409, mplayerxp/libmpdemux/test.c)
===================================================================
--- TOOLS/examples/demux_test.c (rev 0)
+++ TOOLS/examples/demux_test.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -0,0 +1,58 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../mp_config.h"
+
+#include "libmpstream/stream.h"
+#include "demuxer.h"
+#include "stheader.h"
+#include "demux_msg.h"
+
+//--------------------------
+
+// audio stream skip/resync functions requires only for seeking.
+// (they should be implemented in the audio codec layer)
+void mpca_skip_frame(sh_audio_t *sh_audio){
+}
+void mpca_resync_stream(sh_audio_t *sh_audio){
+}
+
+int verbose=5; // must be global!
+
+//---------------
+
+extern stream_t* open_stream(amy_t*libinput,char* filename,int* file_format);
+
+int main(int argc,char* argv[]){
+
+stream_t* stream=NULL;
+demuxer_t* demuxer=NULL;
+int file_format=DEMUXER_TYPE_UNKNOWN;
+
+ mp_msg_init(verbose+MSGL_STATUS);
+
+ if(argc>1)
+ stream=open_stream(NULL,argv[1],0,&file_format);
+ else
+// stream=open_stream("/3d/divx/405divx_sm_v2[1].avi",0,&file_format);
+ stream=open_stream(NULL,"/dev/cdrom",2,&file_format); // VCD track 2
+
+ if(!stream){
+ printf("Cannot open file/device\n");
+ exit(1);
+ }
+
+ printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
+
+ stream_enable_cache(stream,NULL,2048*1024,0,0);
+
+ demuxer=demux_open(stream,file_format,-1,-1,-1);
+ if(!demuxer){
+ printf("Cannot open demuxer\n");
+ exit(1);
+ }
+
+
+}
Copied: TOOLS/examples/dshow_test.c (from rev 409, mplayerxp/loader/dshow/test.c)
===================================================================
--- TOOLS/examples/dshow_test.c (rev 0)
+++ TOOLS/examples/dshow_test.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -0,0 +1,67 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "formats.h"
+#include "com.h"
+
+#include "DS_VideoDec.h"
+
+int main(int argc,char* argv[]){
+ FILE *f;
+ BITMAPINFOHEADER bih;
+ int len;
+ char *src;
+ char *dst=0;
+ GUID CLSID_DivxDecompressorCF={0x82CCd3E0, 0xF71A, 0x11D0,
+ { 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa}};
+
+ f=fopen("test.divx","rb");
+
+ fread(&bih,sizeof(BITMAPINFOHEADER),1,f);
+ printf("frame dim: %d x %d \n",(int)bih.biWidth,(int)bih.biHeight);
+
+ src=(char*)mp_malloc(512000);
+ len=fread(src,1,512000,f);
+ printf("frame len = %d\n",len);
+
+ DS_VideoDecoder_Open("divx_c32.ax", &CLSID_DivxDecompressorCF, &bih, 0, &dst);
+
+// DS_VideoDecoder_SetDestFmt(16,fccYUY2);
+ DS_VideoDecoder_SetDestFmt(24,0);
+
+ printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",4) );
+
+ DS_VideoDecoder_Start();
+
+ printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) );
+
+ DS_VideoDecoder_DecodeFrame(src, len, 1, 1);
+
+#if 0
+ f2=fopen("test.yuy2","wb");
+ fwrite(dst,bih.biWidth*bih.biHeight*2,1,f2);
+ fclose(f2);
+#endif
+
+ { unsigned char raw_head[32];
+ FILE *f3=fopen("test.raw","wb");
+
+ strcpy((char*)raw_head,"mhwanh");
+ raw_head[7]=4;
+ raw_head[8]=bih.biWidth>>8;
+ raw_head[9]=bih.biWidth&0xFF;
+ raw_head[10]=bih.biHeight>>8;
+ raw_head[11]=bih.biHeight&0xFF;
+ raw_head[12]=raw_head[13]=0; // 24bit
+ raw_head[14]=1;raw_head[15]=0x2C;
+ raw_head[16]=1;raw_head[17]=0x2C;
+ memset(raw_head+18,0,32-18);
+ fwrite(raw_head,32,1,f3);
+
+ fwrite(dst,bih.biWidth*bih.biHeight*3,1,f3);
+ fclose(f3);
+ }
+
+ fclose(f);
+ return 0;
+}
Added: TOOLS/examples/dump_subs.c
===================================================================
--- TOOLS/examples/dump_subs.c (rev 0)
+++ TOOLS/examples/dump_subs.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -0,0 +1,25 @@
+#include "libmpsub/subreader.h"
+
+#ifdef DUMPSUBS
+int main(int argc, char **argv) { // for testing
+
+ int i,j;
+ subtitle *subs;
+ subtitle *egysub;
+
+ if(argc<2){
+ printf("\nUsage: subreader filename.sub\n\n");
+ exit(1);
+ }
+ sub_cp = argv[2];
+ subs=sub_read_file(argv[1]);
+ if(!subs){
+ printf("Couldn't load file.\n");
+ exit(1);
+ }
+
+ list_sub_file(subs);
+
+ return 0;
+}
+#endif
Property changes on: TOOLS/examples/dump_subs.c
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: TOOLS/examples/test.divx (from rev 409, mplayerxp/loader/dshow/test.divx)
===================================================================
(Binary files differ)
Added: TOOLS/examples/test_av_md5.c
===================================================================
--- TOOLS/examples/test_av_md5.c (rev 0)
+++ TOOLS/examples/test_av_md5.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -0,0 +1,17 @@
+#ifdef TEST
+#include <stdio.h>
+#undef printf
+main(){
+ uint64_t md5val;
+ int i;
+ uint8_t in[1000];
+
+ for(i=0; i<1000; i++) in[i]= i*i;
+ av_md5_sum( (uint8_t*)&md5val, in, 1000); printf("%"PRId64"\n", md5val);
+ av_md5_sum( (uint8_t*)&md5val, in, 63); printf("%"PRId64"\n", md5val);
+ av_md5_sum( (uint8_t*)&md5val, in, 64); printf("%"PRId64"\n", md5val);
+ av_md5_sum( (uint8_t*)&md5val, in, 65); printf("%"PRId64"\n", md5val);
+ for(i=0; i<1000; i++) in[i]= i % 127;
+ av_md5_sum( (uint8_t*)&md5val, in, 999); printf("%"PRId64"\n", md5val);
+}
+#endif
Property changes on: TOOLS/examples/test_av_md5.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: TOOLS/examples/test_jpegenc.c
===================================================================
--- TOOLS/examples/test_jpegenc.c (rev 0)
+++ TOOLS/examples/test_jpegenc.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -0,0 +1,22 @@
+#define W 32
+#define H 32
+
+int quant_store[MBR+1][MBC+1];
+unsigned char buf[W*H*3/2];
+char code[256*1024];
+
+
+main() {
+ int i, size;
+ FILE *fp;
+
+ memset(buf, 0, W*H);
+ memset(buf+W*H, 255, W*H/4);
+ memset(buf+5*W*H/4, 0, W*H/4);
+ mjpeg_encoder_init(W, H, 1, W, 1, W/2, 1, W/2, 1, 1, 0);
+
+ size = mjpeg_encode_frame(buf, buf+W*H, buf+5*W*H/4, code);
+ fp = fopen("test.jpg", "w");
+ fwrite(code, 1, size, fp);
+ fclose(fp);
+}
Property changes on: TOOLS/examples/test_jpegenc.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: TOOLS/examples/test_mrl.c
===================================================================
--- TOOLS/examples/test_mrl.c (rev 0)
+++ TOOLS/examples/test_mrl.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -0,0 +1,33 @@
+#include "mrl.h"
+
+#ifdef TEST_MRL
+int main(int argc, char *argv[])
+{
+ char *user,*pass,*ms,*port;
+ const char *param;
+ if(argc < 2)
+ {
+ fprintf(stderr,"Needs argument\n");
+ return EXIT_FAILURE;
+ }
+ if(memcmp(argv[1],"mrl://",6)!=0)
+ {
+ fprintf(stderr,"argument's line doesn't start from 'mrl://'!\n");
+ return EXIT_FAILURE;
+ }
+ param=mrl_parse_line(&argv[1][6],&user,&pass,&ms,&port);
+ printf("Source line: '%s'\n",argv[1]);
+ printf("user: '%s'\n",user);
+ printf("pass: '%s'\n",pass);
+ printf("ms: '%s'\n",ms);
+ printf("port: '%s'\n",port);
+ printf("arguments: '%s'\n",param);
+ param=mrl_parse_params(param,NULL);
+ printf("unparsed params: '%s'\n",param);
+ if(user) mp_free(user);
+ if(pass) mp_free(pass);
+ if(ms) mp_free(ms);
+ if(port) mp_free(port);
+ return EXIT_SUCCESS;
+}
+#endif
Property changes on: TOOLS/examples/test_mrl.c
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: mplayerxp/libmpdemux/Makefile
===================================================================
--- mplayerxp/libmpdemux/Makefile 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/libmpdemux/Makefile 2012-11-19 13:14:21 UTC (rev 410)
@@ -60,9 +60,6 @@
$(wildcard realrtsp/*.o)
endif
-test: $(LIBNAME) test.c
- $(CC) $(CFLAGS) test.c ../mp_msg.c ../linux/shmem.c -o test -L. -lmpdemux -ldvdread -lz -lpthread
-
clean:
$(DO_MAKE)
rm -f *.o *.a *~
@@ -75,7 +72,7 @@
depend:
$(DO_MAKE)
- $(CC) -MM $(CFLAGS) test.c $(SRCS) $(CXXSRCS) 1>.depend
+ $(CC) -MM $(CFLAGS) $(SRCS) $(CXXSRCS) 1>.depend
#
# include dependency files if they exist
Deleted: mplayerxp/libmpdemux/test.c
===================================================================
--- mplayerxp/libmpdemux/test.c 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/libmpdemux/test.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -1,58 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../mp_config.h"
-
-#include "libmpstream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-#include "demux_msg.h"
-
-//--------------------------
-
-// audio stream skip/resync functions requires only for seeking.
-// (they should be implemented in the audio codec layer)
-void mpca_skip_frame(sh_audio_t *sh_audio){
-}
-void mpca_resync_stream(sh_audio_t *sh_audio){
-}
-
-int verbose=5; // must be global!
-
-//---------------
-
-extern stream_t* open_stream(amy_t*libinput,char* filename,int* file_format);
-
-int main(int argc,char* argv[]){
-
-stream_t* stream=NULL;
-demuxer_t* demuxer=NULL;
-int file_format=DEMUXER_TYPE_UNKNOWN;
-
- mp_msg_init(verbose+MSGL_STATUS);
-
- if(argc>1)
- stream=open_stream(NULL,argv[1],0,&file_format);
- else
-// stream=open_stream("/3d/divx/405divx_sm_v2[1].avi",0,&file_format);
- stream=open_stream(NULL,"/dev/cdrom",2,&file_format); // VCD track 2
-
- if(!stream){
- printf("Cannot open file/device\n");
- exit(1);
- }
-
- printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
-
- stream_enable_cache(stream,NULL,2048*1024,0,0);
-
- demuxer=demux_open(stream,file_format,-1,-1,-1);
- if(!demuxer){
- printf("Cannot open demuxer\n");
- exit(1);
- }
-
-
-}
Modified: mplayerxp/libmpstream/mrl.c
===================================================================
--- mplayerxp/libmpstream/mrl.c 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/libmpstream/mrl.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -177,35 +177,3 @@
if(value) mp_free(value);
return param;
}
-
-#ifdef TEST_MRL
-int main(int argc, char *argv[])
-{
- char *user,*pass,*ms,*port;
- const char *param;
- if(argc < 2)
- {
- fprintf(stderr,"Needs argument\n");
- return EXIT_FAILURE;
- }
- if(memcmp(argv[1],"mrl://",6)!=0)
- {
- fprintf(stderr,"argument's line doesn't start from 'mrl://'!\n");
- return EXIT_FAILURE;
- }
- param=mrl_parse_line(&argv[1][6],&user,&pass,&ms,&port);
- printf("Source line: '%s'\n",argv[1]);
- printf("user: '%s'\n",user);
- printf("pass: '%s'\n",pass);
- printf("ms: '%s'\n",ms);
- printf("port: '%s'\n",port);
- printf("arguments: '%s'\n",param);
- param=mrl_parse_params(param,NULL);
- printf("unparsed params: '%s'\n",param);
- if(user) mp_free(user);
- if(pass) mp_free(pass);
- if(ms) mp_free(ms);
- if(port) mp_free(port);
- return EXIT_SUCCESS;
-}
-#endif
Modified: mplayerxp/libmpstream/realrtsp/md5.c
===================================================================
--- mplayerxp/libmpstream/realrtsp/md5.c 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/libmpstream/realrtsp/md5.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -160,21 +160,3 @@
av_md5_update(ctx, src, len);
av_md5_final(ctx, dst);
}
-
-#ifdef TEST
-#include <stdio.h>
-#undef printf
-main(){
- uint64_t md5val;
- int i;
- uint8_t in[1000];
-
- for(i=0; i<1000; i++) in[i]= i*i;
- av_md5_sum( (uint8_t*)&md5val, in, 1000); printf("%"PRId64"\n", md5val);
- av_md5_sum( (uint8_t*)&md5val, in, 63); printf("%"PRId64"\n", md5val);
- av_md5_sum( (uint8_t*)&md5val, in, 64); printf("%"PRId64"\n", md5val);
- av_md5_sum( (uint8_t*)&md5val, in, 65); printf("%"PRId64"\n", md5val);
- for(i=0; i<1000; i++) in[i]= i % 127;
- av_md5_sum( (uint8_t*)&md5val, in, 999); printf("%"PRId64"\n", md5val);
-}
-#endif
Modified: mplayerxp/libmpsub/subreader.c
===================================================================
--- mplayerxp/libmpsub/subreader.c 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/libmpsub/subreader.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -858,27 +858,3 @@
mp_free( subs );
subs=NULL;
}
-
-#ifdef DUMPSUBS
-int main(int argc, char **argv) { // for testing
-
- int i,j;
- subtitle *subs;
- subtitle *egysub;
-
- if(argc<2){
- printf("\nUsage: subreader filename.sub\n\n");
- exit(1);
- }
- sub_cp = argv[2];
- subs=sub_read_file(argv[1]);
- if(!subs){
- printf("Couldn't load file.\n");
- exit(1);
- }
-
- list_sub_file(subs);
-
- return 0;
-}
-#endif
Modified: mplayerxp/libvo/jpeg_enc.c
===================================================================
--- mplayerxp/libvo/jpeg_enc.c 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/libvo/jpeg_enc.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -452,28 +452,3 @@
mp_free(j);
}
-#if 0
-
-#define W 32
-#define H 32
-
-int quant_store[MBR+1][MBC+1];
-unsigned char buf[W*H*3/2];
-char code[256*1024];
-
-
-main() {
- int i, size;
- FILE *fp;
-
- memset(buf, 0, W*H);
- memset(buf+W*H, 255, W*H/4);
- memset(buf+5*W*H/4, 0, W*H/4);
- mjpeg_encoder_init(W, H, 1, W, 1, W/2, 1, W/2, 1, 1, 0);
-
- size = mjpeg_encode_frame(buf, buf+W*H, buf+5*W*H/4, code);
- fp = fopen("test.jpg", "w");
- fwrite(code, 1, size, fp);
- fclose(fp);
-}
-#endif
Modified: mplayerxp/loader/dshow/Makefile
===================================================================
--- mplayerxp/loader/dshow/Makefile 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/loader/dshow/Makefile 2012-11-19 13:14:21 UTC (rev 410)
@@ -30,7 +30,7 @@
rm -f *.o $(LIBNAME) *~
distclean:
- rm -f Makefile.bak *.o $(LIBNAME) *~ .depend test test.raw
+ rm -f Makefile.bak *.o $(LIBNAME) *~ .depend
dep: depend
Deleted: mplayerxp/loader/dshow/test.c
===================================================================
--- mplayerxp/loader/dshow/test.c 2012-11-19 12:50:35 UTC (rev 409)
+++ mplayerxp/loader/dshow/test.c 2012-11-19 13:14:21 UTC (rev 410)
@@ -1,67 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "formats.h"
-#include "com.h"
-
-#include "DS_VideoDec.h"
-
-int main(int argc,char* argv[]){
- FILE *f;
- BITMAPINFOHEADER bih;
- int len;
- char *src;
- char *dst=0;
- GUID CLSID_DivxDecompressorCF={0x82CCd3E0, 0xF71A, 0x11D0,
- { 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa}};
-
- f=fopen("test.divx","rb");
-
- fread(&bih,sizeof(BITMAPINFOHEADER),1,f);
- printf("frame dim: %d x %d \n",(int)bih.biWidth,(int)bih.biHeight);
-
- src=(char*)mp_malloc(512000);
- len=fread(src,1,512000,f);
- printf("frame len = %d\n",len);
-
- DS_VideoDecoder_Open("divx_c32.ax", &CLSID_DivxDecompressorCF, &bih, 0, &dst);
-
-// DS_VideoDecoder_SetDestFmt(16,fccYUY2);
- DS_VideoDecoder_SetDestFmt(24,0);
-
- printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",4) );
-
- DS_VideoDecoder_Start();
-
- printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) );
-
- DS_VideoDecoder_DecodeFrame(src, len, 1, 1);
-
-#if 0
- f2=fopen("test.yuy2","wb");
- fwrite(dst,bih.biWidth*bih.biHeight*2,1,f2);
- fclose(f2);
-#endif
-
- { unsigned char raw_head[32];
- FILE *f3=fopen("test.raw","wb");
-
- strcpy((char*)raw_head,"mhwanh");
- raw_head[7]=4;
- raw_head[8]=bih.biWidth>>8;
- raw_head[9]=bih.biWidth&0xFF;
- raw_head[10]=bih.biHeight>>8;
- raw_head[11]=bih.biHeight&0xFF;
- raw_head[12]=raw_head[13]=0; // 24bit
- raw_head[14]=1;raw_head[15]=0x2C;
- raw_head[16]=1;raw_head[17]=0x2C;
- memset(raw_head+18,0,32-18);
- fwrite(raw_head,32,1,f3);
-
- fwrite(dst,bih.biWidth*bih.biHeight*3,1,f3);
- fclose(f3);
- }
-
- fclose(f);
- return 0;
-}
Deleted: mplayerxp/loader/dshow/test.divx
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
