Mercurial > mplayer.hg

comparison libmpdemux/aviprint.c @ 28190:321b70afabe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code simplification
author reimar
date Thu, 01 Jan 2009 11:41:09 +0000
parents 53cc0856f3fe
children d643e4643313
comparison
equal deleted inserted replaced
28189:dd53119e77c8 28190:321b70afabe1
72 mp_msg(MSGT_HEADER, verbose_level, "mp3.nCodecDelay=%d\n",h2->nCodecDelay); 72 mp_msg(MSGT_HEADER, verbose_level, "mp3.nCodecDelay=%d\n",h2->nCodecDelay);
73 } 73 }
74 else if (h->cbSize > 0) 74 else if (h->cbSize > 0)
75 { 75 {
76 int i; 76 int i;
77 uint8_t* p = ((uint8_t*)h) + sizeof(WAVEFORMATEX); 77 uint8_t* p = (uint8_t*)(h + 1);
78 mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: "); 78 mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: ");
79 for (i = 0; i < h->cbSize; i++) 79 for (i = 0; i < h->cbSize; i++)
80 mp_msg(MSGT_HEADER, verbose_level, "[%x] ", p[i]); 80 mp_msg(MSGT_HEADER, verbose_level, "[%x] ", p[i]);
81 mp_msg(MSGT_HEADER, verbose_level, "\n"); 81 mp_msg(MSGT_HEADER, verbose_level, "\n");
82 } 82 }
94 mp_msg(MSGT_HEADER, verbose_level, " biCompression %d='%.4s'\n", h->biCompression, (char *)&h->biCompression); 94 mp_msg(MSGT_HEADER, verbose_level, " biCompression %d='%.4s'\n", h->biCompression, (char *)&h->biCompression);
95 mp_msg(MSGT_HEADER, verbose_level, " biSizeImage %d\n", h->biSizeImage); 95 mp_msg(MSGT_HEADER, verbose_level, " biSizeImage %d\n", h->biSizeImage);
96 if (h->biSize > sizeof(BITMAPINFOHEADER)) 96 if (h->biSize > sizeof(BITMAPINFOHEADER))
97 { 97 {
98 int i; 98 int i;
99 uint8_t* p = ((uint8_t*)h) + sizeof(BITMAPINFOHEADER); 99 uint8_t* p = (uint8_t*)(h + 1);
100 mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: "); 100 mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: ");
101 for (i = 0; i < h->biSize-sizeof(BITMAPINFOHEADER); i++) 101 for (i = 0; i < h->biSize-sizeof(BITMAPINFOHEADER); i++)
102 mp_msg(MSGT_HEADER, verbose_level, "[%x] ", *(p+i)); 102 mp_msg(MSGT_HEADER, verbose_level, "[%x] ", *(p+i));
103 mp_msg(MSGT_HEADER, verbose_level, "\n"); 103 mp_msg(MSGT_HEADER, verbose_level, "\n");
104 } 104 }
133 133
134 void print_index(AVIINDEXENTRY *idx, int idx_size, int verbose_level){ 134 void print_index(AVIINDEXENTRY *idx, int idx_size, int verbose_level){
135 int i; 135 int i;
136 unsigned int pos[256]; 136 unsigned int pos[256];
137 unsigned int num[256]; 137 unsigned int num[256];
138 for(i=0;i<256;i++) num[i]=pos[i]=0; 138 memset(pos, 0, sizeof(pos));
139 memset(num, 0, sizeof(num));
139 for(i=0;i<idx_size;i++){ 140 for(i=0;i<idx_size;i++){
140 int id=avi_stream_id(idx[i].ckid); 141 int id=avi_stream_id(idx[i].ckid);
141 if(id<0 || id>255) id=255; 142 if(id<0 || id>255) id=255;
142 mp_msg(MSGT_HEADER, verbose_level, "%5d: %.4s %4X %016"PRIX64" len:%6"PRId32" pos:%7d->%7.3f %7d->%7.3f\n",i, 143 mp_msg(MSGT_HEADER, verbose_level, "%5d: %.4s %4X %016"PRIX64" len:%6"PRId32" pos:%7d->%7.3f %7d->%7.3f\n",i,
143 (char *)&idx[i].ckid, 144 (char *)&idx[i].ckid,