rework so that rice parameters and raw_bits from the entropy coding method struct...

[platform/upstream/flac.git] / src / libFLAC / seekable_stream_decoder.c

diff --git a/src/libFLAC/seekable_stream_decoder.c b/src/libFLAC/seekable_stream_decoder.c
index 18fb8d3..79bccfb 100644 (file)
--- a/src/libFLAC/seekable_stream_decoder.c
+++ b/src/libFLAC/seekable_stream_decoder.c
@@ -125,20 +125,24 @@ FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new()
        if(decoder == 0) {
                return 0;
        }
+       memset(decoder, 0, sizeof(FLAC__SeekableStreamDecoder));
+
        decoder->protected_ = (FLAC__SeekableStreamDecoderProtected*)malloc(sizeof(FLAC__SeekableStreamDecoderProtected));
        if(decoder->protected_ == 0) {
                free(decoder);
                return 0;
        }
+       memset(decoder->protected_, 0, sizeof(FLAC__SeekableStreamDecoderProtected));
+
        decoder->private_ = (FLAC__SeekableStreamDecoderPrivate*)malloc(sizeof(FLAC__SeekableStreamDecoderPrivate));
        if(decoder->private_ == 0) {
                free(decoder->protected_);
                free(decoder);
                return 0;
        }
+       memset(decoder->private_, 0, sizeof(FLAC__SeekableStreamDecoderPrivate));
 
        decoder->private_->stream_decoder = FLAC__stream_decoder_new();
-
        if(0 == decoder->private_->stream_decoder) {
                free(decoder->private_);
                free(decoder->protected_);
@@ -545,27 +549,7 @@ FLAC__bool FLAC__seekable_stream_decoder_reset(FLAC__SeekableStreamDecoder *deco
        return true;
 }
 
-FLAC__bool FLAC__seekable_stream_decoder_process_whole_stream(FLAC__SeekableStreamDecoder *decoder)
-{
-       FLAC__bool ret;
-       FLAC__ASSERT(0 != decoder);
-
-       if(decoder->private_->stream_decoder->protected_->state == FLAC__STREAM_DECODER_END_OF_STREAM)
-               decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM;
-
-       if(decoder->protected_->state == FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM)
-               return true;
-
-       FLAC__ASSERT(decoder->protected_->state == FLAC__SEEKABLE_STREAM_DECODER_OK);
-
-       ret = FLAC__stream_decoder_process_whole_stream(decoder->private_->stream_decoder);
-       if(!ret)
-               decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR;
-
-       return ret;
-}
-
-FLAC__bool FLAC__seekable_stream_decoder_process_metadata(FLAC__SeekableStreamDecoder *decoder)
+FLAC__bool FLAC__seekable_stream_decoder_process_single(FLAC__SeekableStreamDecoder *decoder)
 {
        FLAC__bool ret;
        FLAC__ASSERT(0 != decoder);
@@ -578,14 +562,14 @@ FLAC__bool FLAC__seekable_stream_decoder_process_metadata(FLAC__SeekableStreamDe
 
        FLAC__ASSERT(decoder->protected_->state == FLAC__SEEKABLE_STREAM_DECODER_OK);
 
-       ret = FLAC__stream_decoder_process_metadata(decoder->private_->stream_decoder);
+       ret = FLAC__stream_decoder_process_single(decoder->private_->stream_decoder);
        if(!ret)
                decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR;
 
        return ret;
 }
 
-FLAC__bool FLAC__seekable_stream_decoder_process_one_frame(FLAC__SeekableStreamDecoder *decoder)
+FLAC__bool FLAC__seekable_stream_decoder_process_until_end_of_metadata(FLAC__SeekableStreamDecoder *decoder)
 {
        FLAC__bool ret;
        FLAC__ASSERT(0 != decoder);
@@ -598,14 +582,14 @@ FLAC__bool FLAC__seekable_stream_decoder_process_one_frame(FLAC__SeekableStreamD
 
        FLAC__ASSERT(decoder->protected_->state == FLAC__SEEKABLE_STREAM_DECODER_OK);
 
-       ret = FLAC__stream_decoder_process_one_frame(decoder->private_->stream_decoder);
+       ret = FLAC__stream_decoder_process_until_end_of_metadata(decoder->private_->stream_decoder);
        if(!ret)
                decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR;
 
        return ret;
 }
 
-FLAC__bool FLAC__seekable_stream_decoder_process_remaining_frames(FLAC__SeekableStreamDecoder *decoder)
+FLAC__bool FLAC__seekable_stream_decoder_process_until_end_of_stream(FLAC__SeekableStreamDecoder *decoder)
 {
        FLAC__bool ret;
        FLAC__ASSERT(0 != decoder);
@@ -618,7 +602,7 @@ FLAC__bool FLAC__seekable_stream_decoder_process_remaining_frames(FLAC__Seekable
 
        FLAC__ASSERT(decoder->protected_->state == FLAC__SEEKABLE_STREAM_DECODER_OK);
 
-       ret = FLAC__stream_decoder_process_remaining_frames(decoder->private_->stream_decoder);
+       ret = FLAC__stream_decoder_process_until_end_of_stream(decoder->private_->stream_decoder);
        if(!ret)
                decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR;
 
@@ -651,7 +635,7 @@ FLAC__bool FLAC__seekable_stream_decoder_seek_absolute(FLAC__SeekableStreamDecod
                decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR;
                return false;
        }
-       if(!FLAC__stream_decoder_process_metadata(decoder->private_->stream_decoder)) {
+       if(!FLAC__stream_decoder_process_until_end_of_metadata(decoder->private_->stream_decoder)) {
                decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR;
                return false;
        }
@@ -961,7 +945,7 @@ FLAC__bool seek_to_absolute_sample_(FLAC__SeekableStreamDecoder *decoder, FLAC__
                                return false;
                        }
                }
-               if(!FLAC__stream_decoder_process_one_frame(decoder->private_->stream_decoder)) {
+               if(!FLAC__stream_decoder_process_single(decoder->private_->stream_decoder)) {
                        decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR;
                        return false;
                }