From 7836116f5eaef346a418496b3f985a7c8b27b369 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 24 Mar 2007 13:17:39 +0000 Subject: Remove files maintained by Reimar that he no longer sees a use for. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22796 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/302m_convert.c | 125 --------------------------------- TOOLS/360m_convert.c | 41 ----------- TOOLS/Makefile | 7 +- TOOLS/README | 23 ------- TOOLS/gltest.c | 190 --------------------------------------------------- 5 files changed, 1 insertion(+), 385 deletions(-) delete mode 100644 TOOLS/302m_convert.c delete mode 100644 TOOLS/360m_convert.c delete mode 100644 TOOLS/gltest.c (limited to 'TOOLS') diff --git a/TOOLS/302m_convert.c b/TOOLS/302m_convert.c deleted file mode 100644 index 14c0af4b29..0000000000 --- a/TOOLS/302m_convert.c +++ /dev/null @@ -1,125 +0,0 @@ -/** - * convert D-Cinema Audio (probably SMPTE 302M) to a - * wav file that MPlayer can play. - * Usage: 302m_convert - */ -#include -#include -#include -#include -#define le2me_32(x) (x) -#define le2me_16(x) (x) -#define be2me_16(x) bswap_16(x) - -// From MPlayer libao/ao_pcm.c -#define WAV_ID_RIFF 0x46464952 /* "RIFF" */ -#define WAV_ID_WAVE 0x45564157 /* "WAVE" */ -#define WAV_ID_FMT 0x20746d66 /* "fmt " */ -#define WAV_ID_DATA 0x61746164 /* "data" */ -#define WAV_ID_PCM 0x0001 - -struct WaveHeader { - uint32_t riff; - uint32_t file_length; - uint32_t wave; - uint32_t fmt; - uint32_t fmt_length; - uint16_t fmt_tag; - uint16_t channels; - uint32_t sample_rate; - uint32_t bytes_per_second; - uint16_t block_align; - uint16_t bits; - uint32_t data; - uint32_t data_length; -}; - -static struct WaveHeader wavhdr = { - le2me_32(WAV_ID_RIFF), - le2me_32(0x7fffffff), - le2me_32(WAV_ID_WAVE), - le2me_32(WAV_ID_FMT), - le2me_32(16), - le2me_16(WAV_ID_PCM), - le2me_16(6), - le2me_32(96000), - le2me_32(1728000), - le2me_16(18), - le2me_16(24), - le2me_32(WAV_ID_DATA), - le2me_32(0x7fffffff), -}; - -// this format is completely braindead, and this bitorder -// is the result of pure guesswork (counting how often -// the bits flip), so it might be wrong. -void fixup(unsigned char *in_, unsigned char *out) { - int i; - unsigned char in[3] = {in_[0], in_[1], in_[2]}; - unsigned char sync = in[2] & 0x0f; // sync flags - in[2] >>= 4; - out[2] = 0; - for (i = 0; i < 4; i++) { - out[2] <<= 1; - out[2] |= in[2] & 1; - in[2] >>= 1; - } - for (i = 0; i < 4; i++) { - out[2] <<= 1; - out[2] |= in[1] & 1; - in[1] >>= 1; - } - out[1] = 0; - for (i = 0; i < 4; i++) { - out[1] <<= 1; - out[1] |= in[1] & 1; - in[1] >>= 1; - } - for (i = 0; i < 4; i++) { - out[1] <<= 1; - out[1] |= in[0] & 1; - in[0] >>= 1; - } - out[0] = 0; - for (i = 0; i < 4; i++) { - out[0] <<= 1; - out[0] |= in[0] & 1; - in[0] >>= 1; - } - out[0] <<= 4; - out[0] |= sync; // sync flags go into lowest bits - // it seems those might also contain audio data, - // don't know if this is the right order then - // these might be also useful to detect the number - // of channels in case there are files with != 6 channels -} - -int main(int argc, char *argv[]) { - FILE *in = fopen(argv[1], "r"); - FILE *out = fopen(argv[2], "w"); - int i; - uint16_t blocklen, unknown; - unsigned char *block; - if (!in) { - printf("Could not open %s for reading\n", argv[1]); - return EXIT_FAILURE; - } - if (!out) { - printf("Could not open %s for writing\n", argv[2]); - return EXIT_FAILURE; - } - fwrite(&wavhdr, 1, sizeof(wavhdr), out); - do { - fread(&blocklen, 2, 1, in); - blocklen = be2me_16(blocklen); - fread(&unknown, 2, 1, in); - block = malloc(blocklen); - blocklen = fread(block, 1, blocklen, in); - for (i = 0; i < blocklen; i += 3) - fixup(&block[i], &block[i]); - fwrite(block, 1, blocklen, out); - free(block); - } while (!feof(in)); - return EXIT_SUCCESS; -} - diff --git a/TOOLS/360m_convert.c b/TOOLS/360m_convert.c deleted file mode 100644 index 9664d65d05..0000000000 --- a/TOOLS/360m_convert.c +++ /dev/null @@ -1,41 +0,0 @@ -/** - * convert D-Cinema Video (MPEG2 in GXF, SMPTE 360M) to a - * MPEG-ES file that MPlayer can play (use -demuxer mpeges). - * Usage: 360m_convert - */ -#include -#include - -int main(int argc, char *argv[]) { - FILE *in = fopen(argv[1], "r"); - FILE *out = fopen(argv[2], "w"); - int discard = 0; - unsigned char buf[4]; - if (!in) { - printf("Could not open %s for reading\n", argv[1]); - return EXIT_FAILURE; - } - if (!out) { - printf("Could not open %s for writing\n", argv[2]); - return EXIT_FAILURE; - } - fread(buf, 4, 1, in); - do { - if (buf[0] == 0 && buf[1] == 0 && buf[2] == 1) { - // encountered a header - // skip data between a 0xbf or 0xbc header and the next 0x00 header - if (buf[3] == 0xbc || buf[3] == 0xbf) - discard = 1; - else if (buf[3] == 0) - discard = 0; - } - if (!discard) - fwrite(&buf[0], 1, 1, out); - buf[0] = buf[1]; - buf[1] = buf[2]; - buf[2] = buf[3]; - fread(&buf[3], 1, 1, in); - } while (!feof(in)); - return EXIT_SUCCESS; -} - diff --git a/TOOLS/Makefile b/TOOLS/Makefile index c9e1ac36b2..1d06608e8f 100644 --- a/TOOLS/Makefile +++ b/TOOLS/Makefile @@ -13,8 +13,6 @@ OBJS = alaw-gen$(EXESUF) \ png2raw$(EXESUF) \ subrip$(EXESUF) \ # vivodump$(EXESUF) \ - 302m_convert$(EXESUF) \ - 360m_convert$(EXESUF) \ ifeq ($(TARGET_ARCH_X86),yes) OBJS += cpuinfo$(EXESUF) fastmemcpybench @@ -48,13 +46,10 @@ fastmemcpybench: fastmemcpybench.c bmovl-test$(EXESUF): bmovl-test.c $(CC) -O3 $(EXTRA_INC) -o $@ $< -lSDL_image -gltest: gltest.c ../osdep/timer-lx.o - $(CC) -O4 -g -o $@ $^ -lglut - vfw2menc$(EXESUF): vfw2menc.c $(CC) $< -o $@ -lwinmm -lole32 clean distclean: rm -f $(OBJS) - rm -f fastmem-* fastmem2-* fastmemcpybench gltest + rm -f fastmem-* fastmem2-* fastmemcpybench rm -f cpuinfo$(EXESUF) bmovl-test$(EXESUF) vfw2menc$(EXESUF) diff --git a/TOOLS/README b/TOOLS/README index e440858d2c..ce565e5c67 100644 --- a/TOOLS/README +++ b/TOOLS/README @@ -605,26 +605,3 @@ Usage: vfw2menc -f -d -s -v|--view - displays the config dialog and do nothing Notes: Works on x86 only. - - - -Format conversion scripts in the TOOLS dir ------------------------------------------- - -302m_convert.c - -Author: Reimar Döffinger - -Description: Converts D-Cinema Audio (SMPTE 302M?) to WAV. - -Usage: 302m_convert - - -360m_convert.c - -Author: Reimar Döffinger - -Description: Converts D-Cinema Video (MPEG-2 in GXF, SMPTE 360M) to MPEG-ES. - Use -demuxer mpeges to play the converted file. - -Usage: 360m_convert diff --git a/TOOLS/gltest.c b/TOOLS/gltest.c deleted file mode 100644 index 1bfdce5e67..0000000000 --- a/TOOLS/gltest.c +++ /dev/null @@ -1,190 +0,0 @@ -// OpenGL glTexSubImage() test/benchmark prg (C) 2001. by A'rpi/ESP-team - -#include -#include -#include -#include -#include -#include - -// pixel size: 3 or 4 -#define BYTES_PP 3 - -// blit by lines (defined) or frames (not defined) -#define FAST_BLIT - -static uint32_t image_width=720; // DVD size -static uint32_t image_height=576; - -static uint32_t image_format; -static uint32_t image_bpp; -static uint32_t image_bytes; - -static uint32_t texture_width=512; -static uint32_t texture_height=512; - -static unsigned char *ImageData=NULL; - -static GLvoid resize(int x,int y){ - printf("Resize: %dx%d\n",x,y); - glViewport( 0, 0, x, y ); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, image_width, image_height, 0, -1,1); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); -} - -float akarmi=0; - -int counter=0; -float gen_time=0; -float up_time=0; -float render_time=0; - -unsigned char sintable[4096]; - -extern float GetRelativeTime(); - -static void redraw(void) -{ -// glClear(GL_COLOR_BUFFER_BIT); - int x,y,i; - unsigned char *d=ImageData; - int dstride=BYTES_PP*image_width; - - GetRelativeTime(); - - // generate some image: - for(y=0;y2.0){ - printf("%8.3f fps (gen: %2d%% upload: %2d%% render: %2d%%)\n", - (float)counter/total, - (int)(100.0*gen_time/total), - (int)(100.0*up_time/total), - (int)(100.0*render_time/total) - ); - gen_time=up_time=render_time=0; - counter=0; - } } - -} - -static GLvoid IdleFunc(){ - akarmi+=0.1; - glutPostRedisplay(); -} - -int -main(int argc, char **argv) -{ - int i; - - glutInit(&argc, argv); - glutInitWindowSize(640, 480); - glutInitDisplayMode(GLUT_DOUBLE); - (void) glutCreateWindow("csg"); - - glutDisplayFunc(redraw); - glutReshapeFunc(resize); - glutIdleFunc(IdleFunc); - - texture_width=32; - while(texture_width