merge down from merged-API-layer branch: cvs -q up -dP -j API_LAYER_MERGING_BASELINE...

[platform/upstream/flac.git] / src / libOggFLAC / ogg_helper.c

diff --git a/src/libOggFLAC/ogg_helper.c b/src/libOggFLAC/ogg_helper.c
index bebd7f0..ca98555 100644 (file)
--- a/src/libOggFLAC/ogg_helper.c
+++ b/src/libOggFLAC/ogg_helper.c
@@ -37,33 +37,35 @@
 #include <string.h> /* for memcmp(), memcpy() */
 #include "FLAC/assert.h"
 #include "private/ogg_helper.h"
-#include "protected/seekable_stream_encoder.h"
+#include "protected/stream_encoder.h"
 
 
-static FLAC__bool full_read_(OggFLAC__SeekableStreamEncoder *encoder, FLAC__byte *buffer, unsigned bytes, OggFLAC__SeekableStreamEncoderReadCallback read_callback, void *client_data)
+static FLAC__bool full_read_(OggFLAC__StreamEncoder *encoder, FLAC__byte *buffer, unsigned bytes, OggFLAC__StreamEncoderReadCallback read_callback, void *client_data)
 {
        while(bytes > 0) {
                unsigned bytes_read = bytes;
                switch(read_callback(encoder, buffer, &bytes_read, client_data)) {
-                       case OggFLAC__SEEKABLE_STREAM_ENCODER_READ_STATUS_CONTINUE:
+                       case OggFLAC__STREAM_ENCODER_READ_STATUS_CONTINUE:
                                bytes -= bytes_read;
                                buffer += bytes_read;
                                break;
-                       case OggFLAC__SEEKABLE_STREAM_ENCODER_READ_STATUS_END_OF_STREAM:
+                       case OggFLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM:
                                if(bytes_read == 0) {
-                                       encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_OGG_ERROR;
+                                       encoder->protected_->state = OggFLAC__STREAM_ENCODER_OGG_ERROR;
                                        return false;
                                }
                                bytes -= bytes_read;
                                buffer += bytes_read;
                                break;
-                       case OggFLAC__SEEKABLE_STREAM_ENCODER_READ_STATUS_ABORT:
-                               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_READ_ERROR;
+                       case OggFLAC__STREAM_ENCODER_READ_STATUS_ABORT:
+                               encoder->protected_->state = OggFLAC__STREAM_ENCODER_CLIENT_ERROR;
+                               return false;
+                       case OggFLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED:
                                return false;
                        default:
                                /* double protection: */
                                FLAC__ASSERT(0);
-                               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_READ_ERROR;
+                               encoder->protected_->state = OggFLAC__STREAM_ENCODER_CLIENT_ERROR;
                                return false;
                }
        }
@@ -88,11 +90,12 @@ void simple_ogg_page__clear(ogg_page *page)
        simple_ogg_page__init(page);
 }
 
-FLAC__bool simple_ogg_page__get_at(OggFLAC__SeekableStreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, OggFLAC__SeekableStreamEncoderSeekCallback seek_callback, OggFLAC__SeekableStreamEncoderReadCallback read_callback, void *client_data)
+FLAC__bool simple_ogg_page__get_at(OggFLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, OggFLAC__StreamEncoderReadCallback read_callback, void *client_data)
 {
        static const unsigned OGG_HEADER_FIXED_PORTION_LEN = 27;
        static const unsigned OGG_MAX_HEADER_LEN = 27/*OGG_HEADER_FIXED_PORTION_LEN*/ + 255;
        FLAC__byte crc[4];
+       FLAC__StreamEncoderSeekStatus seek_status;
 
        FLAC__ASSERT(page->header == 0);
        FLAC__ASSERT(page->header_len == 0);
@@ -100,14 +103,17 @@ FLAC__bool simple_ogg_page__get_at(OggFLAC__SeekableStreamEncoder *encoder, FLAC
        FLAC__ASSERT(page->body_len == 0);
 
        /* move the stream pointer to the supposed beginning of the page */
-       if(seek_callback(encoder, position, client_data) != FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK) {
-               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_SEEK_ERROR;
+       if(0 == seek_callback)
+               return false;
+       if((seek_status = seek_callback((FLAC__StreamEncoder*)encoder, position, client_data)) != FLAC__STREAM_ENCODER_SEEK_STATUS_OK) {
+               if(seek_status == FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR)
+                       encoder->protected_->state = OggFLAC__STREAM_ENCODER_CLIENT_ERROR;
                return false;
        }
 
        /* allocate space for the page header */
        if(0 == (page->header = (unsigned char *)malloc(OGG_MAX_HEADER_LEN))) {
-               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
+               encoder->protected_->state = OggFLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
                return false;
        }
 
@@ -125,7 +131,7 @@ FLAC__bool simple_ogg_page__get_at(OggFLAC__SeekableStreamEncoder *encoder, FLAC
                memcmp(page->header+6, "\0\0\0\0\0\0\0\0", 8) || /* granulepos is non-zero */
                page->header[26] == 0                            /* packet is 0-size */
        ) {
-               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_OGG_ERROR;
+               encoder->protected_->state = OggFLAC__STREAM_ENCODER_OGG_ERROR;
                return false;
        }
 
@@ -139,7 +145,7 @@ FLAC__bool simple_ogg_page__get_at(OggFLAC__SeekableStreamEncoder *encoder, FLAC
                /* check to see that it specifies a single packet */
                for(i = 0; i < (unsigned)page->header[26] - 1; i++) {
                        if(page->header[i + OGG_HEADER_FIXED_PORTION_LEN] != 255) {
-                               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_OGG_ERROR;
+                               encoder->protected_->state = OggFLAC__STREAM_ENCODER_OGG_ERROR;
                                return false;
                        }
                }
@@ -149,7 +155,7 @@ FLAC__bool simple_ogg_page__get_at(OggFLAC__SeekableStreamEncoder *encoder, FLAC
 
        /* allocate space for the page body */
        if(0 == (page->body = (unsigned char *)malloc(page->body_len))) {
-               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
+               encoder->protected_->state = OggFLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
                return false;
        }
 
@@ -161,31 +167,36 @@ FLAC__bool simple_ogg_page__get_at(OggFLAC__SeekableStreamEncoder *encoder, FLAC
        memcpy(crc, page->header+22, 4);
        ogg_page_checksum_set(page);
        if(memcmp(crc, page->header+22, 4)) {
-               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_OGG_ERROR;
+               encoder->protected_->state = OggFLAC__STREAM_ENCODER_OGG_ERROR;
                return false;
        }
 
        return true;
 }
 
-FLAC__bool simple_ogg_page__set_at(OggFLAC__SeekableStreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, OggFLAC__SeekableStreamEncoderSeekCallback seek_callback, OggFLAC__SeekableStreamEncoderWriteCallback write_callback, void *client_data)
+FLAC__bool simple_ogg_page__set_at(OggFLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderWriteCallback write_callback, void *client_data)
 {
+       FLAC__StreamEncoderSeekStatus seek_status;
+
        FLAC__ASSERT(page->header != 0);
        FLAC__ASSERT(page->header_len != 0);
        FLAC__ASSERT(page->body != 0);
        FLAC__ASSERT(page->body_len != 0);
 
        /* move the stream pointer to the supposed beginning of the page */
-       if(seek_callback(encoder, position, client_data) != FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK) {
-               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_SEEK_ERROR;
+       if(0 == seek_callback)
+               return false;
+       if((seek_status = seek_callback((FLAC__StreamEncoder*)encoder, position, client_data)) != FLAC__STREAM_ENCODER_SEEK_STATUS_OK) {
+               if(seek_status == FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR)
+                       encoder->protected_->state = OggFLAC__STREAM_ENCODER_CLIENT_ERROR;
                return false;
        }
 
        ogg_page_checksum_set(page);
 
        /* re-write the page */
-       if(write_callback(encoder, page->header, page->header_len, 0, 0, client_data) != FLAC__STREAM_ENCODER_WRITE_STATUS_OK) {
-               encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_WRITE_ERROR;
+       if(write_callback((FLAC__StreamEncoder*)encoder, page->header, page->header_len, 0, 0, client_data) != FLAC__STREAM_ENCODER_WRITE_STATUS_OK) {
+               encoder->protected_->state = OggFLAC__STREAM_ENCODER_CLIENT_ERROR;
                return false;
        }