claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update tests to reflect addition of vorbis comment with vendor string

Browse Source
This commit is contained in:
Josh Coalson
2002-08-25 05:10:37 +00:00
parent 1f99eac2bb
commit fedb0ae837
6 changed files with 448 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
src/test_libFLAC++/metadata_manip.cc
View File

@@ -83,6 +83,16 @@ static bool die_ss_(const char *msg, FLAC::Metadata::SimpleIterator &iterator)
return false;
}
static void *malloc_or_die_(size_t size)
{
void *x = malloc(size);
if(0 == x) {
fprintf(stderr, "ERROR: out of memory allocating %u bytes\n", (unsigned)size);
exit(1);
}
return x;
}
/* functions for working with our metadata copy */
static bool replace_in_our_metadata_(FLAC::Metadata::Prototype *block, unsigned position, bool copy)
@@ -254,7 +264,7 @@ void OurFileDecoder::error_callback(::FLAC__StreamDecoderErrorStatus status)
static bool generate_file_()
{
::FLAC__StreamMetadata streaminfo, padding;
::FLAC__StreamMetadata streaminfo, vorbiscomment, padding;
::FLAC__StreamMetadata *metadata[1];
printf("generating FLAC file for test\n");
@@ -275,6 +285,18 @@ static bool generate_file_()
streaminfo.data.stream_info.total_samples = 0;
memset(streaminfo.data.stream_info.md5sum, 0, 16);
{
const unsigned vendor_string_length = (unsigned)strlen((const char*)FLAC__VENDOR_STRING);
vorbiscomment.is_last = false;
vorbiscomment.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment.length = (4 + vendor_string_length) + 4;
vorbiscomment.data.vorbis_comment.vendor_string.length = vendor_string_length;
vorbiscomment.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)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 = 0;
vorbiscomment.data.vorbis_comment.comments = 0;
}
padding.is_last = true;
padding.type = ::FLAC__METADATA_TYPE_PADDING;
padding.length = 1234;
@@ -282,13 +304,20 @@ static bool generate_file_()
metadata[0] = &padding;
FLAC::Metadata::StreamInfo s(&streaminfo);
FLAC::Metadata::VorbisComment v(&vorbiscomment);
FLAC::Metadata::Padding p(&padding);
if(!insert_to_our_metadata_(&s, 0, /*copy=*/true) || !insert_to_our_metadata_(&p, 1, /*copy=*/true))
if(
!insert_to_our_metadata_(&s, 0, /*copy=*/true) ||
!insert_to_our_metadata_(&v, 1, /*copy=*/true) ||
!insert_to_our_metadata_(&p, 2, /*copy=*/true)
)
return die_("priming our metadata");
if(!file_utils__generate_flacfile(flacfile_, 0, 512 * 1024, &streaminfo, metadata, 1))
return die_("creating the encoded file");
free(vorbiscomment.data.vorbis_comment.vendor_string.entry);
return true;
}
@@ -449,6 +478,10 @@ static bool test_level_1_()
return die_("forward iterator ended early");
our_current_position++;
if(!iterator.next())
return die_("forward iterator ended early");
our_current_position++;
if(iterator.get_block_type() != ::FLAC__METADATA_TYPE_PADDING)
return die_("expected PADDING type from iterator.get_block_type()");
if(0 == (block = iterator.get_block()))
@@ -465,6 +498,8 @@ static bool test_level_1_()
return die_("forward iterator returned true but should have returned false");
printf("iterate backwards\n");
if(!iterator.prev())
return die_("reverse iterator ended early");
if(!iterator.prev())
return die_("reverse iterator ended early");
if(iterator.prev())
@@ -508,35 +543,40 @@ static bool test_level_1_()
printf("is writable = %u\n", (unsigned)iterator.is_writable());
printf("[S]P\ttry to write over STREAMINFO block...\n");
printf("[S]VP\ttry to write over STREAMINFO block...\n");
if(!iterator.set_block(app, false))
printf("\titerator.set_block() returned false like it should\n");
else
return die_("iterator.set_block() returned true but shouldn't have");
printf("[S]P\tnext\n");
printf("[S]VP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]\tinsert PADDING after, don't expand into padding\n");
printf("S[V]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SV[P]\tinsert PADDING after, don't expand into padding\n");
padding->set_length(25);
if(!iterator.insert_block_after(padding, false))
return die_ss_("iterator.insert_block_after(padding, false)", iterator);
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
printf("SP[P]\tprev\n");
printf("SVP[P]\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("S[P]P\tprev\n");
printf("SV[P]P\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]PP\tinsert PADDING after, don't expand into padding\n");
printf("S[V]PP\tinsert PADDING after, don't expand into padding\n");
padding->set_length(30);
if(!iterator.insert_block_after(padding, false))
return die_ss_("iterator.insert_block_after(padding, false)", iterator);
@@ -546,34 +586,44 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[P]PP\tprev\n");
printf("SV[P]PP\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]PPP\tdelete (STREAMINFO block), must fail\n");
printf("S[V]PPP\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]VPPP\tdelete (STREAMINFO block), must fail\n");
if(iterator.delete_block(false))
return die_ss_("iterator.delete_block(false) should have returned false", iterator);
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]PPP\tnext\n");
printf("[S]VPPP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]PP\tdelete (middle block), replace with padding\n");
printf("S[V]PPP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SV[P]PP\tdelete (middle block), replace with padding\n");
if(!iterator.delete_block(true))
return die_ss_("iterator.delete_block(true)", iterator);
our_current_position--;
printf("[S]PPP\tnext\n");
printf("S[V]PPP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]PP\tdelete (middle block), don't replace with padding\n");
printf("SV[P]PP\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -581,17 +631,17 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]PP\tnext\n");
printf("S[V]PP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]P\tnext\n");
printf("SV[P]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SP[P]\tdelete (last block), replace with padding\n");
printf("SVP[P]\tdelete (last block), replace with padding\n");
if(!iterator.delete_block(true))
return die_ss_("iterator.delete_block(false)", iterator);
our_current_position--;
@@ -599,12 +649,12 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[P]P\tnext\n");
printf("SV[P]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SP[P]\tdelete (last block), don't replace with padding\n");
printf("SVP[P]\tdelete (last block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -612,12 +662,17 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[P]\tprev\n");
printf("SV[P]\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]P\tset STREAMINFO (change sample rate)\n");
printf("S[V]P\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]VP\tset STREAMINFO (change sample rate)\n");
FLAC__ASSERT(our_current_position == 0);
block = iterator.get_block();
streaminfo = dynamic_cast<FLAC::Metadata::StreamInfo *>(block);
@@ -632,7 +687,12 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]P\tinsert APPLICATION after, expand into padding of exceeding size\n");
printf("[S]VP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[V]P\tinsert APPLICATION after, expand into padding of exceeding size\n");
app->set_id((const unsigned char *)"euh"); /* twiddle the id so that our comparison doesn't miss transposition */
if(!iterator.insert_block_after(app, true))
return die_ss_("iterator.insert_block_after(app, true)", iterator);
@@ -643,12 +703,12 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]P\tnext\n");
printf("SV[A]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SA[P]\tset APPLICATION, expand into padding of exceeding size\n");
printf("SVA[P]\tset APPLICATION, expand into padding of exceeding size\n");
app->set_id((const unsigned char *)"fuh"); /* twiddle the id */
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
@@ -659,7 +719,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SA[A]P\tset APPLICATION (grow), don't expand into padding\n");
printf("SVA[A]P\tset APPLICATION (grow), don't expand into padding\n");
app->set_id((const unsigned char *)"guh"); /* twiddle the id */
if(!app->set_data(data, sizeof(data), true))
return die_("setting APPLICATION data");
@@ -671,7 +731,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SA[A]P\tset APPLICATION (shrink), don't fill in with padding\n");
printf("SVA[A]P\tset APPLICATION (shrink), don't fill in with padding\n");
app->set_id((const unsigned char *)"huh"); /* twiddle the id */
if(!app->set_data(data, 12, true))
return die_("setting APPLICATION data");
@@ -683,7 +743,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SA[A]P\tset APPLICATION (grow), expand into padding of exceeding size\n");
printf("SVA[A]P\tset APPLICATION (grow), expand into padding of exceeding size\n");
app->set_id((const unsigned char *)"iuh"); /* twiddle the id */
if(!app->set_data(data, sizeof(data), true))
return die_("setting APPLICATION data");
@@ -696,7 +756,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SA[A]P\tset APPLICATION (shrink), fill in with padding\n");
printf("SVA[A]P\tset APPLICATION (shrink), fill in with padding\n");
app->set_id((const unsigned char *)"juh"); /* twiddle the id */
if(!app->set_data(data, 23, true))
return die_("setting APPLICATION data");
@@ -711,17 +771,17 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SA[A]PP\tnext\n");
printf("SVA[A]PP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SAA[P]P\tnext\n");
printf("SVAA[P]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SAAP[P]\tset PADDING (shrink), don't fill in with padding\n");
printf("SVAAP[P]\tset PADDING (shrink), don't fill in with padding\n");
padding->set_length(5);
if(!replace_in_our_metadata_(padding, our_current_position, /*copy=*/true))
return die_("copying object");
@@ -731,7 +791,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SAAP[P]\tset APPLICATION (grow)\n");
printf("SVAAP[P]\tset APPLICATION (grow)\n");
app->set_id((const unsigned char *)"kuh"); /* twiddle the id */
if(!replace_in_our_metadata_(app, our_current_position, /*copy=*/true))
return die_("copying object");
@@ -741,7 +801,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SAAP[A]\tset PADDING (equal)\n");
printf("SVAAP[A]\tset PADDING (equal)\n");
padding->set_length(27);
if(!replace_in_our_metadata_(padding, our_current_position, /*copy=*/true))
return die_("copying object");
@@ -751,12 +811,12 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SAAP[P]\tprev\n");
printf("SVAAP[P]\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("SAA[P]P\tdelete (middle block), don't replace with padding\n");
printf("SVAA[P]P\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -764,7 +824,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SA[A]P\tdelete (middle block), don't replace with padding\n");
printf("SVA[A]P\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -772,12 +832,12 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]P\tnext\n");
printf("SV[A]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SA[P]\tinsert PADDING after\n");
printf("SVA[P]\tinsert PADDING after\n");
padding->set_length(5);
if(!iterator.insert_block_after(padding, false))
return die_ss_("iterator.insert_block_after(padding, false)", iterator);
@@ -787,17 +847,17 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SAP[P]\tprev\n");
printf("SVAP[P]\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("SA[P]P\tprev\n");
printf("SVA[P]P\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("S[A]PP\tset APPLICATION (grow), try to expand into padding which is too small\n");
printf("SV[A]PP\tset APPLICATION (grow), try to expand into padding which is too small\n");
if(!app->set_data(data, 32, true))
return die_("setting APPLICATION data");
if(!replace_in_our_metadata_(app, our_current_position, /*copy=*/true))
@@ -808,7 +868,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]PP\tset APPLICATION (grow), try to expand into padding which is 'close' but still too small\n");
printf("SV[A]PP\tset APPLICATION (grow), try to expand into padding which is 'close' but still too small\n");
if(!app->set_data(data, 60, true))
return die_("setting APPLICATION data");
if(!replace_in_our_metadata_(app, our_current_position, /*copy=*/true))
@@ -819,7 +879,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]PP\tset APPLICATION (grow), expand into padding which will leave 0-length pad\n");
printf("SV[A]PP\tset APPLICATION (grow), expand into padding which will leave 0-length pad\n");
if(!app->set_data(data, 87, true))
return die_("setting APPLICATION data");
if(!replace_in_our_metadata_(app, our_current_position, /*copy=*/true))
@@ -831,7 +891,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]PP\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
printf("SV[A]PP\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
if(!app->set_data(data, 91, true))
return die_("setting APPLICATION data");
if(!replace_in_our_metadata_(app, our_current_position, /*copy=*/true))
@@ -843,7 +903,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]P\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
printf("SV[A]P\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
if(!app->set_data(data, 100, true))
return die_("setting APPLICATION data");
if(!replace_in_our_metadata_(app, our_current_position, /*copy=*/true))
@@ -856,7 +916,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]\tset PADDING (equal size)\n");
printf("SV[A]\tset PADDING (equal size)\n");
padding->set_length(app->get_length());
if(!replace_in_our_metadata_(padding, our_current_position, /*copy=*/true))
return die_("copying object");
@@ -866,7 +926,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[P]\tinsert PADDING after\n");
printf("SV[P]\tinsert PADDING after\n");
if(!iterator.insert_block_after(padding, false))
return die_ss_("iterator.insert_block_after(padding, false)", iterator);
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
@@ -875,7 +935,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SP[P]\tinsert PADDING after\n");
printf("SVP[P]\tinsert PADDING after\n");
padding->set_length(5);
if(!iterator.insert_block_after(padding, false))
return die_ss_("iterator.insert_block_after(padding, false)", iterator);
@@ -885,22 +945,22 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SPP[P]\tprev\n");
printf("SVPP[P]\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("SP[P]P\tprev\n");
printf("SVP[P]P\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("S[P]PP\tprev\n");
printf("SV[P]PP\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]PPP\tinsert APPLICATION after, try to expand into padding which is too small\n");
printf("S[V]PPP\tinsert APPLICATION after, try to expand into padding which is too small\n");
if(!app->set_data(data, 101, true))
return die_("setting APPLICATION data");
if(!insert_to_our_metadata_(app, ++our_current_position, /*copy=*/true))
@@ -911,7 +971,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]PPP\tdelete (middle block), don't replace with padding\n");
printf("SV[A]PPP\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -919,7 +979,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]PPP\tinsert APPLICATION after, try to expand into padding which is 'close' but still too small\n");
printf("S[V]PPP\tinsert APPLICATION after, try to expand into padding which is 'close' but still too small\n");
if(!app->set_data(data, 97, true))
return die_("setting APPLICATION data");
if(!insert_to_our_metadata_(app, ++our_current_position, /*copy=*/true))
@@ -930,7 +990,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]PPP\tdelete (middle block), don't replace with padding\n");
printf("SV[A]PPP\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -938,7 +998,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]PPP\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
printf("S[V]PPP\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
if(!app->set_data(data, 100, true))
return die_("setting APPLICATION data");
if(!insert_to_our_metadata_(app, ++our_current_position, /*copy=*/true))
@@ -950,7 +1010,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]PP\tdelete (middle block), don't replace with padding\n");
printf("SV[A]PP\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -958,7 +1018,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]PP\tinsert APPLICATION after, expand into padding which will leave 0-length pad\n");
printf("S[V]PP\tinsert APPLICATION after, expand into padding which will leave 0-length pad\n");
if(!app->set_data(data, 96, true))
return die_("setting APPLICATION data");
if(!insert_to_our_metadata_(app, ++our_current_position, /*copy=*/true))
@@ -970,7 +1030,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]PP\tdelete (middle block), don't replace with padding\n");
printf("SV[A]PP\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -978,12 +1038,12 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]PP\tnext\n");
printf("S[V]PP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]P\tdelete (middle block), don't replace with padding\n");
printf("SV[P]P\tdelete (middle block), don't replace with padding\n");
if(!iterator.delete_block(false))
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
@@ -991,7 +1051,7 @@ static bool test_level_1_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]P\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
printf("S[V]P\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
if(!app->set_data(data, 1, true))
return die_("setting APPLICATION data");
if(!insert_to_our_metadata_(app, ++our_current_position, /*copy=*/true))
@@ -1042,7 +1102,7 @@ static bool test_level_2_()
if(!chain.read(flacfile_))
return die_c_("reading chain", chain.status());
printf("[S]P\ttest initial metadata\n");
printf("[S]VP\ttest initial metadata\n");
if(!compare_chain_(chain, 0, 0))
return false;
@@ -1069,7 +1129,7 @@ static bool test_level_2_()
FLAC__ASSERT(block->get_type() == FLAC__METADATA_TYPE_STREAMINFO);
printf("[S]P\tmodify STREAMINFO, write\n");
printf("[S]VP\tmodify STREAMINFO, write\n");
streaminfo = dynamic_cast<FLAC::Metadata::StreamInfo *>(block);
FLAC__ASSERT(0 != streaminfo);
@@ -1084,12 +1144,17 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("[S]P\tnext\n");
printf("[S]VP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]\treplace PADDING with identical-size APPLICATION\n");
printf("S[V]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SV[P]\treplace PADDING with identical-size APPLICATION\n");
if(0 == (block = iterator.get_block()))
return die_("getting block from iterator");
if(0 == (app = new FLAC::Metadata::Application()))
@@ -1109,7 +1174,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]\tshrink APPLICATION, don't use padding\n");
printf("SV[A]\tshrink APPLICATION, don't use padding\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 26, true))
@@ -1126,7 +1191,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]\tgrow APPLICATION, don't use padding\n");
printf("SV[A]\tgrow APPLICATION, don't use padding\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 28, true))
@@ -1143,7 +1208,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]\tgrow APPLICATION, use padding, but last block is not padding\n");
printf("SV[A]\tgrow APPLICATION, use padding, but last block is not padding\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 36, true))
@@ -1160,7 +1225,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]\tshrink APPLICATION, use padding, last block is not padding, but delta is too small for new PADDING block\n");
printf("SV[A]\tshrink APPLICATION, use padding, last block is not padding, but delta is too small for new PADDING block\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 33, true))
@@ -1177,7 +1242,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]\tshrink APPLICATION, use padding, last block is not padding, delta is enough for new PADDING block\n");
printf("SV[A]\tshrink APPLICATION, use padding, last block is not padding, delta is enough for new PADDING block\n");
if(0 == (padding = new FLAC::Metadata::Padding()))
return die_("creating PADDING block");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
@@ -1199,7 +1264,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]P\tshrink APPLICATION, use padding, last block is padding\n");
printf("SV[A]P\tshrink APPLICATION, use padding, last block is padding\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 16, true))
@@ -1217,7 +1282,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]P\tgrow APPLICATION, use padding, last block is padding, but delta is too small\n");
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding, but delta is too small\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 50, true))
@@ -1234,7 +1299,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]P\tgrow APPLICATION, use padding, last block is padding of exceeding size\n");
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding of exceeding size\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 56, true))
@@ -1252,7 +1317,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]P\tgrow APPLICATION, use padding, last block is padding of exact size\n");
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding of exact size\n");
if(0 == (app = dynamic_cast<FLAC::Metadata::Application *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("copying object");
if(!app->set_data(data, 67, true))
@@ -1270,12 +1335,17 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S[A]\tprev\n");
printf("SV[A]\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]A\tinsert PADDING before STREAMINFO (should fail)\n");
printf("S[V]A\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]VA\tinsert PADDING before STREAMINFO (should fail)\n");
if(0 == (padding = new FLAC::Metadata::Padding()))
return die_("creating PADDING block");
padding->set_length(30);
@@ -1284,7 +1354,12 @@ static bool test_level_2_()
else
return die_("iterator.insert_block_before() should have returned false");
printf("[S]A\tinsert PADDING after\n");
printf("[S]VA\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[V]A\tinsert PADDING after\n");
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return die_("copying metadata");
if(!iterator.insert_block_after(padding))
@@ -1293,7 +1368,7 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("S[P]A\tinsert PADDING before\n");
printf("SV[P]A\tinsert PADDING before\n");
if(0 == (padding = dynamic_cast<FLAC::Metadata::Padding *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("creating PADDING block");
padding->set_length(17);
@@ -1305,7 +1380,7 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("S[P]PA\tinsert PADDING before\n");
printf("SV[P]PA\tinsert PADDING before\n");
if(0 == (padding = dynamic_cast<FLAC::Metadata::Padding *>(FLAC::Metadata::clone(our_metadata_.blocks[our_current_position]))))
return die_("creating PADDING block");
padding->set_length(0);
@@ -1317,23 +1392,23 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("S[P]PPA\tnext\n");
printf("SV[P]PPA\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SP[P]PA\tnext\n");
printf("SVP[P]PA\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SPP[P]A\tnext\n");
printf("SVPP[P]A\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SPPP[A]\tinsert PADDING after\n");
if(0 == (padding = dynamic_cast<FLAC::Metadata::Padding *>(FLAC::Metadata::clone(our_metadata_.blocks[1]))))
printf("SVPPP[A]\tinsert PADDING after\n");
if(0 == (padding = dynamic_cast<FLAC::Metadata::Padding *>(FLAC::Metadata::clone(our_metadata_.blocks[2]))))
return die_("creating PADDING block");
padding->set_length(57);
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
@@ -1344,8 +1419,8 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("SPPPA[P]\tinsert PADDING before\n");
if(0 == (padding = dynamic_cast<FLAC::Metadata::Padding *>(FLAC::Metadata::clone(our_metadata_.blocks[1]))))
printf("SVPPPA[P]\tinsert PADDING before\n");
if(0 == (padding = dynamic_cast<FLAC::Metadata::Padding *>(FLAC::Metadata::clone(our_metadata_.blocks[2]))))
return die_("creating PADDING block");
padding->set_length(99);
if(!insert_to_our_metadata_(padding, our_current_position, /*copy=*/true))
@@ -1359,14 +1434,14 @@ static bool test_level_2_()
}
our_current_position = 0;
printf("SPPPAPP\tmerge padding\n");
printf("SVPPPAPP\tmerge padding\n");
chain.merge_padding();
add_to_padding_length_(1, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[2]->get_length());
add_to_padding_length_(1, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[3]->get_length());
add_to_padding_length_(5, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[6]->get_length());
delete_from_our_metadata_(6);
add_to_padding_length_(2, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[3]->get_length());
add_to_padding_length_(2, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[4]->get_length());
add_to_padding_length_(6, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[7]->get_length());
delete_from_our_metadata_(7);
delete_from_our_metadata_(4);
delete_from_our_metadata_(3);
delete_from_our_metadata_(2);
if(!chain.write(/*use_padding=*/true, /*preserve_file_stats=*/false))
return die_c_("during chain.write(true, false)", chain.status());
@@ -1375,10 +1450,10 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("SPAP\tsort padding\n");
printf("SVPAP\tsort padding\n");
chain.sort_padding();
add_to_padding_length_(3, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[1]->get_length());
delete_from_our_metadata_(1);
add_to_padding_length_(4, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[2]->get_length());
delete_from_our_metadata_(2);
if(!chain.write(/*use_padding=*/true, /*preserve_file_stats=*/false))
return die_c_("during chain.write(true, false)", chain.status());
@@ -1397,12 +1472,17 @@ static bool test_level_2_()
iterator.init(chain);
printf("[S]AP\tnext\n");
printf("[S]VAP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[A]P\tdelete middle block, replace with padding\n");
printf("S[V]AP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("SV[A]P\tdelete middle block, replace with padding\n");
if(0 == (padding = new FLAC::Metadata::Padding()))
return die_("creating PADDING block");
padding->set_length(71);
@@ -1414,12 +1494,12 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("[S]PP\tnext\n");
printf("S[V]PP\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]P\tdelete middle block, don't replace with padding\n");
printf("SV[P]P\tdelete middle block, don't replace with padding\n");
delete_from_our_metadata_(our_current_position--);
if(!iterator.delete_block(/*replace_with_padding=*/false))
return die_c_("iterator.delete_block(false)", chain.status());
@@ -1427,12 +1507,12 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("[S]P\tnext\n");
printf("S[V]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]\tdelete last block, replace with padding\n");
printf("SV[P]\tdelete last block, replace with padding\n");
if(0 == (padding = new FLAC::Metadata::Padding()))
return die_("creating PADDING block");
padding->set_length(219);
@@ -1444,12 +1524,12 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("[S]P\tnext\n");
printf("S[V]P\tnext\n");
if(!iterator.next())
return die_("iterator ended early\n");
our_current_position++;
printf("S[P]\tdelete last block, don't replace with padding\n");
printf("SV[P]\tdelete last block, don't replace with padding\n");
delete_from_our_metadata_(our_current_position--);
if(!iterator.delete_block(/*replace_with_padding=*/false))
return die_c_("iterator.delete_block(false)", chain.status());
@@ -1457,7 +1537,12 @@ static bool test_level_2_()
if(!compare_chain_(chain, our_current_position, iterator.get_block()))
return false;
printf("[S]\tdelete STREAMINFO block, should fail\n");
printf("S[V]\tprev\n");
if(!iterator.prev())
return die_("iterator ended early\n");
our_current_position--;
printf("[S]V\tdelete STREAMINFO block, should fail\n");
if(iterator.delete_block(/*replace_with_padding=*/false))
return die_("iterator.delete_block() on STREAMINFO should have failed but didn't");
@@ -1467,7 +1552,7 @@ static bool test_level_2_()
}
our_current_position = 0;
printf("S\tmerge padding\n");
printf("SV\tmerge padding\n");
chain.merge_padding();
if(!chain.write(/*use_padding=*/false, /*preserve_file_stats=*/false))
@@ -1477,7 +1562,7 @@ static bool test_level_2_()
if(!test_file_(flacfile_, /*ignore_metadata=*/false))
return false;
printf("S\tsort padding\n");
printf("SV\tsort padding\n");
chain.sort_padding();
if(!chain.write(/*use_padding=*/false, /*preserve_file_stats=*/false))