From: Josh Coalson Date: Thu, 30 May 2002 05:29:23 +0000 (+0000) Subject: updates to match new metadata object api changes X-Git-Tag: 1.2.0~1893 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce373636b4b2c8b97b3dd799d15d1acc07d252df;p=platform%2Fupstream%2Fflac.git updates to match new metadata object api changes --- diff --git a/src/test_unit/metadata_object.c b/src/test_unit/metadata_object.c index 2c3000b..2eaa01d 100644 --- a/src/test_unit/metadata_object.c +++ b/src/test_unit/metadata_object.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "FLAC/assert.h" #include "FLAC/metadata.h" #include "metadata_utils.h" #include @@ -36,15 +37,40 @@ static FLAC__byte *make_dummydata_(FLAC__byte *dummydata, unsigned len) return ret; } +static FLAC__bool compare_seekpoint_array_(const FLAC__StreamMetaData_SeekPoint *from, const FLAC__StreamMetaData_SeekPoint *to, unsigned n) +{ + unsigned i; + + FLAC__ASSERT(0 != from); + FLAC__ASSERT(0 != to); + + for(i = 0; i < n; i++) { + if(from[i].sample_number != to[i].sample_number) { + printf("FAILED, point[%u].sample_number mismatch, expected %llu, got %llu\n", i, to[i].sample_number, from[i].sample_number); + return false; + } + if(from[i].stream_offset != to[i].stream_offset) { + printf("FAILED, point[%u].stream_offset mismatch, expected %llu, got %llu\n", i, to[i].stream_offset, from[i].stream_offset); + return false; + } + if(from[i].frame_samples != to[i].frame_samples) { + printf("FAILED, point[%u].frame_samples mismatch, expected %u, got %u\n", i, to[i].frame_samples, from[i].frame_samples); + return false; + } + } + + return true; +} + int test_metadata_object() { FLAC__StreamMetaData *block, *blockcopy; - FLAC__StreamMetaData_SeekPoint *seekpoint_array, *seekpoint_array_copy; + FLAC__StreamMetaData_SeekPoint seekpoint_array[3]; FLAC__StreamMetaData_VorbisComment_Entry *vorbiscomment_entry_array, *vorbiscomment_entry_array_copy; - unsigned expected_length; + unsigned expected_length, seekpoints; static FLAC__byte dummydata[4] = { 'a', 'b', 'c', 'd' }; - printf("\n+++ unit test: metadata objects\n\n"); + printf("\n+++ unit test: metadata objects (libFLAC)\n\n"); printf("testing STREAMINFO\n"); @@ -202,6 +228,435 @@ int test_metadata_object() printf("testing SEEKTABLE\n"); + seekpoint_array[0].sample_number = FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER; + seekpoint_array[0].stream_offset = 0; + seekpoint_array[0].frame_samples = 0; + seekpoint_array[1].sample_number = FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER; + seekpoint_array[1].stream_offset = 0; + seekpoint_array[1].frame_samples = 0; + + printf("testing FLAC__metadata_object_new()... "); + block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE); + if(0 == block) { + printf("FAILED, returned NULL\n"); + return 1; + } + expected_length = 0; + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + printf("OK\n"); + + seekpoints = 2; + printf("testing FLAC__metadata_object_seektable_resize_points(grow to %u)...", seekpoints); + if(!FLAC__metadata_object_seektable_resize_points(block, seekpoints)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = seekpoints * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH; + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + if(block->data.seek_table.num_points != seekpoints) { + printf("FAILED, expected %u points, got %u\n", seekpoints, block->data.seek_table.num_points); + return 1; + } + if(!compare_seekpoint_array_(block->data.seek_table.points, seekpoint_array, seekpoints)) + return 1; + printf("OK\n"); + + seekpoints = 1; + printf("testing FLAC__metadata_object_seektable_resize_points(shrink to %u)...", seekpoints); + if(!FLAC__metadata_object_seektable_resize_points(block, seekpoints)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = seekpoints * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH; + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + if(block->data.seek_table.num_points != seekpoints) { + printf("FAILED, expected %u point, got %u\n", seekpoints, block->data.seek_table.num_points); + return 1; + } + if(!compare_seekpoint_array_(block->data.seek_table.points, seekpoint_array, seekpoints)) + return 1; + printf("OK\n"); + + seekpoints = 0; + printf("testing FLAC__metadata_object_seektable_resize_points(shrink to %u)...", seekpoints); + if(!FLAC__metadata_object_seektable_resize_points(block, seekpoints)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = seekpoints * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH; + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + if(block->data.seek_table.num_points != seekpoints) { + printf("FAILED, expected %u points, got %u\n", seekpoints, block->data.seek_table.num_points); + return 1; + } + if(0 != block->data.seek_table.points) { + printf("FAILED, 'points' pointer is not null\n"); + return 1; + } + printf("OK\n"); + + + + printf("testing VORBIS_COMMENT\n"); + + printf("testing FLAC__metadata_object_new()... "); + block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); + if(0 == block) { + printf("FAILED, returned NULL\n"); + return 1; + } + expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN + 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 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + printf("OK\n"); + +#if 0 + printf("testing FLAC__metadata_object_vorbiscomment_set_vendor_string(copy)\n"); + if(!FLAC__metadata_object_vorbiscomment_set_vendor_string(block, dummydata, sizeof(dummydata), true/*copy*/)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)) + (FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN / 8) + block->data.vorbis_comment.num_comments * ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)); + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + + printf("testing FLAC__metadata_object_vorbiscomment_set_vendor_string(own)\n"); + if(!FLAC__metadata_object_vorbiscomment_set_vendor_string(block, make_dummydata_(dummydata, sizeof(dummydata)), sizeof(dummydata), false/*own*/)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)) + (FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN / 8) + block->data.vorbis_comment.num_comments * ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)); + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + + printf("testing FLAC__metadata_object_vorbiscomment_entry_array_new()... "); + vorbiscomment_entry_array = FLAC__metadata_object_vorbiscomment_entry_array_new(1u); + if(0 == vorbiscomment_entry_array) { + printf("FAILED, returned NULL\n"); + return 1; + } + printf("OK\n"); + + vorbiscomment_entry_array[0].length = sizeof(dummydata); + vorbiscomment_entry_array[0].entry = make_dummydata_(dummydata, sizeof(dummydata)); + + printf("testing FLAC__metadata_object_vorbiscomment_entry_array_copy()... "); + vorbiscomment_entry_array_copy = FLAC__metadata_object_vorbiscomment_entry_array_copy(vorbiscomment_entry_array, 1u); + if(0 == vorbiscomment_entry_array_copy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_vorbiscomment_entry_array_(vorbiscomment_entry_array, vorbiscomment_entry_array_copy, 1u)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_entry_array_resize(grow)..."); + if(!FLAC__metadata_object_vorbiscomment_entry_array_resize(&vorbiscomment_entry_array_copy, 1u, 10u)) { + printf("FAILED, returned false\n"); + return 1; + } + if(!compare_vorbiscomment_entry_array_(vorbiscomment_entry_array, vorbiscomment_entry_array_copy, 1u)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_entry_array_resize(shrink)..."); + if(!FLAC__metadata_object_vorbiscomment_entry_array_resize(&vorbiscomment_entry_array_copy, 10u, 1u)) { + printf("FAILED, returned false\n"); + return 1; + } + if(!compare_vorbiscomment_entry_array_(vorbiscomment_entry_array, vorbiscomment_entry_array_copy, 1u)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_entry_array_delete()... "); + FLAC__metadata_object_vorbiscomment_entry_array_delete(vorbiscomment_entry_array_copy, 1u); + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_set_comments(copy)... "); + if(!FLAC__metadata_object_vorbiscomment_set_comments(block, vorbiscomment_entry_array, 1u, true/*copy*/)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)) + (FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN / 8) + block->data.vorbis_comment.num_comments * ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)); + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + if(block->data.vorbis_comment.num_comments != 1u) { + printf("FAILED, bad num_comments, expected %u, got %u\n", 1u, block->data.vorbis_comment.num_comments); + return 1; + } + if(!compare_vorbiscomment_entry_array_(block->data.vorbis_comment.comments, vorbiscomment_entry_array, 1u)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + printf("OK\n"); + + printf("testing FLAC__metadata_object_vorbiscomment_set_comments(own)... "); + if(!FLAC__metadata_object_vorbiscomment_set_comments(block, vorbiscomment_entry_array, 1u, false/*own*/)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)) + (FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN / 8) + block->data.vorbis_comment.num_comments * ((FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8) + sizeof(dummydata)); + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); +#endif + FLAC__metadata_object_delete(block); + printf("OK\n"); + + + return 0; +} + +#if 0 +int test_metadata_object_pp() +{ + FLAC::Metadata::Prototype *block, *blockcopy; + FLAC__StreamMetaData_SeekPoint *seekpoint_array, *seekpoint_array_copy; + FLAC__StreamMetaData_VorbisComment_Entry *vorbiscomment_entry_array, *vorbiscomment_entry_array_copy; + unsigned expected_length; + static FLAC__byte dummydata[4] = { 'a', 'b', 'c', 'd' }; + + printf("\n+++ unit test: metadata objects (libFLAC++)\n\n"); + + + printf("testing STREAMINFO\n"); + + printf("testing FLAC::Metadata::StreamInfo::StreamInfo()... "); + block = new FLAC::Metadata::StreamInfo(); + if(0 == block) { + printf("FAILED, new returned NULL\n"); + return 1; + } + if(!block->is_valid()) { + printf("FAILED, !block->is_valid()\n"); + return 1; + } + if(block->is_valid() != *block) { + printf("FAILED, FLAC::Metadata::Prototype::operator bool() is broken\n"); + return 1; + } + expected_length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH; + if(block->length() != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length()); + return 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = new FLAC::Metadata::StreamInfo(block); + if(0 == blockcopy) { + printf("FAILED, new returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + FLAC__metadata_object_delete(block); + printf("OK\n"); + + + printf("testing PADDING\n"); + + printf("testing FLAC__metadata_object_new()... "); + block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING); + if(0 == block) { + printf("FAILED, returned NULL\n"); + return 1; + } + expected_length = 0; + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + FLAC__metadata_object_delete(block); + printf("OK\n"); + + + printf("testing APPLICATION\n"); + + printf("testing FLAC__metadata_object_new()... "); + block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_APPLICATION); + if(0 == block) { + printf("FAILED, returned NULL\n"); + return 1; + } + expected_length = FLAC__STREAM_METADATA_APPLICATION_ID_LEN / 8; + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + printf("OK\n"); + + printf("testing FLAC__metadata_object_application_set_data(copy)... "); + if(!FLAC__metadata_object_application_set_data(block, dummydata, sizeof(dummydata), true/*copy*/)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = (FLAC__STREAM_METADATA_APPLICATION_ID_LEN / 8) + sizeof(dummydata); + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + if(0 != memcmp(block->data.application.data, dummydata, sizeof(dummydata))) { + printf("FAILED, data mismatch\n"); + return 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + printf("OK\n"); + + printf("testing FLAC__metadata_object_application_set_data(own)... "); + if(!FLAC__metadata_object_application_set_data(block, make_dummydata_(dummydata, sizeof(dummydata)), sizeof(dummydata), false/*own*/)) { + printf("FAILED, returned false\n"); + return 1; + } + expected_length = (FLAC__STREAM_METADATA_APPLICATION_ID_LEN / 8) + sizeof(dummydata); + if(block->length != expected_length) { + printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length); + return 1; + } + if(0 != memcmp(block->data.application.data, dummydata, sizeof(dummydata))) { + printf("FAILED, data mismatch\n"); + return 1; + } + printf("OK\n"); + + printf("testing FLAC__metadata_object_copy()... "); + blockcopy = FLAC__metadata_object_copy(block); + if(0 == blockcopy) { + printf("FAILED, returned NULL\n"); + return 1; + } + if(!compare_block_(block, blockcopy)) + return 1; + printf("OK\n"); + + printf("testing FLAC__metadata_object_delete()... "); + FLAC__metadata_object_delete(blockcopy); + FLAC__metadata_object_delete(block); + printf("OK\n"); + + + printf("testing SEEKTABLE\n"); + printf("testing FLAC__metadata_object_new()... "); block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE); if(0 == block) { @@ -489,3 +944,4 @@ int test_metadata_object() return 0; } +#endif diff --git a/src/test_unit/metadata_utils.c b/src/test_unit/metadata_utils.c index ec65fb5..c31e502 100644 --- a/src/test_unit/metadata_utils.c +++ b/src/test_unit/metadata_utils.c @@ -237,37 +237,3 @@ FLAC__bool compare_block_(const FLAC__StreamMetaData *block, const FLAC__StreamM return false; } } - -FLAC__bool compare_seekpoint_array_(const FLAC__StreamMetaData_SeekPoint *seekpoint_array, const FLAC__StreamMetaData_SeekPoint *seekpoint_array_copy, unsigned num_points) -{ - if(0 != memcmp(seekpoint_array, seekpoint_array_copy, num_points * sizeof(FLAC__StreamMetaData_SeekPoint))) { - printf("FAILED, seekpoint mismatch\n"); - return false; - } - return true; -} - -FLAC__bool compare_vorbiscomment_entry_array_(const FLAC__StreamMetaData_VorbisComment_Entry *vorbiscomment_entry_array, const FLAC__StreamMetaData_VorbisComment_Entry *vorbiscomment_entry_array_copy, unsigned num_comments) -{ - unsigned i; - - for(i = 0; i < num_comments; i++) { - if(vorbiscomment_entry_array[i].length != vorbiscomment_entry_array_copy[i].length) { - printf("FAILED, entry[%u].length mismatch\n", i); - return false; - } - if(0 == vorbiscomment_entry_array[i].entry || 0 == vorbiscomment_entry_array_copy[i].entry) { - if(vorbiscomment_entry_array[i].entry != vorbiscomment_entry_array_copy[i].entry) { - printf("FAILED, comments[%u].entry mismatch\n", i); - return false; - } - } - else { - if(0 != memcmp(vorbiscomment_entry_array[i].entry, vorbiscomment_entry_array_copy[i].entry, vorbiscomment_entry_array[i].length)) { - printf("FAILED, entry[%u].entry mismatch\n", i); - return false; - } - } - } - return true; -} diff --git a/src/test_unit/metadata_utils.h b/src/test_unit/metadata_utils.h index b57c97a..ab982c1 100644 --- a/src/test_unit/metadata_utils.h +++ b/src/test_unit/metadata_utils.h @@ -40,8 +40,4 @@ FLAC__bool compare_block_data_vorbiscomment_(const FLAC__StreamMetaData_VorbisCo FLAC__bool compare_block_(const FLAC__StreamMetaData *block, const FLAC__StreamMetaData *blockcopy); -FLAC__bool compare_seekpoint_array_(const FLAC__StreamMetaData_SeekPoint *seekpoint_array, const FLAC__StreamMetaData_SeekPoint *seekpoint_array_copy, unsigned num_points); - -FLAC__bool compare_vorbiscomment_entry_array_(const FLAC__StreamMetaData_VorbisComment_Entry *vorbiscomment_entry_array, const FLAC__StreamMetaData_VorbisComment_Entry *vorbiscomment_entry_array_copy, unsigned num_comments); - #endif