From 71db5ee7dc3c7d454c6cf3810d88ec2641d0513c Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Sat, 26 Oct 2002 04:28:57 +0000 Subject: [PATCH] update to match new default vorbis comment size (now with vendor string) --- src/test_libFLAC++/metadata_object.cpp | 2 +- src/test_libFLAC/metadata_object.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test_libFLAC++/metadata_object.cpp b/src/test_libFLAC++/metadata_object.cpp index e3b15b33..21a332e2 100644 --- a/src/test_libFLAC++/metadata_object.cpp +++ b/src/test_libFLAC++/metadata_object.cpp @@ -786,7 +786,7 @@ bool test_metadata_object_vorbiscomment() FLAC::Metadata::VorbisComment block; if(!block.is_valid()) return die_("!block.is_valid()"); - expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN) / 8; + expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN/8 + strlen(::FLAC__VENDOR_STRING) + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN/8); if(block.get_length() != expected_length) { printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length()); return false; diff --git a/src/test_libFLAC/metadata_object.c b/src/test_libFLAC/metadata_object.c index 34b77c1a..215f7b36 100644 --- a/src/test_libFLAC/metadata_object.c +++ b/src/test_libFLAC/metadata_object.c @@ -608,7 +608,7 @@ FLAC__bool test_metadata_object() printf("FAILED, returned NULL\n"); return false; } - expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN) / 8; + expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN/8 + strlen(FLAC__VENDOR_STRING) + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN/8); if(block->length != expected_length) { printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); return false;