diff options
| author | jhurst <jhurst@cinecert.com> | 2018-08-20 00:15:11 +0000 |
|---|---|---|
| committer | jhurst <> | 2018-08-20 00:15:11 +0000 |
| commit | 30dba88305439d4df852bb5149e134739889dc93 (patch) | |
| tree | 771f8275a5b284985a88c0de8e0203bb2467d84b /src/Wav.cpp | |
| parent | 79912d9558b67fb75dfad8bca29d2db1fa58a769 (diff) | |
o Fixes wrong MajorVersion in Preface
o Adds VideoLineMap also to RGBA essence descriptor
o Adds VideoLineMap to RGBA and CDCI descriptor only when option -l
is present (disputable - but distinguished value {0, 0} is not
allowed in closed and complete partitions)
o Fixes issue with IndexRate not set in AS-02 J2K files
o Additional fixes to minor version number in AS-02 partition packs
o CMake brought up to date
o Fixed erroneous WAV RF64 header interpretation
Diffstat (limited to 'src/Wav.cpp')
| -rwxr-xr-x | src/Wav.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Wav.cpp b/src/Wav.cpp index aad4b89..2ffadd4 100755 --- a/src/Wav.cpp +++ b/src/Wav.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2005-2015, John Hurst +Copyright (c) 2005-2018, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -548,14 +548,17 @@ ASDCP::RF64::SimpleRF64Header::ReadFromBuffer(const byte_t* buf, ui32_t buf_len, if ( test_fcc == Wav::FCC_data ) { - if ( chunk_size > RIFF_len ) - { - DefaultLogSink().Error("Chunk size %u larger than file: %u\n", chunk_size, RIFF_len); - return RESULT_RAW_FORMAT; - } + if ( chunk_size != MAX_RIFF_LEN ) + { + if ( chunk_size > RIFF_len ) + { + DefaultLogSink().Error("Chunk size %u larger than file: %u\n", chunk_size, RIFF_len); + return RESULT_RAW_FORMAT; + } - if (chunk_size != MAX_RIFF_LEN) data_len = chunk_size; + } + *data_start = p - buf; break; } |