From eedee0b02f4065a2a76afe06aa0a67bfa8606bb5 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 27 Jul 2003 22:15:08 +0000 Subject: dump extra bytes of bitmapinfoheader in verbose mode and make outputs consistent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10485 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/aviprint.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libmpdemux/aviprint.c') diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index bdca364c36..0f582da5a9 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -37,10 +37,11 @@ void print_avih(MainAVIHeader *h){ printf("streams: %ld\n",h->dwStreams); printf("Suggested BufferSize: %ld\n",h->dwSuggestedBufferSize); printf("Size: %ld x %ld\n",h->dwWidth,h->dwHeight); + printf("==========================\n"); } void print_strh(AVIStreamHeader *h){ - printf("======= STREAM Header =======\n"); + printf("====== STREAM Header =====\n"); printf("Type: %.4s FCC: %.4s (%X)\n",(char *)&h->fccType,(char *)&h->fccHandler,(unsigned int)h->fccHandler); printf("Flags: %ld\n",h->dwFlags); printf("Priority: %d Language: %d\n",h->wPriority,h->wLanguage); @@ -50,6 +51,7 @@ void print_strh(AVIStreamHeader *h){ printf("Suggested BufferSize: %ld\n",h->dwSuggestedBufferSize); printf("Quality %ld\n",h->dwQuality); printf("Sample size: %ld\n",h->dwSampleSize); + printf("==========================\n"); } void print_wave_header(WAVEFORMATEX *h){ @@ -78,6 +80,7 @@ void print_wave_header(WAVEFORMATEX *h){ printf("[%x] ", *(p+i)); printf("\n"); } + printf("===========================\n"); } @@ -90,6 +93,15 @@ void print_video_header(BITMAPINFOHEADER *h){ printf(" biBitCount %d\n", h->biBitCount); printf(" biCompression %d='%.4s'\n", h->biCompression, (char *)&h->biCompression); printf(" biSizeImage %d\n", h->biSizeImage); + if (h->biSize > sizeof(BITMAPINFOHEADER)) + { + int i; + uint8_t* p = ((uint8_t*)h) + sizeof(BITMAPINFOHEADER); + printf("Unknown extra header dump: "); + for (i = 0; i < h->biSize-sizeof(BITMAPINFOHEADER); i++) + printf("[%x] ", *(p+i)); + printf("\n"); + } printf("===========================\n"); } -- cgit v1.2.3