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

Cleanup patch by Steve Lhomme (see AUTHORS).

Browse Source
This commit is contained in:
Moritz Bunkus 2004-12-21 16:04:38 +00:00
parent 37a6adaddf
commit 0866fc9d50
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/wavpack_common.cpp
View File

@ -95,7 +95,7 @@ int32_t
wv_parse_frame(mm_io_c *mm_io,
wavpack_header_t &wphdr,
wavpack_meta_t &meta) {
uint32_t bcount, total_bytes;
uint32_t bcount;
// read next WavPack header
bcount = read_next_header(mm_io, &wphdr);
@ -122,22 +122,20 @@ wv_parse_frame(mm_io_c *mm_io,
if (wphdr.flags & WV_INITIAL_BLOCK) {
meta.channel_count = (wphdr.flags & WV_MONO_FLAG) ? 1 : 2;
total_bytes = wphdr.ck_size + 8;
if (wphdr.flags & WV_FINAL_BLOCK) {
mxverb(3, "wavpack_reader: %s block: %s, %d bytes\n",
(wphdr.flags & WV_MONO_FLAG) ? "mono" : "stereo",
(wphdr.flags & WV_HYBRID_FLAG) ? "hybrid" : "lossless",
wphdr.ck_size + 8);
}
} else {
} else {
meta.channel_count += (wphdr.flags & WV_MONO_FLAG) ? 1 : 2;
total_bytes = wphdr.ck_size + 8;
if (wphdr.flags & WV_FINAL_BLOCK) {
mxverb(2, "wavpack_reader: %d chans: %s, %d bytes\n",
meta.channel_count,
(wphdr.flags & WV_HYBRID_FLAG) ? "hybrid" : "lossless",
total_bytes);
wphdr.ck_size + 8);
}
}
} else

1
src/output/p_wavpack.cpp
View File

@ -87,7 +87,6 @@ wavpack_packetizer_c::process(memories_c &mems,
int64_t) {
debug_enter("wavpack_packetizer_c::process");
memory_c & mem = *mems[0];
// memory_c & mem_correc = *mems[1];
int64_t samples = get_uint32_le(&mem.data[12]);
int64_t sample_index = get_uint32_le(&mem.data[8]);