<li>
metaflac:
<ul>
+ <li>Added support for read-only operations on Ogg FLAC files.</li>
<li>Added a new option <span class="argument"><a href="documentation.html#metaflac_shorthand_set_tag_from_file">--set-tag-from-file</a></span> for setting a tag from file (e.g. for importing a cuesheet as a tag).</li>
<li>Added a new option <span class="argument"><a href="documentation.html#metaflac_shorthand_import_picture_from">--import-picture-from</a></span> for importing pictures.</li>
<li>Added a new option <span class="argument"><a href="documentation.html#metaflac_shorthand_export_picture_to">--export-picture-to</a></span> for exporting pictures.</li>
<li><b>Added</b> FLAC__metadata_object_cuesheet_calculate_cddb_id()</li>
<li><b>Added</b> FLAC__metadata_get_cuesheet()</li>
<li><b>Added</b> FLAC__metadata_get_picture()</li>
+ <li><b>Added</b> FLAC__metadata_chain_read_ogg() and FLAC__metadata_chain_read_ogg_with_callbacks()</li>
<li><b>Changed</b> FLAC__stream_encoder_finish() now returns a FLAC__bool to signal a verify failure.</li>
<li><b>Changed</b> FLAC__StreamDecoderState: removed state FLAC__STREAM_DECODER_UNPARSEABLE_STREAM</li>
<li><b>Changed</b> FLAC__StreamDecoderErrorStatus: new error code FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM</li>
<li><b>Added</b> FLAC::Metadata::CueSheet::calculate_cddb_id()</li>
<li><b>Added</b> FLAC::Metadata::get_cuesheet()</li>
<li><b>Added</b> FLAC::Metadata::get_picture()</li>
+ <li><b>Changed</b> FLAC::Metadata::Chain::read() to accept a flag denoting Ogg FLAC input</li>
<li><b>Changed</b> FLAC::Decoder::Stream::finish() now returns a bool to signal an MD5 failure like FLAC__stream_decoder_finish() does.</li>
<li><b>Changed</b> FLAC::Encoder::Stream::finish() now returns a bool to signal a verify failure.</li>
</ul>
Status status(); ///< See FLAC__metadata_chain_status().
- bool read(const char *filename); ///< See FLAC__metadata_chain_read().
- bool read(FLAC__IOHandle handle, FLAC__IOCallbacks callbacks); ///< See FLAC__metadata_chain_read_with_callbacks().
+ bool read(const char *filename, bool is_ogg = false); ///< See FLAC__metadata_chain_read(), FLAC__metadata_chain_read_ogg().
+ bool read(FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, bool is_ogg = false); ///< See FLAC__metadata_chain_read_with_callbacks(), FLAC__metadata_chain_read_ogg_with_callbacks().
bool check_if_tempfile_needed(bool use_padding); ///< See FLAC__metadata_chain_check_if_tempfile_needed().
* all metadata is read into memory, operated on in memory, and then written
* to file, which is more efficient than level 1 when editing multiple blocks.
*
+ * Currently Ogg FLAC is supported for read only, via
+ * FLAC__metadata_chain_read_ogg() but a subsequent
+ * FLAC__metadata_chain_write() will fail.
+ *
* The general usage of this interface is:
*
* - Create a new chain using FLAC__metadata_chain_new(). A chain is a
* linked list of FLAC metadata blocks.
* - Read all metadata into the the chain from a FLAC file using
- * FLAC__metadata_chain_read() and check the status.
+ * FLAC__metadata_chain_read() or FLAC__metadata_chain_read_ogg() and
+ * check the status.
* - Optionally, consolidate the padding using
* FLAC__metadata_chain_merge_padding() or
* FLAC__metadata_chain_sort_padding().
* Even though the FLAC file is not open while the chain is being
* manipulated, you must not alter the file externally during
* this time. The chain assumes the FLAC file will not change
- * between the time of FLAC__metadata_chain_read() and
- * FLAC__metadata_chain_write().
+ * between the time of FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg()
+ * and FLAC__metadata_chain_write().
*
* \note
* Do not modify the is_last, length, or type fields of returned
FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH,
/**< FLAC__metadata_chain_write() was called on a chain read by
- * FLAC__metadata_chain_read_with_callbacks(), or
- * FLAC__metadata_chain_write_with_callbacks() or
- * FLAC__metadata_chain_write_with_callbacks_and_tempfile() was
- * called on a chain read by FLAC__metadata_chain_read(). Matching
- * read/write methods must always be used. */
+ * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
+ * or
+ * FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile()
+ * was called on a chain read by
+ * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
+ * Matching read/write methods must always be used. */
FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL
/**< FLAC__metadata_chain_write_with_callbacks() was called when the
*/
FLAC_API FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const char *filename);
+/*@@@@ add to unit tests*/
+/** Read all metadata from an Ogg FLAC file into the chain.
+ *
+ * \note Ogg FLAC metadata data writing is not supported yet and
+ * FLAC__metadata_chain_write() will fail.
+ *
+ * \param chain A pointer to an existing chain.
+ * \param filename The path to the Ogg FLAC file to read.
+ * \assert
+ * \code chain != NULL \endcode
+ * \code filename != NULL \endcode
+ * \retval FLAC__bool
+ * \c true if a valid list of metadata blocks was read from
+ * \a filename, else \c false. On failure, check the status with
+ * FLAC__metadata_chain_status().
+ */
+FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg(FLAC__Metadata_Chain *chain, const char *filename);
+
/** Read all metadata from a FLAC stream into the chain via I/O callbacks.
*
* The \a handle need only be open for reading, but must be seekable.
*/
FLAC_API FLAC__bool FLAC__metadata_chain_read_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
+/*@@@@ add to unit tests*/
+/** Read all metadata from an Ogg FLAC stream into the chain via I/O callbacks.
+ *
+ * The \a handle need only be open for reading, but must be seekable.
+ * The equivalent minimum stdio fopen() file mode is \c "r" (or \c "rb"
+ * for Windows).
+ *
+ * \note Ogg FLAC metadata data writing is not supported yet and
+ * FLAC__metadata_chain_write() will fail.
+ *
+ * \param chain A pointer to an existing chain.
+ * \param handle The I/O handle of the Ogg FLAC stream to read. The
+ * handle will NOT be closed after the metadata is read;
+ * that is the duty of the caller.
+ * \param callbacks
+ * A set of callbacks to use for I/O. The mandatory
+ * callbacks are \a read, \a seek, and \a tell.
+ * \assert
+ * \code chain != NULL \endcode
+ * \retval FLAC__bool
+ * \c true if a valid list of metadata blocks was read from
+ * \a handle, else \c false. On failure, check the status with
+ * FLAC__metadata_chain_status().
+ */
+FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
+
/** Checks if writing the given chain would require the use of a
* temporary file, or if it could be written in place.
*
* be preserved even if the FLAC file is written.
*
* For this write function to be used, the chain must have been read with
- * FLAC__metadata_chain_read(), not FLAC__metadata_chain_read_with_callbacks().
+ * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(), not
+ * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks().
*
* \param chain A pointer to an existing chain.
* \param use_padding See above.
* for Windows).
*
* For this write function to be used, the chain must have been read with
- * FLAC__metadata_chain_read_with_callbacks(), not FLAC__metadata_chain_read().
+ * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
+ * not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
* Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned
* \c false.
*
* truncate it on return).
*
* For this write function to be used, the chain must have been read with
- * FLAC__metadata_chain_read_with_callbacks(), not FLAC__metadata_chain_read().
+ * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
+ * not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
* Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned
* \c true.
*
return Status(::FLAC__metadata_chain_status(chain_));
}
- bool Chain::read(const char *filename)
+ bool Chain::read(const char *filename, bool is_ogg)
{
FLAC__ASSERT(0 != filename);
FLAC__ASSERT(is_valid());
- return (bool)::FLAC__metadata_chain_read(chain_, filename);
+ return is_ogg?
+ (bool)::FLAC__metadata_chain_read_ogg(chain_, filename) :
+ (bool)::FLAC__metadata_chain_read(chain_, filename)
+ ;
}
- bool Chain::read(FLAC__IOHandle handle, ::FLAC__IOCallbacks callbacks)
+ bool Chain::read(FLAC__IOHandle handle, ::FLAC__IOCallbacks callbacks, bool is_ogg)
{
FLAC__ASSERT(is_valid());
- return (bool)::FLAC__metadata_chain_read_with_callbacks(chain_, handle, callbacks);
+ return is_ogg?
+ (bool)::FLAC__metadata_chain_read_ogg_with_callbacks(chain_, handle, callbacks) :
+ (bool)::FLAC__metadata_chain_read_with_callbacks(chain_, handle, callbacks)
+ ;
}
bool Chain::check_if_tempfile_needed(bool use_padding)
struct FLAC__Metadata_Chain {
char *filename; /* will be NULL if using callbacks */
+ FLAC__bool is_ogg;
FLAC__Metadata_Node *head;
FLAC__Metadata_Node *tail;
unsigned nodes;
* or not the whole file has to be rewritten.
*/
off_t initial_length;
+ /* @@@ hacky, these are currently only needed by ogg reader */
+ FLAC__IOHandle handle;
+ FLAC__IOCallback_Read read_cb;
};
struct FLAC__Metadata_Iterator {
FLAC__ASSERT(0 != chain);
chain->filename = 0;
+ chain->is_ogg = false;
chain->head = chain->tail = 0;
chain->nodes = 0;
chain->status = FLAC__METADATA_CHAIN_STATUS_OK;
chain->initial_length = 0;
+ chain->read_cb = 0;
}
static void chain_clear_(FLAC__Metadata_Chain *chain)
return true;
}
+FLAC__StreamDecoderReadStatus chain_read_ogg_read_cb_(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+{
+ FLAC__Metadata_Chain *chain = (FLAC__Metadata_Chain*)client_data;
+ (void)decoder;
+ if(*bytes > 0 && chain->status == FLAC__METADATA_CHAIN_STATUS_OK) {
+ *bytes = chain->read_cb(buffer, sizeof(FLAC__byte), *bytes, chain->handle);
+ if(*bytes == 0)
+ return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+ else
+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+ else
+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+}
+
+static FLAC__StreamDecoderWriteStatus chain_read_ogg_write_cb_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+{
+ (void)decoder, (void)frame, (void)buffer, (void)client_data;
+ return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+}
+
+static void chain_read_ogg_metadata_cb_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+{
+ FLAC__Metadata_Chain *chain = (FLAC__Metadata_Chain*)client_data;
+
+ (void)decoder;
+
+ FLAC__Metadata_Node *node = node_new_();
+ if(0 == node) {
+ chain->status = FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR;
+ return;
+ }
+
+ node->data = FLAC__metadata_object_clone(metadata);
+ if(0 == node->data) {
+ node_delete_(node);
+ chain->status = FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR;
+ return;
+ }
+
+ chain_append_node_(chain, node);
+}
+
+static void chain_read_ogg_error_cb_(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+{
+ FLAC__Metadata_Chain *chain = (FLAC__Metadata_Chain*)client_data;
+ (void)decoder, (void)status;
+ chain->status = FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR; /*@@@ maybe needs better error code */
+}
+
+static FLAC__bool chain_read_ogg_cb_(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb)
+{
+ FLAC__StreamDecoder *decoder;
+
+ FLAC__ASSERT(0 != chain);
+
+ /* we assume we're already at the beginning of the file */
+
+ chain->handle = handle;
+ chain->read_cb = read_cb;
+ if(0 == (decoder = FLAC__stream_decoder_new())) {
+ chain->status = FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR;
+ return false;
+ }
+ FLAC__stream_decoder_set_metadata_respond_all(decoder);
+ if(FLAC__stream_decoder_init_ogg_stream(decoder, chain_read_ogg_read_cb_, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, /*eof_callback=*/0, chain_read_ogg_write_cb_, chain_read_ogg_metadata_cb_, chain_read_ogg_error_cb_, chain) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
+ FLAC__stream_decoder_delete(decoder);
+ chain->status = FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR; /*@@@ maybe needs better error code */
+ return false;
+ }
+
+ chain->first_offset = 0; /*@@@ wrong; will need to be set correctly to implement metadata writing for Ogg FLAC */
+
+ if(!FLAC__stream_decoder_process_until_end_of_metadata(decoder))
+ chain->status = FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR; /*@@@ maybe needs better error code */
+ if(chain->status != FLAC__METADATA_CHAIN_STATUS_OK) {
+ FLAC__stream_decoder_delete(decoder);
+ return false;
+ }
+
+ FLAC__stream_decoder_delete(decoder);
+
+ chain->last_offset = 0; /*@@@ wrong; will need to be set correctly to implement metadata writing for Ogg FLAC */
+
+ chain->initial_length = chain_calculate_length_(chain);
+
+ return true;
+}
+
static FLAC__bool chain_rewrite_metadata_in_place_cb_(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallback_Write write_cb, FLAC__IOCallback_Seek seek_cb)
{
FLAC__Metadata_Node *node;
return status;
}
-FLAC_API FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const char *filename)
+static FLAC__bool chain_read_(FLAC__Metadata_Chain *chain, const char *filename, FLAC__bool is_ogg)
{
FILE *file;
FLAC__bool ret;
return false;
}
+ chain->is_ogg = is_ogg;
+
if(0 == (file = fopen(filename, "rb"))) {
chain->status = FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE;
return false;
}
- /* chain_read_cb_() sets chain->status for us */
- ret = chain_read_cb_(chain, file, (FLAC__IOCallback_Read)fread, fseek_wrapper_, ftell_wrapper_);
+ /* the function also sets chain->status for us */
+ ret = is_ogg?
+ chain_read_ogg_cb_(chain, file, (FLAC__IOCallback_Read)fread) :
+ chain_read_cb_(chain, file, (FLAC__IOCallback_Read)fread, fseek_wrapper_, ftell_wrapper_)
+ ;
fclose(file);
return ret;
}
-FLAC_API FLAC__bool FLAC__metadata_chain_read_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
+FLAC_API FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const char *filename)
+{
+ return chain_read_(chain, filename, /*is_ogg=*/false);
+}
+
+FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg(FLAC__Metadata_Chain *chain, const char *filename)
+{
+ return chain_read_(chain, filename, /*is_ogg=*/true);
+}
+
+static FLAC__bool chain_read_with_callbacks_(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__bool is_ogg)
{
+ FLAC__bool ret;
+
FLAC__ASSERT(0 != chain);
chain_clear_(chain);
return false;
}
+ chain->is_ogg = is_ogg;
+
/* rewind */
if(0 != callbacks.seek(handle, 0, SEEK_SET)) {
chain->status = FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR;
return false;
}
- if(!chain_read_cb_(chain, handle, callbacks.read, callbacks.seek, callbacks.tell))
- return false; /* chain->status is already set by chain_read_cb_ */
+ /* the function also sets chain->status for us */
+ ret = is_ogg?
+ chain_read_ogg_cb_(chain, handle, callbacks.read) :
+ chain_read_cb_(chain, handle, callbacks.read, callbacks.seek, callbacks.tell)
+ ;
- return true;
+ return ret;
+}
+
+FLAC_API FLAC__bool FLAC__metadata_chain_read_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
+{
+ return chain_read_with_callbacks_(chain, handle, callbacks, /*is_ogg=*/false);
+}
+
+FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
+{
+ return chain_read_with_callbacks_(chain, handle, callbacks, /*is_ogg=*/true);
}
FLAC_API FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed(FLAC__Metadata_Chain *chain, FLAC__bool use_padding)
FLAC__ASSERT(0 != chain);
+ if (chain->is_ogg) { /* cannot write back to Ogg FLAC yet */
+ chain->status = FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR;
+ return false;
+ }
+
if (0 == chain->filename) {
chain->status = FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH;
return false;
FLAC__ASSERT(0 != chain);
+ if (chain->is_ogg) { /* cannot write back to Ogg FLAC yet */
+ chain->status = FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR;
+ return false;
+ }
+
if (0 != chain->filename) {
chain->status = FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH;
return false;
FLAC__ASSERT(0 != chain);
+ if (chain->is_ogg) { /* cannot write back to Ogg FLAC yet */
+ chain->status = FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR;
+ return false;
+ }
+
if (0 != chain->filename) {
chain->status = FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH;
return false;
unsigned num_blocks;
};
-static const char *flacfile_ = "metadata.flac";
-
-/* our copy of the metadata in flacfile_ */
+/* our copy of the metadata in flacfilename() */
static OurMetadata our_metadata_;
/* the current block number that corresponds to the position of the iterator we are testing */
static unsigned mc_our_block_number_ = 0;
+static const char *flacfilename(bool is_ogg)
+{
+ return is_ogg? "metadata.ogg" : "metadata.flac";
+}
+
static bool die_(const char *msg)
{
printf("ERROR: %s\n", msg);
return true;
}
-static bool read_chain_(FLAC::Metadata::Chain &chain, const char *filename, bool filename_based)
+static bool read_chain_(FLAC::Metadata::Chain &chain, const char *filename, bool filename_based, bool is_ogg)
{
if(filename_based)
- return chain.read(filename);
+ return chain.read(filename, is_ogg);
else {
::FLAC__IOCallbacks callbacks;
FILE *file = fopen(filename, "rb");
if(0 == file)
return false; /*@@@@ chain status still says OK though */
- ret = chain.read((::FLAC__IOHandle)file, callbacks);
+ ret = chain.read((::FLAC__IOHandle)file, callbacks, is_ogg);
fclose(file);
return ret;
}
printf("ERROR: got error callback, status = %s (%u)\n", FLAC__StreamDecoderErrorStatusString[status], (unsigned)status);
}
-static bool generate_file_(FLAC__bool include_extras)
+static bool generate_file_(bool include_extras, bool is_ogg)
{
::FLAC__StreamMetadata streaminfo, vorbiscomment, *cuesheet, picture, padding;
::FLAC__StreamMetadata *metadata[4];
unsigned i = 0, n = 0;
- printf("generating FLAC file for test\n");
+ printf("generating %sFLAC file for test\n", is_ogg? "Ogg " : "");
while(our_metadata_.num_blocks > 0)
delete_from_our_metadata_(0);
)
return die_("priming our metadata");
- if(!file_utils__generate_flacfile(/*is_ogg=*/false, flacfile_, 0, 512 * 1024, &streaminfo, metadata, n))
+ if(!file_utils__generate_flacfile(is_ogg, flacfilename(is_ogg), 0, 512 * 1024, &streaminfo, metadata, n))
return die_("creating the encoded file");
free(vorbiscomment.data.vorbis_comment.vendor_string.entry);
return true;
}
-static bool test_file_(const char *filename, bool ignore_metadata)
+static bool test_file_(bool is_ogg, bool ignore_metadata)
{
+ const char *filename = flacfilename(is_ogg);
OurFileDecoder decoder(ignore_metadata);
- FLAC__ASSERT(0 != filename);
-
mc_our_block_number_ = 0;
decoder.error_occurred_ = false;
decoder.set_md5_checking(true);
decoder.set_metadata_respond_all();
- if(decoder.init(filename) != ::FLAC__STREAM_DECODER_INIT_STATUS_OK) {
+ if((is_ogg? decoder.init_ogg(filename) : decoder.init(filename)) != ::FLAC__STREAM_DECODER_INIT_STATUS_OK) {
(void)decoder.finish();
return die_("initializing decoder\n");
}
printf("\n\n++++++ testing level 0 interface\n");
- if(!generate_file_(/*include_extras=*/true))
+ if(!generate_file_(/*include_extras=*/true, /*is_ogg=*/false))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/true))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/true))
return false;
printf("testing FLAC::Metadata::get_streaminfo()... ");
- if(!FLAC::Metadata::get_streaminfo(flacfile_, streaminfo))
+ if(!FLAC::Metadata::get_streaminfo(flacfilename(/*is_ogg=*/false), streaminfo))
return die_("during FLAC::Metadata::get_streaminfo()");
/* check to see if some basic data matches (c.f. generate_file_()) */
FLAC::Metadata::VorbisComment *tags = 0;
- if(!FLAC::Metadata::get_tags(flacfile_, tags))
+ if(!FLAC::Metadata::get_tags(flacfilename(/*is_ogg=*/false), tags))
return die_("during FLAC::Metadata::get_tags()");
/* check to see if some basic data matches (c.f. generate_file_()) */
FLAC::Metadata::VorbisComment tags;
- if(!FLAC::Metadata::get_tags(flacfile_, tags))
+ if(!FLAC::Metadata::get_tags(flacfilename(/*is_ogg=*/false), tags))
return die_("during FLAC::Metadata::get_tags()");
/* check to see if some basic data matches (c.f. generate_file_()) */
FLAC::Metadata::CueSheet *cuesheet = 0;
- if(!FLAC::Metadata::get_cuesheet(flacfile_, cuesheet))
+ if(!FLAC::Metadata::get_cuesheet(flacfilename(/*is_ogg=*/false), cuesheet))
return die_("during FLAC::Metadata::get_cuesheet()");
/* check to see if some basic data matches (c.f. generate_file_()) */
FLAC::Metadata::CueSheet cuesheet;
- if(!FLAC::Metadata::get_cuesheet(flacfile_, cuesheet))
+ if(!FLAC::Metadata::get_cuesheet(flacfilename(/*is_ogg=*/false), cuesheet))
return die_("during FLAC::Metadata::get_cuesheet()");
/* check to see if some basic data matches (c.f. generate_file_()) */
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), /*max_colors=*/(unsigned)(-1)))
+ if(!FLAC::Metadata::get_picture(flacfilename(/*is_ogg=*/false), 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_()) */
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), /*max_colors=*/(unsigned)(-1)))
+ if(!FLAC::Metadata::get_picture(flacfilename(/*is_ogg=*/false), 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_()) */
printf("OK\n");
}
- if(!remove_file_(flacfile_))
+ if(!remove_file_(flacfilename(/*is_ogg=*/false)))
return false;
return true;
{
printf("simple iterator on read-only file\n");
- if(!generate_file_(/*include_extras=*/false))
+ if(!generate_file_(/*include_extras=*/false, /*is_ogg=*/false))
return false;
- if(!change_stats_(flacfile_, /*read_only=*/true))
+ if(!change_stats_(flacfilename(/*is_ogg=*/false), /*read_only=*/true))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/true))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/true))
return false;
FLAC::Metadata::SimpleIterator iterator;
if(!iterator.is_valid())
return die_("iterator.is_valid() returned false");
- if(!iterator.init(flacfile_, /*read_only=*/false, /*preserve_file_stats=*/false))
+ if(!iterator.init(flacfilename(/*is_ogg=*/false), /*read_only=*/false, /*preserve_file_stats=*/false))
return die_("iterator.init() returned false");
printf("is writable = %u\n", (unsigned)iterator.is_writable());
{
printf("simple iterator on writable file\n");
- if(!change_stats_(flacfile_, /*read-only=*/false))
+ if(!change_stats_(flacfilename(/*is_ogg=*/false), /*read-only=*/false))
return false;
printf("creating APPLICATION block\n");
if(!iterator.is_valid())
return die_("iterator.is_valid() returned false");
- if(!iterator.init(flacfile_, /*read_only=*/false, /*preserve_file_stats=*/false))
+ if(!iterator.init(flacfilename(/*is_ogg=*/false), /*read_only=*/false, /*preserve_file_stats=*/false))
return die_("iterator.init() returned false");
our_current_position = 0;
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[P]PP\tprev\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))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("[S]VPPP\tnext\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("S[V]PP\tnext\n");
return die_ss_("iterator.delete_block(false)", iterator);
our_current_position--;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[P]P\tnext\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[P]\tprev\n");
return die_ss_("iterator.set_block(block, false)", iterator);
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("[S]VP\tnext\n");
return false;
add_to_padding_length_(our_current_position+1, -((int)(FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) + (int)app->get_length()));
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]P\tnext\n");
return false;
add_to_padding_length_(our_current_position+1, -((int)(FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) + (int)app->get_length()));
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVA[A]P\tset APPLICATION (grow), don't expand into padding\n");
if(!iterator.set_block(app, false))
return die_ss_("iterator.set_block(app, false)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVA[A]P\tset APPLICATION (shrink), don't fill in with padding\n");
if(!iterator.set_block(app, false))
return die_ss_("iterator.set_block(app, false)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVA[A]P\tset APPLICATION (grow), expand into padding of exceeding size\n");
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVA[A]P\tset APPLICATION (shrink), fill in with padding\n");
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVA[A]PP\tnext\n");
if(!iterator.set_block(padding, false))
return die_ss_("iterator.set_block(padding, false)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVAAP[P]\tset APPLICATION (grow)\n");
if(!iterator.set_block(app, false))
return die_ss_("iterator.set_block(app, false)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVAAP[A]\tset PADDING (equal)\n");
if(!iterator.set_block(padding, false))
return die_ss_("iterator.set_block(padding, false)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVAAP[P]\tprev\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVA[A]P\tdelete (middle block), don't replace with padding\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]P\tnext\n");
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVAP[P]\tprev\n");
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]PP\tset APPLICATION (grow), try to expand into padding which is 'close' but still too small\n");
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]PP\tset APPLICATION (grow), expand into padding which will leave 0-length pad\n");
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]PP\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]P\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
if(!iterator.set_block(app, true))
return die_ss_("iterator.set_block(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]\tset PADDING (equal size)\n");
if(!iterator.set_block(padding, true))
return die_ss_("iterator.set_block(padding, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[P]\tinsert PADDING after\n");
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVP[P]\tinsert PADDING after\n");
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SVPP[P]\tprev\n");
if(!iterator.insert_block_after(app, true))
return die_ss_("iterator.insert_block_after(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]PPP\tdelete (middle block), don't replace with padding\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("S[V]PPP\tinsert APPLICATION after, try to expand into padding which is 'close' but still too small\n");
if(!iterator.insert_block_after(app, true))
return die_ss_("iterator.insert_block_after(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]PPP\tdelete (middle block), don't replace with padding\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("S[V]PPP\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
if(!iterator.insert_block_after(app, true))
return die_ss_("iterator.insert_block_after(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]PP\tdelete (middle block), don't replace with padding\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("S[V]PP\tinsert APPLICATION after, expand into padding which will leave 0-length pad\n");
if(!iterator.insert_block_after(app, true))
return die_ss_("iterator.insert_block_after(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("SV[A]PP\tdelete (middle block), don't replace with padding\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("S[V]PP\tnext\n");
return die_ss_("iterator.delete_block(false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
printf("S[V]P\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
if(!iterator.insert_block_after(app, true))
return die_ss_("iterator.insert_block_after(app, true)", iterator);
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(/*is_ogg=*/false, /*ignore_metadata=*/false))
return false;
}
delete app;
delete padding;
- if(!remove_file_(flacfile_))
+ if(!remove_file_(flacfilename(/*is_ogg=*/false)))
return false;
return true;
}
-static bool test_level_2_(bool filename_based)
+static bool test_level_2_(bool filename_based, bool is_ogg)
{
FLAC::Metadata::Prototype *block;
FLAC::Metadata::StreamInfo *streaminfo;
// initialize 'data' to avoid Valgrind errors
memset(data, 0, sizeof(data));
- printf("\n\n++++++ testing level 2 interface (%s-based)\n", filename_based? "filename":"callback");
+ printf("\n\n++++++ testing level 2 interface (%s-based, %s FLAC)\n", filename_based? "filename":"callback", is_ogg? "Ogg":"native");
printf("generate read-only file\n");
- if(!generate_file_(/*include_extras=*/false))
+ if(!generate_file_(/*include_extras=*/false, is_ogg))
return false;
- if(!change_stats_(flacfile_, /*read_only=*/true))
+ if(!change_stats_(flacfilename(is_ogg), /*read_only=*/true))
return false;
printf("create chain\n");
printf("read chain\n");
- if(!read_chain_(chain, flacfile_, filename_based))
+ if(!read_chain_(chain, flacfilename(is_ogg), filename_based, is_ogg))
return die_c_("reading chain", chain.status());
printf("[S]VP\ttest initial metadata\n");
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
+ if(is_ogg)
+ goto end;
+
printf("switch file to read-write\n");
- if(!change_stats_(flacfile_, /*read-only=*/false))
+ if(!change_stats_(flacfilename(is_ogg), /*read-only=*/false))
return false;
printf("create iterator\n");
return die_("copying object");
delete block;
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/true, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/true, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(false, true)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("[S]VP\tnext\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(false, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]\tshrink APPLICATION, don't use padding\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(false, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]\tgrow APPLICATION, don't use padding\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(false, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]\tgrow APPLICATION, use padding, but last block is not padding\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(false, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]\tshrink APPLICATION, use padding, last block is not padding, but delta is too small for new PADDING block\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]\tshrink APPLICATION, use padding, last block is not padding, delta is enough for new PADDING block\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]P\tshrink APPLICATION, use padding, last block is padding\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding, but delta is too small\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding of exceeding size\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding of exact size\n");
if(!iterator.set_block(app))
return die_c_("iterator.set_block(app)", chain.status());
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
block = iterator.get_block();
if(!compare_chain_(chain, our_current_position, block))
return false;
delete block;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV[A]\tprev\n");
delete_from_our_metadata_(4);
delete_from_our_metadata_(3);
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SVPAP\tsort padding\n");
add_to_padding_length_(4, FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[2]->get_length());
delete_from_our_metadata_(2);
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(true, false)", chain.status());
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("create iterator\n");
printf("SV\tmerge padding\n");
chain.merge_padding();
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(false, false)", chain.status());
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
printf("SV\tsort padding\n");
chain.sort_padding();
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during chain.write(false, false)", chain.status());
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, /*ignore_metadata=*/false))
+ if(!test_file_(is_ogg, /*ignore_metadata=*/false))
return false;
- if(!remove_file_(flacfile_))
+end:
+ if(!remove_file_(flacfilename(is_ogg)))
return false;
return true;
}
-static bool test_level_2_misc_()
+static bool test_level_2_misc_(bool is_ogg)
{
::FLAC__IOCallbacks callbacks;
printf("generate file\n");
- if(!generate_file_(/*include_extras=*/false))
+ if(!generate_file_(/*include_extras=*/false, is_ogg))
return false;
printf("create chain\n");
printf("read chain (filename-based)\n");
- if(!chain.read(flacfile_))
+ if(!chain.read(flacfilename(is_ogg)))
return die_c_("reading chain", chain.status());
printf("write chain with wrong method Chain::write(with callbacks)\n");
printf("read chain (filename-based)\n");
- if(!chain.read(flacfile_))
+ if(!chain.read(flacfilename(is_ogg)))
return die_c_("reading chain", chain.status());
printf("write chain with wrong method Chain::write(with callbacks and tempfile)\n");
printf("read chain (callback-based)\n");
{
- FILE *file = fopen(flacfile_, "rb");
+ FILE *file = fopen(flacfilename(is_ogg), "rb");
if(0 == file)
return die_("opening file");
if(!chain.read((::FLAC__IOHandle)file, callbacks)) {
printf("read chain (callback-based)\n");
{
- FILE *file = fopen(flacfile_, "rb");
+ FILE *file = fopen(flacfilename(is_ogg), "rb");
if(0 == file)
return die_("opening file");
if(!chain.read((::FLAC__IOHandle)file, callbacks)) {
printf("read chain (callback-based)\n");
{
- FILE *file = fopen(flacfile_, "rb");
+ FILE *file = fopen(flacfilename(is_ogg), "rb");
if(0 == file)
return die_("opening file");
if(!chain.read((::FLAC__IOHandle)file, callbacks)) {
} // delete iterator
- if(!remove_file_(flacfile_))
+ if(!remove_file_(flacfilename(is_ogg)))
return false;
return true;
if(!test_level_1_())
return false;
- if(!test_level_2_(/*filename_based=*/true)) /* filename-based */
+ if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/false)) /* filename-based */
+ return false;
+ if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/false)) /* callback-based */
+ return false;
+ if(!test_level_2_misc_(/*is_ogg=*/false))
+ return false;
+
+ if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/true)) /* filename-based */
return false;
- if(!test_level_2_(/*filename_based=*/false)) /* callback-based */
+ if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/true)) /* callback-based */
return false;
- if(!test_level_2_misc_())
+#if 0
+ /* when ogg flac write is supported, will have to add this: */
+ if(!test_level_2_misc_(/*is_ogg=*/true))
return false;
+#endif
return true;
}
unsigned num_blocks;
} our_metadata_struct;
-static const char *flacfile_ = "metadata.flac";
-
-/* our copy of the metadata in flacfile_ */
+/* our copy of the metadata in flacfilename() */
static our_metadata_struct our_metadata_;
/* the current block number that corresponds to the position of the iterator we are testing */
static unsigned mc_our_block_number_ = 0;
+static const char *flacfilename(FLAC__bool is_ogg)
+{
+ return is_ogg? "metadata.ogg" : "metadata.flac";
+}
+
static FLAC__bool die_(const char *msg)
{
printf("ERROR: %s\n", msg);
return true;
}
-static FLAC__bool read_chain_(FLAC__Metadata_Chain *chain, const char *filename, FLAC__bool filename_based)
+static FLAC__bool read_chain_(FLAC__Metadata_Chain *chain, const char *filename, FLAC__bool filename_based, FLAC__bool is_ogg)
{
if(filename_based)
- return FLAC__metadata_chain_read(chain, flacfile_);
+ return is_ogg?
+ FLAC__metadata_chain_read_ogg(chain, flacfilename(is_ogg)) :
+ FLAC__metadata_chain_read(chain, flacfilename(is_ogg))
+ ;
else {
FLAC__IOCallbacks callbacks;
FILE *file = fopen(filename, "rb");
if(0 == file)
return false; /*@@@@ chain status still says OK though */
- ret = FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks);
+ ret = is_ogg?
+ FLAC__metadata_chain_read_ogg_with_callbacks(chain, (FLAC__IOHandle)file, callbacks) :
+ FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks)
+ ;
fclose(file);
return ret;
}
printf("ERROR: got error callback, status = %s (%u)\n", FLAC__StreamDecoderErrorStatusString[status], (unsigned)status);
}
-static FLAC__bool generate_file_(FLAC__bool include_extras)
+static FLAC__bool generate_file_(FLAC__bool include_extras, FLAC__bool is_ogg)
{
FLAC__StreamMetadata streaminfo, vorbiscomment, *cuesheet, picture, padding;
FLAC__StreamMetadata *metadata[4];
unsigned i = 0, n = 0;
- printf("generating FLAC file for test\n");
+ printf("generating %sFLAC file for test\n", is_ogg? "Ogg " : "");
while(our_metadata_.num_blocks > 0)
delete_from_our_metadata_(0);
)
return die_("priming our metadata");
- if(!file_utils__generate_flacfile(/*is_ogg=*/false, flacfile_, 0, 512 * 1024, &streaminfo, metadata, n))
+ if(!file_utils__generate_flacfile(is_ogg, flacfilename(is_ogg), 0, 512 * 1024, &streaminfo, metadata, n))
return die_("creating the encoded file");
free(vorbiscomment.data.vorbis_comment.vendor_string.entry);
return true;
}
-static FLAC__bool test_file_(const char *filename, FLAC__StreamDecoderMetadataCallback metadata_callback)
+static FLAC__bool test_file_(FLAC__bool is_ogg, FLAC__StreamDecoderMetadataCallback metadata_callback)
{
+ const char *filename = flacfilename(is_ogg);
FLAC__StreamDecoder *decoder;
decoder_client_struct decoder_client_data;
- FLAC__ASSERT(0 != filename);
FLAC__ASSERT(0 != metadata_callback);
mc_our_block_number_ = 0;
FLAC__stream_decoder_set_md5_checking(decoder, true);
FLAC__stream_decoder_set_metadata_respond_all(decoder);
- if(FLAC__stream_decoder_init_file(decoder, filename, decoder_write_callback_, metadata_callback, decoder_error_callback_, &decoder_client_data) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
+ if(
+ (is_ogg?
+ FLAC__stream_decoder_init_ogg_file(decoder, filename, decoder_write_callback_, metadata_callback, decoder_error_callback_, &decoder_client_data) :
+ FLAC__stream_decoder_init_file(decoder, filename, decoder_write_callback_, metadata_callback, decoder_error_callback_, &decoder_client_data)
+ ) != FLAC__STREAM_DECODER_INIT_STATUS_OK
+ ) {
(void)FLAC__stream_decoder_finish(decoder);
FLAC__stream_decoder_delete(decoder);
return die_("initializing decoder\n");
printf("\n\n++++++ testing level 0 interface\n");
- if(!generate_file_(/*include_extras=*/true))
+ if(!generate_file_(/*include_extras=*/true, /*is_ogg=*/false))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_null_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_null_))
return false;
printf("testing FLAC__metadata_get_streaminfo()... ");
- if(!FLAC__metadata_get_streaminfo(flacfile_, &streaminfo))
+ if(!FLAC__metadata_get_streaminfo(flacfilename(/*is_ogg=*/false), &streaminfo))
return die_("during FLAC__metadata_get_streaminfo()");
/* check to see if some basic data matches (c.f. generate_file_()) */
printf("testing FLAC__metadata_get_tags()... ");
- if(!FLAC__metadata_get_tags(flacfile_, &tags))
+ if(!FLAC__metadata_get_tags(flacfilename(/*is_ogg=*/false), &tags))
return die_("during FLAC__metadata_get_tags()");
/* check to see if some basic data matches (c.f. generate_file_()) */
printf("testing FLAC__metadata_get_cuesheet()... ");
- if(!FLAC__metadata_get_cuesheet(flacfile_, &cuesheet))
+ if(!FLAC__metadata_get_cuesheet(flacfilename(/*is_ogg=*/false), &cuesheet))
return die_("during FLAC__metadata_get_cuesheet()");
/* check to see if some basic data matches (c.f. generate_file_()) */
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), /*max_colors=*/(unsigned)(-1)))
+ if(!FLAC__metadata_get_picture(flacfilename(/*is_ogg=*/false), &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_()) */
FLAC__metadata_object_delete(picture);
- if(!remove_file_(flacfile_))
+ if(!remove_file_(flacfilename(/*is_ogg=*/false)))
return false;
return true;
printf("simple iterator on read-only file\n");
- if(!generate_file_(/*include_extras=*/false))
+ if(!generate_file_(/*include_extras=*/false, /*is_ogg=*/false))
return false;
- if(!change_stats_(flacfile_, /*read_only=*/true))
+ if(!change_stats_(flacfilename(/*is_ogg=*/false), /*read_only=*/true))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_null_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_null_))
return false;
if(0 == (iterator = FLAC__metadata_simple_iterator_new()))
return die_("FLAC__metadata_simple_iterator_new()");
- if(!FLAC__metadata_simple_iterator_init(iterator, flacfile_, /*read_only=*/false, /*preserve_file_stats=*/false))
+ if(!FLAC__metadata_simple_iterator_init(iterator, flacfilename(/*is_ogg=*/false), /*read_only=*/false, /*preserve_file_stats=*/false))
return die_("FLAC__metadata_simple_iterator_init() returned false");
printf("is writable = %u\n", (unsigned)FLAC__metadata_simple_iterator_is_writable(iterator));
printf("simple iterator on writable file\n");
- if(!change_stats_(flacfile_, /*read-only=*/false))
+ if(!change_stats_(flacfilename(/*is_ogg=*/false), /*read-only=*/false))
return false;
printf("creating APPLICATION block\n");
if(0 == (iterator = FLAC__metadata_simple_iterator_new()))
return die_("FLAC__metadata_simple_iterator_new()");
- if(!FLAC__metadata_simple_iterator_init(iterator, flacfile_, /*read_only=*/false, /*preserve_file_stats=*/false))
+ if(!FLAC__metadata_simple_iterator_init(iterator, flacfilename(/*is_ogg=*/false), /*read_only=*/false, /*preserve_file_stats=*/false))
return die_("FLAC__metadata_simple_iterator_init() returned false");
our_current_position = 0;
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[P]PP\tprev\n");
if(FLAC__metadata_simple_iterator_delete_block(iterator, false))
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false) should have returned false", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("[S]VPPP\tnext\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("S[V]PP\tnext\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
our_current_position--;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[P]P\tnext\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[P]\tprev\n");
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, block, false)", iterator);
FLAC__metadata_object_delete(block);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("[S]VP\tnext\n");
return false;
our_metadata_.blocks[our_current_position+1]->length -= (FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) + app->length;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]P\tnext\n");
return false;
our_metadata_.blocks[our_current_position+1]->length -= (FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) + app->length;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVA[A]P\tset APPLICATION (grow), don't expand into padding\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, false))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, false)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVA[A]P\tset APPLICATION (shrink), don't fill in with padding\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, false))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, false)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVA[A]P\tset APPLICATION (grow), expand into padding of exceeding size\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVA[A]P\tset APPLICATION (shrink), fill in with padding\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVA[A]PP\tnext\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, padding, false))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, padding, false)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVAAP[P]\tset APPLICATION (grow)\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, false))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, false)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVAAP[A]\tset PADDING (equal)\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, padding, false))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, padding, false)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVAAP[P]\tprev\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVA[A]P\tdelete (middle block), don't replace with padding\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]P\tnext\n");
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVAP[P]\tprev\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]PP\tset APPLICATION (grow), try to expand into padding which is 'close' but still too small\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]PP\tset APPLICATION (grow), expand into padding which will leave 0-length pad\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]PP\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]P\tset APPLICATION (grow), expand into padding which is exactly consumed\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]\tset PADDING (equal size)\n");
if(!FLAC__metadata_simple_iterator_set_block(iterator, padding, true))
return die_ss_("FLAC__metadata_simple_iterator_set_block(iterator, padding, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[P]\tinsert PADDING after\n");
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVP[P]\tinsert PADDING after\n");
if(!insert_to_our_metadata_(padding, ++our_current_position, /*copy=*/true))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SVPP[P]\tprev\n");
if(!FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]PPP\tdelete (middle block), don't replace with padding\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("S[V]PPP\tinsert APPLICATION after, try to expand into padding which is 'close' but still too small\n");
if(!FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]PPP\tdelete (middle block), don't replace with padding\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("S[V]PPP\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
if(!FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]PP\tdelete (middle block), don't replace with padding\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("S[V]PP\tinsert APPLICATION after, expand into padding which will leave 0-length pad\n");
if(!FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("SV[A]PP\tdelete (middle block), don't replace with padding\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("S[V]PP\tnext\n");
return die_ss_("FLAC__metadata_simple_iterator_delete_block(iterator, false)", iterator);
delete_from_our_metadata_(our_current_position--);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("S[V]P\tinsert APPLICATION after, expand into padding which is exactly consumed\n");
if(!FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true))
return die_ss_("FLAC__metadata_simple_iterator_insert_block_after(iterator, app, true)", iterator);
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(/*is_ogg=*/false, decoder_metadata_callback_compare_))
return false;
printf("delete simple iterator\n");
FLAC__metadata_object_delete(app);
FLAC__metadata_object_delete(padding);
- if(!remove_file_(flacfile_))
+ if(!remove_file_(flacfilename(/*is_ogg=*/false)))
return false;
return true;
}
-static FLAC__bool test_level_2_(FLAC__bool filename_based)
+static FLAC__bool test_level_2_(FLAC__bool filename_based, FLAC__bool is_ogg)
{
FLAC__Metadata_Iterator *iterator;
FLAC__Metadata_Chain *chain;
/* initialize 'data' to avoid Valgrind errors */
memset(data, 0, sizeof(data));
- printf("\n\n++++++ testing level 2 interface (%s-based)\n", filename_based? "filename":"callback");
+ printf("\n\n++++++ testing level 2 interface (%s-based, %s FLAC)\n", filename_based? "filename":"callback", is_ogg? "Ogg":"native");
printf("generate read-only file\n");
- if(!generate_file_(/*include_extras=*/false))
+ if(!generate_file_(/*include_extras=*/false, is_ogg))
return false;
- if(!change_stats_(flacfile_, /*read_only=*/true))
+ if(!change_stats_(flacfilename(is_ogg), /*read_only=*/true))
return false;
printf("create chain\n");
printf("read chain\n");
- if(!read_chain_(chain, flacfile_, filename_based))
+ if(!read_chain_(chain, flacfilename(is_ogg), filename_based, is_ogg))
return die_c_("reading chain", FLAC__metadata_chain_status(chain));
printf("[S]VP\ttest initial metadata\n");
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
+ if(is_ogg)
+ goto end;
+
printf("switch file to read-write\n");
- if(!change_stats_(flacfile_, /*read-only=*/false))
+ if(!change_stats_(flacfilename(is_ogg), /*read-only=*/false))
return false;
printf("create iterator\n");
if(!replace_in_our_metadata_(block, our_current_position, /*copy=*/true))
return die_("copying object");
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/true, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/true, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, false, true)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("[S]VP\tnext\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, false, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]\tshrink APPLICATION, don't use padding\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, false, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]\tgrow APPLICATION, don't use padding\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, false, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]\tgrow APPLICATION, use padding, but last block is not padding\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, false, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]\tshrink APPLICATION, use padding, last block is not padding, but delta is too small for new PADDING block\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]\tshrink APPLICATION, use padding, last block is not padding, delta is enough for new PADDING block\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]P\tshrink APPLICATION, use padding, last block is padding\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding, but delta is too small\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding of exceeding size\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]P\tgrow APPLICATION, use padding, last block is padding of exact size\n");
if(!FLAC__metadata_iterator_set_block(iterator, app))
return die_c_("FLAC__metadata_iterator_set_block(iterator, app)", FLAC__metadata_chain_status(chain));
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, our_current_position, FLAC__metadata_iterator_get_block(iterator)))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV[A]\tprev\n");
delete_from_our_metadata_(4);
delete_from_our_metadata_(3);
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SVPAP\tsort padding\n");
our_metadata_.blocks[4]->length += (FLAC__STREAM_METADATA_HEADER_LENGTH + our_metadata_.blocks[2]->length);
delete_from_our_metadata_(2);
- if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/true, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, true, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("create iterator\n");
printf("SV\tmerge padding\n");
FLAC__metadata_chain_merge_padding(chain);
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, false, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
printf("SV\tsort padding\n");
FLAC__metadata_chain_sort_padding(chain);
- if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfile_))
+ if(!write_chain_(chain, /*use_padding=*/false, /*preserve_file_stats=*/false, filename_based, flacfilename(is_ogg)))
return die_c_("during FLAC__metadata_chain_write(chain, false, false)", FLAC__metadata_chain_status(chain));
if(!compare_chain_(chain, 0, 0))
return false;
- if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
+ if(!test_file_(is_ogg, decoder_metadata_callback_compare_))
return false;
+end:
printf("delete chain\n");
FLAC__metadata_chain_delete(chain);
- if(!remove_file_(flacfile_))
+ if(!remove_file_(flacfilename(is_ogg)))
return false;
return true;
}
-static FLAC__bool test_level_2_misc_()
+static FLAC__bool test_level_2_misc_(FLAC__bool is_ogg)
{
FLAC__Metadata_Iterator *iterator;
FLAC__Metadata_Chain *chain;
printf("generate file\n");
- if(!generate_file_(/*include_extras=*/false))
+ if(!generate_file_(/*include_extras=*/false, is_ogg))
return false;
printf("create chain\n");
printf("read chain (filename-based)\n");
- if(!FLAC__metadata_chain_read(chain, flacfile_))
+ if(!FLAC__metadata_chain_read(chain, flacfilename(is_ogg)))
return die_c_("reading chain", FLAC__metadata_chain_status(chain));
printf("write chain with wrong method FLAC__metadata_chain_write_with_callbacks()\n");
printf("read chain (filename-based)\n");
- if(!FLAC__metadata_chain_read(chain, flacfile_))
+ if(!FLAC__metadata_chain_read(chain, flacfilename(is_ogg)))
return die_c_("reading chain", FLAC__metadata_chain_status(chain));
printf("write chain with wrong method FLAC__metadata_chain_write_with_callbacks_and_tempfile()\n");
printf("read chain (callback-based)\n");
{
- FILE *file = fopen(flacfile_, "rb");
+ FILE *file = fopen(flacfilename(is_ogg), "rb");
if(0 == file)
return die_("opening file");
if(!FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks)) {
printf("read chain (callback-based)\n");
{
- FILE *file = fopen(flacfile_, "rb");
+ FILE *file = fopen(flacfilename(is_ogg), "rb");
if(0 == file)
return die_("opening file");
if(!FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks)) {
printf("read chain (callback-based)\n");
{
- FILE *file = fopen(flacfile_, "rb");
+ FILE *file = fopen(flacfilename(is_ogg), "rb");
if(0 == file)
return die_("opening file");
if(!FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks)) {
FLAC__metadata_chain_delete(chain);
- if(!remove_file_(flacfile_))
+ if(!remove_file_(flacfilename(is_ogg)))
return false;
return true;
if(!test_level_1_())
return false;
- if(!test_level_2_(/*filename_based=*/true)) /* filename-based */
+ if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/false)) /* filename-based */
return false;
- if(!test_level_2_(/*filename_based=*/false)) /* callback-based */
+ if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/false)) /* callback-based */
return false;
- if(!test_level_2_misc_())
+ if(!test_level_2_misc_(/*is_ogg=*/false))
+ return false;
+
+ if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/true)) /* filename-based */
return false;
+ if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/true)) /* callback-based */
+ return false;
+#if 0
+ /* when ogg flac write is supported, will have to add this: */
+ if(!test_level_2_misc_(/*is_ogg=*/true))
+ return false;
+#endif
return true;
}