hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 02:24:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix create_bitstream()

Browse source
This commit is contained in:
Laurent Fasnacht 2014-04-14 10:23:09 +02:00
parent baba299bb8
commit 13398e011b
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/bitstream.c
View file

@ -116,11 +116,31 @@ int free_exp_golomb()
*/
bitstream *create_bitstream(const bitstream_type type)
{
bitstream *stream = malloc(sizeof(bitstream));
if (!stream) {
bitstream *stream = NULL;
if (type == BITSTREAM_TYPE_MEMORY) {
bitstream_mem *stream_mem = malloc(sizeof(bitstream_mem));
if (!stream_mem) {
fprintf(stderr, "Failed to allocate the bitstream object!\n");
return NULL;
}
stream_mem->allocated_length = 0;
stream_mem->output_data = NULL;
stream_mem->output_length = 0;
stream = (bitstream*) stream_mem;
} else if (type == BITSTREAM_TYPE_FILE) {
bitstream_file *stream_file = malloc(sizeof(bitstream_file));
if (!stream_file) {
fprintf(stderr, "Failed to allocate the bitstream object!\n");
return NULL;
}
//FIXME: it would make sense to avoid constructing an incomplete object
stream_file->output = NULL;
stream = (bitstream*) stream_file;
} else {
fprintf(stderr, "Unknown type for bitstream!\n");
return NULL;
}
// Initialize buffer-related values
stream->data = 0;
@ -128,20 +148,6 @@ bitstream *create_bitstream(const bitstream_type type)
stream->zerocount = 0;
stream->type = type;
if (stream->type == BITSTREAM_TYPE_MEMORY) {
bitstream_mem *stream_mem = (bitstream_mem*) stream;
stream_mem->allocated_length = 0;
stream_mem->output_data = NULL;
stream_mem->output_length = 0;
} else if (stream->type == BITSTREAM_TYPE_FILE) {
bitstream_file *stream_file = (bitstream_file*) stream;
//FIXME: it would make sense to avoid constructing an incomplete object
stream_file->output = NULL;
} else {
free(stream);
fprintf(stderr, "Unknown type for bitstream!\n");
return NULL;
}
// Return the created bitstream
return stream;