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

add support for new PICTURE metadata block

Browse Source
This commit is contained in:
Josh Coalson
2006-09-23 19:21:19 +00:00
parent aa1edebacd
commit e343ab2b87
26 changed files with 2036 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/test_libFLAC++/metadata_manip.cpp
View File

@@ -106,6 +106,16 @@ static void *malloc_or_die_(size_t size)
return x;
}
static char *strdup_or_die_(const char *s)
{
char *x = strdup(s);
if(0 == x) {
fprintf(stderr, "ERROR: out of memory copying string \"%s\"\n", s);
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)
@@ -474,10 +484,10 @@ void OurFileDecoder::error_callback(::FLAC__StreamDecoderErrorStatus status)
printf("ERROR: got error callback, status = %s (%u)\n", FLAC__StreamDecoderErrorStatusString[status], (unsigned)status);
}
static bool generate_file_(FLAC__bool include_cuesheet)
static bool generate_file_(FLAC__bool include_extras)
{
::FLAC__StreamMetadata streaminfo, vorbiscomment, *cuesheet, padding;
::FLAC__StreamMetadata *metadata[3];
::FLAC__StreamMetadata streaminfo, vorbiscomment, *cuesheet, picture, padding;
::FLAC__StreamMetadata *metadata[4];
unsigned i = 0, n = 0;
printf("generating FLAC file for test\n");
@@ -524,23 +534,54 @@ static bool generate_file_(FLAC__bool include_cuesheet)
return die_("priming our metadata");
}
{
picture.is_last = false;
picture.type = ::FLAC__METADATA_TYPE_PICTURE;
picture.length =
(
FLAC__STREAM_METADATA_PICTURE_TYPE_LEN +
FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN + /* will add the length for the string later */
FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN + /* will add the length for the string later */
FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN +
FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN +
FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN +
FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN /* will add the length for the data later */
) / 8
;
picture.data.picture.type = ::FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER;
picture.data.picture.mime_type = strdup_or_die_("image/jpeg");
picture.length += strlen(picture.data.picture.mime_type);
picture.data.picture.description = (FLAC__byte*)strdup_or_die_("desc");
picture.length += strlen((const char *)picture.data.picture.description);
picture.data.picture.width = 300;
picture.data.picture.height = 300;
picture.data.picture.depth = 24;
picture.data.picture.data = (FLAC__byte*)strdup_or_die_("SOMEJPEGDATA");
picture.data.picture.data_length = strlen((const char *)picture.data.picture.data);
picture.length += picture.data.picture.data_length;
}
padding.is_last = true;
padding.type = ::FLAC__METADATA_TYPE_PADDING;
padding.length = 1234;
metadata[n++] = &vorbiscomment;
if (include_cuesheet)
if(include_extras) {
metadata[n++] = cuesheet;
metadata[n++] = &picture;
}
metadata[n++] = &padding;
FLAC::Metadata::StreamInfo s(&streaminfo);
FLAC::Metadata::VorbisComment v(&vorbiscomment);
FLAC::Metadata::CueSheet c(cuesheet, /*copy=*/false);
FLAC::Metadata::Picture pi(&picture);
FLAC::Metadata::Padding p(&padding);
if(
!insert_to_our_metadata_(&s, i++, /*copy=*/true) ||
!insert_to_our_metadata_(&v, i++, /*copy=*/true) ||
(include_cuesheet && !insert_to_our_metadata_(&v, i++, /*copy=*/true)) ||
(include_extras && !insert_to_our_metadata_(&c, i++, /*copy=*/true)) ||
(include_extras && !insert_to_our_metadata_(&pi, i++, /*copy=*/true)) ||
!insert_to_our_metadata_(&p, i++, /*copy=*/true)
)
return die_("priming our metadata");
@@ -616,7 +657,7 @@ static bool test_level_0_()
printf("\n\n++++++ testing level 0 interface\n");
if(!generate_file_(/*include_cuesheet=*/true))
if(!generate_file_(/*include_extras=*/true))
return false;
if(!test_file_(flacfile_, /*ignore_metadata=*/true))
@@ -705,6 +746,38 @@ static bool test_level_0_()
printf("OK\n");
}
{
printf("testing FLAC::Metadata::get_picture(Picture *&)... ");
FLAC::Metadata::Picture *picture = 0;
if(!FLAC::Metadata::get_picture(flacfile_, picture, /*type=*/(::FLAC__StreamMetadata_Picture_Type)(-1), /*mime_type=*/0, /*description=*/0, /*max_width=*/(unsigned)(-1), /*max_height=*/(unsigned)(-1), /*max_depth=*/(unsigned)(-1)))
return die_("during FLAC::Metadata::get_picture()");
/* check to see if some basic data matches (c.f. generate_file_()) */
if(picture->get_type () != ::FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER)
return die_("mismatch in picture->get_type ()");
printf("OK\n");
delete picture;
}
{
printf("testing FLAC::Metadata::get_picture(Picture &)... ");
FLAC::Metadata::Picture picture;
if(!FLAC::Metadata::get_picture(flacfile_, picture, /*type=*/(::FLAC__StreamMetadata_Picture_Type)(-1), /*mime_type=*/0, /*description=*/0, /*max_width=*/(unsigned)(-1), /*max_height=*/(unsigned)(-1), /*max_depth=*/(unsigned)(-1)))
return die_("during FLAC::Metadata::get_picture()");
/* check to see if some basic data matches (c.f. generate_file_()) */
if(picture.get_type () != ::FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER)
return die_("mismatch in picture->get_type ()");
printf("OK\n");
}
if(!remove_file_(flacfile_))
return false;
@@ -729,7 +802,7 @@ static bool test_level_1_()
{
printf("simple iterator on read-only file\n");
if(!generate_file_(/*include_cuesheet=*/false))
if(!generate_file_(/*include_extras=*/false))
return false;
if(!change_stats_(flacfile_, /*read_only=*/true))
@@ -1394,7 +1467,7 @@ static bool test_level_2_(bool filename_based)
printf("generate read-only file\n");
if(!generate_file_(/*include_cuesheet=*/false))
if(!generate_file_(/*include_extras=*/false))
return false;
if(!change_stats_(flacfile_, /*read_only=*/true))
@@ -1949,7 +2022,7 @@ static bool test_level_2_misc_()
printf("generate file\n");
if(!generate_file_(/*include_cuesheet=*/false))
if(!generate_file_(/*include_extras=*/false))
return false;
printf("create chain\n");