minor formatting
diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 9988679..91d8f25 100644
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -37,4 +37,4 @@
seekable_stream_decoder.cc \
seekable_stream_encoder.cc \
stream_decoder.cc \
- stream_encoder.cc
+ stream_encoder.cc
diff --git a/src/libFLAC++/metadata.cc b/src/libFLAC++/metadata.cc
index b6fbb6e..e2abf81 100644
--- a/src/libFLAC++/metadata.cc
+++ b/src/libFLAC++/metadata.cc
@@ -950,7 +950,7 @@
return (bool)::FLAC__metadata_iterator_prev(iterator_);
}
- ::FLAC__MetadataType Iterator::get_block_type() const
+ ::FLAC__MetadataType Iterator::get_block_type() const
{
FLAC__ASSERT(is_valid());
return ::FLAC__metadata_iterator_get_block_type(iterator_);
diff --git a/src/libFLAC/bitbuffer.c b/src/libFLAC/bitbuffer.c
index c0e0078..5220c6d 100644
--- a/src/libFLAC/bitbuffer.c
+++ b/src/libFLAC/bitbuffer.c
@@ -2081,7 +2081,7 @@
CRC16_UPDATE_BLURB(bb, save_blurb, bb->read_crc16);
break;
}
- }
+ }
else {
msbs += FLAC__BITS_PER_BLURB - cbits;
cbits = 0;
@@ -2171,7 +2171,7 @@
CRC16_UPDATE_BLURB(bb, save_blurb, bb->read_crc16);
break;
}
- }
+ }
else {
msbs += FLAC__BITS_PER_BLURB - cbits;
cbits = 0;
diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index cf933cf..4e35c43 100644
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -126,7 +126,7 @@
sample_rate == 0 ||
sample_rate > FLAC__MAX_SAMPLE_RATE ||
(
- sample_rate >= (1u << 16) &&
+ sample_rate >= (1u << 16) &&
!(sample_rate % 1000 == 0 || sample_rate % 10 == 0)
)
) {
diff --git a/src/libFLAC/lpc.c b/src/libFLAC/lpc.c
index b993599..88c9a6c 100644
--- a/src/libFLAC/lpc.c
+++ b/src/libFLAC/lpc.c
@@ -147,7 +147,7 @@
else {
int log2cmax;
- (void)frexp(cmax, &log2cmax);
+ (void)frexp(cmax, &log2cmax);
log2cmax--;
*shift = (int)precision - log2cmax - 1;
diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c
index 636db10..70d78b3 100644
--- a/src/libFLAC/metadata_iterators.c
+++ b/src/libFLAC/metadata_iterators.c
@@ -1619,7 +1619,7 @@
return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR;
n %= 1024;
-
+
if(fwrite(buffer, 1, n, file) != n)
return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR;
diff --git a/src/libFLAC/seekable_stream_encoder.c b/src/libFLAC/seekable_stream_encoder.c
index d36b6a3..320ad8d 100644
--- a/src/libFLAC/seekable_stream_encoder.c
+++ b/src/libFLAC/seekable_stream_encoder.c
@@ -186,7 +186,7 @@
* Initializing the stream encoder writes all the metadata, so we
* save the stream offset now.
*/
- encoder->private_->stream_offset = encoder->private_->bytes_written;
+ encoder->private_->stream_offset = encoder->private_->bytes_written;
return encoder->protected_->state = FLAC__SEEKABLE_STREAM_ENCODER_OK;
}
@@ -407,7 +407,7 @@
if(0 != metadata && num_blocks > 0) {
unsigned i;
for(i = 0; i < num_blocks; i++) {
- if(0 != metadata[i] && metadata[i]->type == FLAC__METADATA_TYPE_SEEKTABLE) {
+ if(0 != metadata[i] && metadata[i]->type == FLAC__METADATA_TYPE_SEEKTABLE) {
encoder->private_->seek_table = &metadata[i]->data.seek_table;
break; /* take only the first one */
}
diff --git a/src/libOggFLAC++/Makefile.am b/src/libOggFLAC++/Makefile.am
index 1d8f1ca..b2af48b 100644
--- a/src/libOggFLAC++/Makefile.am
+++ b/src/libOggFLAC++/Makefile.am
@@ -32,4 +32,4 @@
libOggFLAC___la_SOURCES = \
stream_decoder.cc \
- stream_encoder.cc
+ stream_encoder.cc
diff --git a/src/libOggFLAC/stream_decoder.c b/src/libOggFLAC/stream_decoder.c
index 958f9f4..41e6803 100644
--- a/src/libOggFLAC/stream_decoder.c
+++ b/src/libOggFLAC/stream_decoder.c
@@ -132,7 +132,7 @@
OggFLAC__stream_decoder_finish(decoder);
- FLAC__stream_decoder_delete(decoder->private_->FLAC_stream_decoder);
+ FLAC__stream_decoder_delete(decoder->private_->FLAC_stream_decoder);
free(decoder->private_);
free(decoder->protected_);
@@ -161,14 +161,14 @@
if(ogg_sync_init(&decoder->private_->ogg.sync_state) != 0)
return decoder->protected_->state = OggFLAC__STREAM_DECODER_OGG_ERROR;
- FLAC__stream_decoder_set_read_callback(decoder->private_->FLAC_stream_decoder, read_callback_);
- FLAC__stream_decoder_set_write_callback(decoder->private_->FLAC_stream_decoder, write_callback_);
- FLAC__stream_decoder_set_metadata_callback(decoder->private_->FLAC_stream_decoder, metadata_callback_);
- FLAC__stream_decoder_set_error_callback(decoder->private_->FLAC_stream_decoder, error_callback_);
- FLAC__stream_decoder_set_client_data(decoder->private_->FLAC_stream_decoder, decoder);
+ FLAC__stream_decoder_set_read_callback(decoder->private_->FLAC_stream_decoder, read_callback_);
+ FLAC__stream_decoder_set_write_callback(decoder->private_->FLAC_stream_decoder, write_callback_);
+ FLAC__stream_decoder_set_metadata_callback(decoder->private_->FLAC_stream_decoder, metadata_callback_);
+ FLAC__stream_decoder_set_error_callback(decoder->private_->FLAC_stream_decoder, error_callback_);
+ FLAC__stream_decoder_set_client_data(decoder->private_->FLAC_stream_decoder, decoder);
- if(FLAC__stream_decoder_init(decoder->private_->FLAC_stream_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
- return decoder->protected_->state = OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR;
+ if(FLAC__stream_decoder_init(decoder->private_->FLAC_stream_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
+ return decoder->protected_->state = OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR;
return decoder->protected_->state = OggFLAC__STREAM_DECODER_OK;
}
@@ -448,7 +448,7 @@
* We have to be careful not to read in more than the
* FLAC__StreamDecoder says it has room for. We know
* that the size of the decoded data must be no more
- * than the encoded data we will read.
+ * than the encoded data we will read.
*/
ogg_bytes_to_read = min(*bytes, OGG_BYTES_CHUNK);
oggbuf = ogg_sync_buffer(&decoder->private_->ogg.sync_state, ogg_bytes_to_read);
@@ -456,7 +456,7 @@
if(decoder->private_->read_callback(decoder, oggbuf, &ogg_bytes_to_read, decoder->private_->client_data) != FLAC__STREAM_DECODER_READ_STATUS_CONTINUE) {
decoder->protected_->state = OggFLAC__STREAM_DECODER_READ_ERROR;
return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
- }
+ }
ogg_bytes_read = ogg_bytes_to_read;
if(ogg_sync_wrote(&decoder->private_->ogg.sync_state, ogg_bytes_read) < 0) {
diff --git a/src/libOggFLAC/stream_encoder.c b/src/libOggFLAC/stream_encoder.c
index d1ca547..f949ace 100644
--- a/src/libOggFLAC/stream_encoder.c
+++ b/src/libOggFLAC/stream_encoder.c
@@ -126,7 +126,7 @@
FLAC__ASSERT(0 != encoder->private_->FLAC_stream_encoder);
(void)OggFLAC__stream_encoder_finish(encoder);
-
+
FLAC__stream_encoder_delete(encoder->private_->FLAC_stream_encoder);
free(encoder->private_);
diff --git a/src/test_libFLAC++/decoders.cc b/src/test_libFLAC++/decoders.cc
index 5402a78..48876be 100644
--- a/src/test_libFLAC++/decoders.cc
+++ b/src/test_libFLAC++/decoders.cc
@@ -61,27 +61,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = ::FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -90,16 +90,16 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
@@ -142,7 +142,7 @@
num_expected_ = 5;
if(!file_utils__generate_flacfile(flacfilename_, &flacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
- return die_("creating the encoded file");
+ return die_("creating the encoded file");
return true;
}
@@ -169,21 +169,21 @@
if(feof(file_))
return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else if(*bytes > 0) {
- unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
- if(bytes_read == 0) {
- if(feof(file_))
- return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else
- return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- else {
- *bytes = bytes_read;
- return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- }
- else
- return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+ else if(*bytes > 0) {
+ unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
+ if(bytes_read == 0) {
+ if(feof(file_))
+ return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+ else
+ return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ else {
+ *bytes = bytes_read;
+ return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ }
+ else
+ return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
}
::FLAC__StreamDecoderWriteStatus DecoderCommon::common_write_callback_(const ::FLAC__Frame *frame)
@@ -191,13 +191,13 @@
if(error_occurred_)
return ::FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
- if(
- (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
- (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
- ) {
- printf("content... ");
- fflush(stdout);
- }
+ if(
+ (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+ (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+ ) {
+ printf("content... ");
+ fflush(stdout);
+ }
return ::FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
diff --git a/src/test_libFLAC++/encoders.cc b/src/test_libFLAC++/encoders.cc
index 7b87610..15183ca 100644
--- a/src/test_libFLAC++/encoders.cc
+++ b/src/test_libFLAC++/encoders.cc
@@ -52,27 +52,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = ::FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -81,22 +81,22 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
- vorbiscomment_.is_last = true;
- vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
- vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+ vorbiscomment_.is_last = true;
+ vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
+ vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(8);
memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libFLAC++/metadata_manip.cc b/src/test_libFLAC++/metadata_manip.cc
index c376084..2a0812b 100644
--- a/src/test_libFLAC++/metadata_manip.cc
+++ b/src/test_libFLAC++/metadata_manip.cc
@@ -314,7 +314,7 @@
return die_("priming our metadata");
if(!file_utils__generate_flacfile(flacfile_, 0, 512 * 1024, &streaminfo, metadata, 1))
- return die_("creating the encoded file");
+ return die_("creating the encoded file");
free(vorbiscomment.data.vorbis_comment.vendor_string.entry);
@@ -363,7 +363,7 @@
static bool change_stats_(const char *filename, bool read_only)
{
if(!file_utils__change_stats(filename, read_only))
- return die_("during file_utils__change_stats()");
+ return die_("during file_utils__change_stats()");
return true;
}
@@ -585,7 +585,7 @@
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
-
+
printf("SV[P]PP\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
diff --git a/src/test_libFLAC++/metadata_object.cc b/src/test_libFLAC++/metadata_object.cc
index b92eb8a..b04343c 100644
--- a/src/test_libFLAC++/metadata_object.cc
+++ b/src/test_libFLAC++/metadata_object.cc
@@ -42,27 +42,27 @@
static void init_metadata_blocks_()
{
- streaminfo_.is_last = false;
- streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = ::FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -71,16 +71,16 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application_.is_last = false;
- application_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application_.length = 8;
+ application_.is_last = false;
+ application_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application_.length = 8;
memcpy(application_.data.application.id, "\xfe\xdc\xba\x98", 4);
application_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
memcpy(application_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- vorbiscomment_.is_last = true;
- vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
- vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+ vorbiscomment_.is_last = true;
+ vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
+ vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
vorbiscomment_.data.vorbis_comment.vendor_string.length = 5;
vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(5);
memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "name0", 8);
@@ -117,7 +117,7 @@
if(block.get_length() != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
return false;
- }
+ }
printf("OK\n");
printf("testing StreamInfo::StreamInfo(const StreamInfo &)... +\n");
@@ -299,7 +299,7 @@
if(block.get_length() != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
return false;
- }
+ }
printf("OK\n");
printf("testing Padding::Padding(const Padding &)... +\n");
@@ -409,7 +409,7 @@
if(block.get_length() != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
return false;
- }
+ }
printf("OK\n");
printf("testing Application::Application(const Application &)... +\n");
@@ -528,7 +528,7 @@
if(block.get_length() != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
return false;
- }
+ }
printf("OK\n");
printf("testing SeekTable::SeekTable(const SeekTable &)... +\n");
@@ -790,7 +790,7 @@
if(block.get_length() != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
return false;
- }
+ }
printf("OK\n");
printf("testing VorbisComment::VorbisComment(const VorbisComment &)... +\n");
diff --git a/src/test_libFLAC/decoders.c b/src/test_libFLAC/decoders.c
index 8184246..1dce361 100644
--- a/src/test_libFLAC/decoders.c
+++ b/src/test_libFLAC/decoders.c
@@ -125,27 +125,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -154,16 +154,16 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
@@ -206,7 +206,7 @@
num_expected_ = 5;
if(!file_utils__generate_flacfile(flacfilename_, &flacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
- return die_("creating the encoded file");
+ return die_("creating the encoded file");
return true;
}
@@ -227,21 +227,21 @@
if(feof(dcd->file))
return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else if(*bytes > 0) {
- unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
- if(bytes_read == 0) {
- if(feof(dcd->file))
- return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else
- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- else {
- *bytes = bytes_read;
- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- }
- else
- return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+ else if(*bytes > 0) {
+ unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
+ if(bytes_read == 0) {
+ if(feof(dcd->file))
+ return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+ else
+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ else {
+ *bytes = bytes_read;
+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ }
+ else
+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
}
static FLAC__StreamDecoderWriteStatus stream_decoder_write_callback_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
@@ -258,13 +258,13 @@
if(dcd->error_occurred)
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
- if(
- (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
- (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
- ) {
- printf("content... ");
- fflush(stdout);
- }
+ if(
+ (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+ (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+ ) {
+ printf("content... ");
+ fflush(stdout);
+ }
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c
index 5721fd1..779e82d 100644
--- a/src/test_libFLAC/encoders.c
+++ b/src/test_libFLAC/encoders.c
@@ -118,27 +118,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -147,22 +147,22 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
- vorbiscomment_.is_last = true;
- vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
- vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+ vorbiscomment_.is_last = true;
+ vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
+ vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
vorbiscomment_.data.vorbis_comment.vendor_string.entry = malloc_or_die_(8);
memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c
index 2ef0eae..b998822 100644
--- a/src/test_libFLAC/metadata_manip.c
+++ b/src/test_libFLAC/metadata_manip.c
@@ -319,7 +319,7 @@
return die_("priming our metadata");
if(!file_utils__generate_flacfile(flacfile_, 0, 512 * 1024, &streaminfo, metadata, 1))
- return die_("creating the encoded file");
+ return die_("creating the encoded file");
free(vorbiscomment.data.vorbis_comment.vendor_string.entry);
@@ -377,7 +377,7 @@
static FLAC__bool change_stats_(const char *filename, FLAC__bool read_only)
{
if(!file_utils__change_stats(filename, read_only))
- return die_("during file_utils__change_stats()");
+ return die_("during file_utils__change_stats()");
return true;
}
@@ -592,7 +592,7 @@
if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
return false;
-
+
printf("SV[P]PP\tprev\n");
if(!FLAC__metadata_simple_iterator_prev(iterator))
return die_("iterator ended early\n");
diff --git a/src/test_libFLAC/metadata_object.c b/src/test_libFLAC/metadata_object.c
index 36468f9..34b77c1 100644
--- a/src/test_libFLAC/metadata_object.c
+++ b/src/test_libFLAC/metadata_object.c
@@ -69,7 +69,7 @@
if(block->length != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
return false;
- }
+ }
if(block->data.seek_table.num_points != num_points) {
printf("FAILED, expected %u point, got %u\n", num_points, block->data.seek_table.num_points);
return false;
@@ -93,14 +93,14 @@
{
entry->length = strlen(field);
entry->entry = (FLAC__byte*)malloc(entry->length);
- FLAC__ASSERT(0 != entry->entry);
+ FLAC__ASSERT(0 != entry->entry);
memcpy(entry->entry, field, entry->length);
}
static void entry_clone_(FLAC__StreamMetadata_VorbisComment_Entry *entry)
{
FLAC__byte *x = (FLAC__byte*)malloc(entry->length);
- FLAC__ASSERT(0 != x);
+ FLAC__ASSERT(0 != x);
memcpy(x, entry->entry, entry->length);
entry->entry = x;
}
@@ -206,7 +206,7 @@
if(block->length != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
return false;
- }
+ }
printf("OK\n");
printf("testing FLAC__metadata_object_clone()... ");
@@ -237,7 +237,7 @@
if(block->length != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
return false;
- }
+ }
printf("OK\n");
printf("testing FLAC__metadata_object_clone()... ");
@@ -268,7 +268,7 @@
if(block->length != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
return false;
- }
+ }
printf("OK\n");
printf("testing FLAC__metadata_object_clone()... ");
@@ -539,7 +539,7 @@
if(!check_seektable_(block, seekpoints, seekpoint_array))
return false;
- {
+ {
FLAC__uint64 nums[2] = { 3, 7 };
seekpoint_array[seekpoints++].sample_number = nums[0];
seekpoint_array[seekpoints++].sample_number = nums[1];
@@ -612,7 +612,7 @@
if(block->length != expected_length) {
printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
return false;
- }
+ }
printf("OK\n");
printf("testing FLAC__metadata_object_clone()... ");
diff --git a/src/test_libFLAC/metadata_utils.c b/src/test_libFLAC/metadata_utils.c
index a691ab8..eadd581 100644
--- a/src/test_libFLAC/metadata_utils.c
+++ b/src/test_libFLAC/metadata_utils.c
@@ -31,35 +31,35 @@
if(blockcopy->min_blocksize != block->min_blocksize) {
printf("FAILED, min_blocksize mismatch, expected %u, got %u\n", block->min_blocksize, blockcopy->min_blocksize);
return false;
- }
+ }
if(blockcopy->max_blocksize != block->max_blocksize) {
printf("FAILED, max_blocksize mismatch, expected %u, got %u\n", block->max_blocksize, blockcopy->max_blocksize);
return false;
- }
+ }
if(blockcopy->min_framesize != block->min_framesize) {
printf("FAILED, min_framesize mismatch, expected %u, got %u\n", block->min_framesize, blockcopy->min_framesize);
return false;
- }
+ }
if(blockcopy->max_framesize != block->max_framesize) {
printf("FAILED, max_framesize mismatch, expected %u, got %u\n", block->max_framesize, blockcopy->max_framesize);
return false;
- }
+ }
if(blockcopy->sample_rate != block->sample_rate) {
printf("FAILED, sample_rate mismatch, expected %u, got %u\n", block->sample_rate, blockcopy->sample_rate);
return false;
- }
+ }
if(blockcopy->channels != block->channels) {
printf("FAILED, channels mismatch, expected %u, got %u\n", block->channels, blockcopy->channels);
return false;
- }
+ }
if(blockcopy->bits_per_sample != block->bits_per_sample) {
printf("FAILED, bits_per_sample mismatch, expected %u, got %u\n", block->bits_per_sample, blockcopy->bits_per_sample);
return false;
- }
+ }
if(blockcopy->total_samples != block->total_samples) {
printf("FAILED, total_samples mismatch, expected %llu, got %llu\n", block->total_samples, blockcopy->total_samples);
return false;
- }
+ }
if(0 != memcmp(blockcopy->md5sum, block->md5sum, sizeof(block->md5sum))) {
printf("FAILED, md5sum mismatch, expected %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X, got %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n",
(unsigned)block->md5sum[0],
@@ -96,7 +96,7 @@
(unsigned)blockcopy->md5sum[15]
);
return false;
- }
+ }
return true;
}
@@ -125,7 +125,7 @@
(unsigned)blockcopy->id[3]
);
return false;
- }
+ }
if(0 == block->data || 0 == blockcopy->data) {
if(block->data != blockcopy->data) {
printf("FAILED, data mismatch (%s's data pointer is null)\n", 0==block->data?"original":"copy");
@@ -155,7 +155,7 @@
if(blockcopy->num_points != block->num_points) {
printf("FAILED, num_points mismatch, expected %u, got %u\n", block->num_points, blockcopy->num_points);
return false;
- }
+ }
for(i = 0; i < block->num_points; i++) {
if(blockcopy->points[i].sample_number != block->points[i].sample_number) {
printf("FAILED, points[%u].sample_number mismatch, expected %llu, got %llu\n", i, block->points[i].sample_number, blockcopy->points[i].sample_number);
@@ -179,7 +179,7 @@
if(blockcopy->vendor_string.length != block->vendor_string.length) {
printf("FAILED, vendor_string.length mismatch, expected %u, got %u\n", block->vendor_string.length, blockcopy->vendor_string.length);
return false;
- }
+ }
if(0 == block->vendor_string.entry || 0 == blockcopy->vendor_string.entry) {
if(block->vendor_string.entry != blockcopy->vendor_string.entry) {
printf("FAILED, vendor_string.entry mismatch\n");
@@ -189,11 +189,11 @@
else if(0 != memcmp(blockcopy->vendor_string.entry, block->vendor_string.entry, block->vendor_string.length)) {
printf("FAILED, vendor_string.entry mismatch\n");
return false;
- }
+ }
if(blockcopy->num_comments != block->num_comments) {
printf("FAILED, num_comments mismatch, expected %u, got %u\n", block->num_comments, blockcopy->num_comments);
return false;
- }
+ }
for(i = 0; i < block->num_comments; i++) {
if(blockcopy->comments[i].length != block->comments[i].length) {
printf("FAILED, comments[%u].length mismatch, expected %u, got %u\n", i, block->comments[i].length, blockcopy->comments[i].length);
@@ -220,15 +220,15 @@
if(blockcopy->type != block->type) {
printf("FAILED, type mismatch, expected %s, got %s\n", FLAC__MetadataTypeString[block->type], FLAC__MetadataTypeString[blockcopy->type]);
return false;
- }
+ }
if(blockcopy->is_last != block->is_last) {
printf("FAILED, is_last mismatch, expected %u, got %u\n", (unsigned)block->is_last, (unsigned)blockcopy->is_last);
return false;
- }
+ }
if(blockcopy->length != block->length) {
printf("FAILED, length mismatch, expected %u, got %u\n", block->length, blockcopy->length);
return false;
- }
+ }
switch(block->type) {
case FLAC__METADATA_TYPE_STREAMINFO:
return compare_block_data_streaminfo_(&block->data.stream_info, &blockcopy->data.stream_info);
diff --git a/src/test_libOggFLAC++/decoders.cc b/src/test_libOggFLAC++/decoders.cc
index 3bbc54b..a56fc25 100644
--- a/src/test_libOggFLAC++/decoders.cc
+++ b/src/test_libOggFLAC++/decoders.cc
@@ -61,27 +61,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = ::FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -90,16 +90,16 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
@@ -142,7 +142,7 @@
num_expected_ = 5;
if(!file_utils__generate_oggflacfile(oggflacfilename_, &oggflacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
- return die_("creating the encoded file");
+ return die_("creating the encoded file");
return true;
}
@@ -169,21 +169,21 @@
if(feof(file_))
return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else if(*bytes > 0) {
- unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
- if(bytes_read == 0) {
- if(feof(file_))
- return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else
- return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- else {
- *bytes = bytes_read;
- return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- }
- else
- return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+ else if(*bytes > 0) {
+ unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
+ if(bytes_read == 0) {
+ if(feof(file_))
+ return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+ else
+ return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ else {
+ *bytes = bytes_read;
+ return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ }
+ else
+ return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
}
::FLAC__StreamDecoderWriteStatus DecoderCommon::common_write_callback_(const ::FLAC__Frame *frame)
@@ -191,13 +191,13 @@
if(error_occurred_)
return ::FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
- if(
- (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
- (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
- ) {
- printf("content... ");
- fflush(stdout);
- }
+ if(
+ (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+ (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+ ) {
+ printf("content... ");
+ fflush(stdout);
+ }
return ::FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
diff --git a/src/test_libOggFLAC++/encoders.cc b/src/test_libOggFLAC++/encoders.cc
index 58172b5..f30941c 100644
--- a/src/test_libOggFLAC++/encoders.cc
+++ b/src/test_libOggFLAC++/encoders.cc
@@ -51,27 +51,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = ::FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -80,22 +80,22 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
- vorbiscomment_.is_last = true;
- vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
- vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+ vorbiscomment_.is_last = true;
+ vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
+ vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(8);
memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libOggFLAC/decoders.c b/src/test_libOggFLAC/decoders.c
index bba0c3a..2db275d 100644
--- a/src/test_libOggFLAC/decoders.c
+++ b/src/test_libOggFLAC/decoders.c
@@ -84,27 +84,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -113,16 +113,16 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
@@ -134,7 +134,7 @@
vorbiscomment_.data.vorbis_comment.vendor_string.length = vendor_string_length;
vorbiscomment_.data.vorbis_comment.vendor_string.entry = malloc_or_die_(vendor_string_length);
memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
- vorbiscomment_.data.vorbis_comment.num_comments = 2;
+ vorbiscomment_.data.vorbis_comment.num_comments = 2;
vorbiscomment_.data.vorbis_comment.comments = malloc_or_die_(vorbiscomment_.data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
vorbiscomment_.data.vorbis_comment.comments[0].length = 5;
vorbiscomment_.data.vorbis_comment.comments[0].entry = malloc_or_die_(5);
@@ -165,7 +165,7 @@
num_expected_ = 5;
if(!file_utils__generate_oggflacfile(oggflacfilename_, &oggflacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
- return die_("creating the encoded file");
+ return die_("creating the encoded file");
return true;
}
@@ -186,21 +186,21 @@
if(feof(dcd->file))
return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else if(*bytes > 0) {
- unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
- if(bytes_read == 0) {
- if(feof(dcd->file))
- return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- else
- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- else {
- *bytes = bytes_read;
- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- }
- else
- return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+ else if(*bytes > 0) {
+ unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
+ if(bytes_read == 0) {
+ if(feof(dcd->file))
+ return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+ else
+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ else {
+ *bytes = bytes_read;
+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ }
+ else
+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
}
static FLAC__StreamDecoderWriteStatus stream_decoder_write_callback_(const OggFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
@@ -217,13 +217,13 @@
if(dcd->error_occurred)
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
- if(
- (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
- (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
- ) {
- printf("content... ");
- fflush(stdout);
- }
+ if(
+ (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+ (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+ ) {
+ printf("content... ");
+ fflush(stdout);
+ }
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
diff --git a/src/test_libOggFLAC/encoders.c b/src/test_libOggFLAC/encoders.c
index 547c870..8572829 100644
--- a/src/test_libOggFLAC/encoders.c
+++ b/src/test_libOggFLAC/encoders.c
@@ -72,27 +72,27 @@
*/
/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
- streaminfo_.is_last = false;
- streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
- streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
- streaminfo_.data.stream_info.min_blocksize = 576;
- streaminfo_.data.stream_info.max_blocksize = 576;
- streaminfo_.data.stream_info.min_framesize = 0;
- streaminfo_.data.stream_info.max_framesize = 0;
- streaminfo_.data.stream_info.sample_rate = 44100;
- streaminfo_.data.stream_info.channels = 1;
- streaminfo_.data.stream_info.bits_per_sample = 8;
- streaminfo_.data.stream_info.total_samples = 0;
+ streaminfo_.is_last = false;
+ streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+ streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+ streaminfo_.data.stream_info.min_blocksize = 576;
+ streaminfo_.data.stream_info.max_blocksize = 576;
+ streaminfo_.data.stream_info.min_framesize = 0;
+ streaminfo_.data.stream_info.max_framesize = 0;
+ streaminfo_.data.stream_info.sample_rate = 44100;
+ streaminfo_.data.stream_info.channels = 1;
+ streaminfo_.data.stream_info.bits_per_sample = 8;
+ streaminfo_.data.stream_info.total_samples = 0;
memset(streaminfo_.data.stream_info.md5sum, 0, 16);
- padding_.is_last = false;
- padding_.type = FLAC__METADATA_TYPE_PADDING;
- padding_.length = 1234;
+ padding_.is_last = false;
+ padding_.type = FLAC__METADATA_TYPE_PADDING;
+ padding_.length = 1234;
- seektable_.is_last = false;
- seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+ seektable_.is_last = false;
+ seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
seektable_.data.seek_table.num_points = 2;
- seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+ seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
seektable_.data.seek_table.points[0].sample_number = 0;
seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -101,22 +101,22 @@
seektable_.data.seek_table.points[1].stream_offset = 1000;
seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
- application1_.is_last = false;
- application1_.type = FLAC__METADATA_TYPE_APPLICATION;
- application1_.length = 8;
+ application1_.is_last = false;
+ application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application1_.length = 8;
memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
application1_.data.application.data = malloc_or_die_(4);
memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
- application2_.is_last = false;
- application2_.type = FLAC__METADATA_TYPE_APPLICATION;
- application2_.length = 4;
+ application2_.is_last = false;
+ application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+ application2_.length = 4;
memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
application2_.data.application.data = 0;
- vorbiscomment_.is_last = true;
- vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
- vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+ vorbiscomment_.is_last = true;
+ vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
+ vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
vorbiscomment_.data.vorbis_comment.vendor_string.entry = malloc_or_die_(8);
memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libOggFLAC/metadata_utils.c b/src/test_libOggFLAC/metadata_utils.c
index c6367bb..2eebfe8 100644
--- a/src/test_libOggFLAC/metadata_utils.c
+++ b/src/test_libOggFLAC/metadata_utils.c
@@ -31,35 +31,35 @@
if(blockcopy->min_blocksize != block->min_blocksize) {
printf("FAILED, min_blocksize mismatch, expected %u, got %u\n", block->min_blocksize, blockcopy->min_blocksize);
return false;
- }
+ }
if(blockcopy->max_blocksize != block->max_blocksize) {
printf("FAILED, max_blocksize mismatch, expected %u, got %u\n", block->max_blocksize, blockcopy->max_blocksize);
return false;
- }
+ }
if(blockcopy->min_framesize != block->min_framesize) {
printf("FAILED, min_framesize mismatch, expected %u, got %u\n", block->min_framesize, blockcopy->min_framesize);
return false;
- }
+ }
if(blockcopy->max_framesize != block->max_framesize) {
printf("FAILED, max_framesize mismatch, expected %u, got %u\n", block->max_framesize, blockcopy->max_framesize);
return false;
- }
+ }
if(blockcopy->sample_rate != block->sample_rate) {
printf("FAILED, sample_rate mismatch, expected %u, got %u\n", block->sample_rate, blockcopy->sample_rate);
return false;
- }
+ }
if(blockcopy->channels != block->channels) {
printf("FAILED, channels mismatch, expected %u, got %u\n", block->channels, blockcopy->channels);
return false;
- }
+ }
if(blockcopy->bits_per_sample != block->bits_per_sample) {
printf("FAILED, bits_per_sample mismatch, expected %u, got %u\n", block->bits_per_sample, blockcopy->bits_per_sample);
return false;
- }
+ }
if(blockcopy->total_samples != block->total_samples) {
printf("FAILED, total_samples mismatch, expected %llu, got %llu\n", block->total_samples, blockcopy->total_samples);
return false;
- }
+ }
if(0 != memcmp(blockcopy->md5sum, block->md5sum, sizeof(block->md5sum))) {
printf("FAILED, md5sum mismatch, expected %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X, got %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n",
(unsigned)block->md5sum[0],
@@ -96,7 +96,7 @@
(unsigned)blockcopy->md5sum[15]
);
return false;
- }
+ }
return true;
}
@@ -125,7 +125,7 @@
(unsigned)blockcopy->id[3]
);
return false;
- }
+ }
if(0 == block->data || 0 == blockcopy->data) {
if(block->data != blockcopy->data) {
printf("FAILED, data mismatch (%s's data pointer is null)\n", 0==block->data?"original":"copy");
@@ -155,7 +155,7 @@
if(blockcopy->num_points != block->num_points) {
printf("FAILED, num_points mismatch, expected %u, got %u\n", block->num_points, blockcopy->num_points);
return false;
- }
+ }
for(i = 0; i < block->num_points; i++) {
if(blockcopy->points[i].sample_number != block->points[i].sample_number) {
printf("FAILED, points[%u].sample_number mismatch, expected %llu, got %llu\n", i, block->points[i].sample_number, blockcopy->points[i].sample_number);
@@ -179,7 +179,7 @@
if(blockcopy->vendor_string.length != block->vendor_string.length) {
printf("FAILED, vendor_string.length mismatch, expected %u, got %u\n", block->vendor_string.length, blockcopy->vendor_string.length);
return false;
- }
+ }
if(0 == block->vendor_string.entry || 0 == blockcopy->vendor_string.entry) {
if(block->vendor_string.entry != blockcopy->vendor_string.entry) {
printf("FAILED, vendor_string.entry mismatch\n");
@@ -189,11 +189,11 @@
else if(0 != memcmp(blockcopy->vendor_string.entry, block->vendor_string.entry, block->vendor_string.length)) {
printf("FAILED, vendor_string.entry mismatch\n");
return false;
- }
+ }
if(blockcopy->num_comments != block->num_comments) {
printf("FAILED, num_comments mismatch, expected %u, got %u\n", block->num_comments, blockcopy->num_comments);
return false;
- }
+ }
for(i = 0; i < block->num_comments; i++) {
if(blockcopy->comments[i].length != block->comments[i].length) {
printf("FAILED, comments[%u].length mismatch, expected %u, got %u\n", i, block->comments[i].length, blockcopy->comments[i].length);
@@ -220,15 +220,15 @@
if(blockcopy->type != block->type) {
printf("FAILED, type mismatch, expected %s, got %s\n", FLAC__MetadataTypeString[block->type], FLAC__MetadataTypeString[blockcopy->type]);
return false;
- }
+ }
if(blockcopy->is_last != block->is_last) {
printf("FAILED, is_last mismatch, expected %u, got %u\n", (unsigned)block->is_last, (unsigned)blockcopy->is_last);
return false;
- }
+ }
if(blockcopy->length != block->length) {
printf("FAILED, length mismatch, expected %u, got %u\n", block->length, blockcopy->length);
return false;
- }
+ }
switch(block->type) {
case FLAC__METADATA_TYPE_STREAMINFO:
return compare_block_data_streaminfo_(&block->data.stream_info, &blockcopy->data.stream_info);