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 number-of-colors field to PICTURE metadata block

Browse Source
This commit is contained in:
Josh Coalson
2006-09-23 23:15:05 +00:00
parent e343ab2b87
commit 74ed294764
15 changed files with 87 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test_libFLAC/metadata_manip.c
View File

@@ -556,6 +556,7 @@ static FLAC__bool generate_file_(FLAC__bool include_extras)
FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN +
FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN +
FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN +
FLAC__STREAM_METADATA_PICTURE_COLORS_LEN +
FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN /* will add the length for the data later */
) / 8
;
@@ -567,6 +568,7 @@ static FLAC__bool generate_file_(FLAC__bool include_extras)
picture.data.picture.width = 300;
picture.data.picture.height = 300;
picture.data.picture.depth = 24;
picture.data.picture.colors = 0;
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;
@@ -724,7 +726,7 @@ static FLAC__bool test_level_0_()
printf("testing FLAC__metadata_get_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)))
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), /*max_colors=*/(unsigned)(-1)))
return die_("during FLAC__metadata_get_picture()");
/* check to see if some basic data matches (c.f. generate_file_()) */

1
src/test_libFLAC/metadata_object.c
View File

@@ -2044,6 +2044,7 @@ FLAC__bool test_metadata_object()
FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN +
FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN +
FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN +
FLAC__STREAM_METADATA_PICTURE_COLORS_LEN +
FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN
) / 8;
if(block->length != expected_length) {