Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I do not like tab characters.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-12 14:25:08 +00:00
parent b992010b32
commit 8807aad8b4
10 changed files with 105 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/common/checksums.cpp
View File

@ -56,7 +56,7 @@ calc_adler32(const unsigned char *buffer,
/* The following applies to the calc_crc32 function. Its license is GPL. */
/*
Description: CRC32 functions
Description: CRC32 functions
Developed by: Alexander Djourik <sasha@iszf.irk.ru>
Pavel Zhilin <pzh@iszf.irk.ru>
@ -64,74 +64,74 @@ calc_adler32(const unsigned char *buffer,
*/
static const unsigned long crc32_table[256] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
#define UPDATE_CRC32(x, crc) crc = \
(((crc>>8) & 0x00FFFFFF) ^ crc32_table[(crc^x) & 0xFF])
(((crc>>8) & 0x00FFFFFF) ^ crc32_table[(crc^x) & 0xFF])
uint32_t
calc_crc32(const unsigned char *buffer,

6
src/common/commonebml.h
View File

@ -60,7 +60,7 @@ template <typename type>type &GetEmptyChild(EbmlMaster &master) {
}
}
return *(static_cast<type *>(e));
return *(static_cast<type *>(e));
}
template <typename type>type &GetNextEmptyChild(EbmlMaster &master,
@ -76,7 +76,7 @@ template <typename type>type &GetNextEmptyChild(EbmlMaster &master,
}
}
return *(static_cast<type *>(e));
return *(static_cast<type *>(e));
}
template <typename type>type &AddEmptyChild(EbmlMaster &master) {
@ -92,7 +92,7 @@ template <typename type>type &AddEmptyChild(EbmlMaster &master) {
}
master.PushElement(*e);
return *(static_cast<type *>(e));
return *(static_cast<type *>(e));
}
EbmlElement *MTX_DLL_API empty_ebml_master(EbmlElement *e);

20
src/common/os.cpp
View File

@ -180,22 +180,22 @@ vsscanf_impl(const char *,
void *) {
__asm {
push ebx
mov ebx,esp
mov ecx,[ebx+16]
mov edx,[ebx+20]
lea edx,[ecx+edx*4-4]
jmp l3
mov ebx,esp
mov ecx,[ebx+16]
mov edx,[ebx+20]
lea edx,[ecx+edx*4-4]
jmp l3
l2:
push dword ptr [edx]
sub edx,4
sub edx,4
l3:
cmp edx,ecx
jae l2
cmp edx,ecx
jae l2
push dword ptr [ebx+12]
push dword ptr [ebx+8]
call dword ptr [ebx+24]
mov esp,ebx
pop ebx
mov esp,ebx
pop ebx
ret
};
}

2
src/extract/cuesheets.cpp
View File

@ -209,7 +209,7 @@ write_cuesheet(const char *file_name,
print_if_available("ARTIST", " PERFORMER \"%s\"\n");
print_if_available("ISRC", " ISRC %s\n");
print_if_available("CDAUDIO_TRACK_FLAGS", " FLAGS %s\n");
for (j = 0; j < 100; j++) {
temp_index = get_chapter_index(j, atom);
if (temp_index == -1)

4
src/info/mkvinfo.cpp
View File

@ -496,7 +496,7 @@ def_handle(info) {
for (i = 0; i < uid.GetSize(); i++)
mxprints(&buffer[strlen(buffer)], " 0x%02x", b[i]);
show_element(l2, 2, "Segment UID:%s", buffer);
delete [] buffer;
delete [] buffer;
} else if (is_id(l2, KaxPrevUID)) {
KaxPrevUID &uid = *static_cast<KaxPrevUID *>(l2);
@ -506,7 +506,7 @@ def_handle(info) {
for (i = 0; i < uid.GetSize(); i++)
mxprints(&buffer[strlen(buffer)], " 0x%02x", b[i]);
show_element(l2, 2, "Previous segment UID:%s", buffer);
delete [] buffer;
delete [] buffer;
} else if (is_id(l2, KaxPrevFilename)) {
KaxPrevFilename &filename = *static_cast<KaxPrevFilename *>(l2);

22
src/input/flac_common.cpp
View File

@ -33,17 +33,17 @@ flac_skip_utf8(bit_cursor_c &bits,
if (!bits.get_bits(8, value))
return false;
if (!(value & 0x80)) /* 0xxxxxxx */
num = 0;
else if ((value & 0xC0) && !(value & 0x20)) /* 110xxxxx */
num = 1;
else if ((value & 0xE0) && !(value & 0x10)) /* 1110xxxx */
num = 2;
else if ((value & 0xF0) && !(value & 0x08)) /* 11110xxx */
num = 3;
else if ((value & 0xF8) && !(value & 0x04)) /* 111110xx */
num = 4;
else if ((value & 0xFC) && !(value & 0x02)) /* 1111110x */
if (!(value & 0x80)) /* 0xxxxxxx */
num = 0;
else if ((value & 0xC0) && !(value & 0x20)) /* 110xxxxx */
num = 1;
else if ((value & 0xE0) && !(value & 0x10)) /* 1110xxxx */
num = 2;
else if ((value & 0xF0) && !(value & 0x08)) /* 11110xxx */
num = 3;
else if ((value & 0xF8) && !(value & 0x04)) /* 111110xx */
num = 4;
else if ((value & 0xFC) && !(value & 0x02)) /* 1111110x */
num = 5;
else if ((size == 64) && (value & 0xFE) && !(value & 0x01)) /* 11111110 */
num = 6;

21
src/input/r_vobsub.cpp
View File

@ -404,11 +404,11 @@ vobsub_reader_c::extract_one_spu_packet(int64_t timecode,
buf[3] = c;
}
switch (buf[3]) {
case 0xb9: /* System End Code */
case 0xb9: // System End Code
return deliver();
break;
case 0xba: /* Packet start code */
case 0xba: // Packet start code
c = sub_file->getch();
if (c < 0)
return deliver();
@ -438,7 +438,7 @@ vobsub_reader_c::extract_one_spu_packet(int64_t timecode,
abort();
break;
case 0xbd: /* packet */
case 0xbd: // packet
if (sub_file->read(buf, 2) != 2)
return deliver();
len = buf[0] << 8 | buf[1];
@ -446,20 +446,18 @@ vobsub_reader_c::extract_one_spu_packet(int64_t timecode,
c = sub_file->getch();
if (c < 0)
return deliver();
if ((c & 0xC0) == 0x40) { /* skip STD scale & size */
if ((c & 0xC0) == 0x40) { // skip STD scale & size
if (sub_file->getch() < 0)
return deliver();
c = sub_file->getch();
if (c < 0)
return deliver();
}
if ((c & 0xf0) == 0x20) { /* System-1 stream timestamp */
/* Do we need this? */
if ((c & 0xf0) == 0x20) { // System-1 stream timestamp
abort();
} else if ((c & 0xf0) == 0x30) {
/* Do we need this? */
abort();
} else if ((c & 0xc0) == 0x80) { /* System-2 (.VOB) stream */
} else if ((c & 0xc0) == 0x80) { // System-2 (.VOB) stream
uint32_t pts_flags, hdrlen, dataidx;
c = sub_file->getch();
if (c < 0)
@ -486,9 +484,6 @@ vobsub_reader_c::extract_one_spu_packet(int64_t timecode,
} else
pts = ((buf[0] & 0x0e) << 29 | buf[1] << 22 |
(buf[2] & 0xfe) << 14 | buf[3] << 7 | (buf[4] >> 1));
} else /* if ((pts_flags & 0xc0) == 0xc0) */ {
/* what's this? */
/* abort(); */
}
sub_file->setFilePointer2(dataidx + extraction_start_pos,
seek_beginning);
@ -530,7 +525,7 @@ vobsub_reader_c::extract_one_spu_packet(int64_t timecode,
}
break;
case 0xbe: /* Padding */
case 0xbe: // Padding
if (sub_file->read(buf, 2) != 2)
return deliver();
len = buf[0] << 8 | buf[1];
@ -540,7 +535,7 @@ vobsub_reader_c::extract_one_spu_packet(int64_t timecode,
default:
if ((0xc0 <= buf[3]) && (buf[3] < 0xf0)) {
/* MPEG audio or video */
// MPEG audio or video
if (sub_file->read(buf, 2) != 2)
return deliver();
len = (buf[0] << 8) | buf[1];

2
src/input/r_wavpack.cpp
View File

@ -89,7 +89,7 @@ wavpack_reader_c::wavpack_reader_c(track_info_c *nti)
}
if (verbose)
mxinfo(FMT_FN "Using the WAVPACK demultiplexer%s.\n", ti->fname.c_str(),
mxinfo(FMT_FN "Using the WAVPACK demultiplexer%s.\n", ti->fname.c_str(),
meta.has_correction ? " with a correction file" : "");
}

4
src/merge/output_control.cpp
View File

@ -98,8 +98,8 @@ using namespace std;
namespace libmatroska {
class KaxMyDuration: public KaxDuration {
public:
KaxMyDuration(const EbmlFloat::Precision prec): KaxDuration() {
public:
KaxMyDuration(const EbmlFloat::Precision prec): KaxDuration() {
SetPrecision(prec);
}
};

2
src/mpegparser/MPEGVideoBuffer.cpp
View File

@ -100,7 +100,7 @@ MPEGChunk * MPEGVideoBuffer::ReadChunk(){
chunkStart = 0; //we read up to the next start code
chunkEnd = -1;
UpdateState();
myChunk = new MPEGChunk(chunkData, chunkLength);
myChunk = new MPEGChunk(chunkData, chunkLength);
return myChunk;
}else{
return NULL;