X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=dpvsimpledecode.c;h=ed89260a9f97a857617d01c55a4f8fb8c445ade1;hb=97aa709c0a3e5a4374b24a638c14b01f3c8095c6;hp=6ace51c0f6daada3d1c3368ab79b88117e6d8222;hpb=70b3c52211617e1d585a1bbe805c5fd47176bfd1;p=xonotic%2Fdarkplaces.git diff --git a/dpvsimpledecode.c b/dpvsimpledecode.c index 6ace51c0..ed89260a 100644 --- a/dpvsimpledecode.c +++ b/dpvsimpledecode.c @@ -33,7 +33,7 @@ typedef struct hz_bitstream_readblocks_s } hz_bitstream_readblocks_t; -hz_bitstream_read_t *hz_bitstream_read_open(char *filename) +static hz_bitstream_read_t *hz_bitstream_read_open(char *filename) { qfile_t *file; hz_bitstream_read_t *stream; @@ -48,7 +48,7 @@ hz_bitstream_read_t *hz_bitstream_read_open(char *filename) return NULL; } -void hz_bitstream_read_close(hz_bitstream_read_t *stream) +static void hz_bitstream_read_close(hz_bitstream_read_t *stream) { if (stream) { @@ -57,7 +57,7 @@ void hz_bitstream_read_close(hz_bitstream_read_t *stream) } } -hz_bitstream_readblocks_t *hz_bitstream_read_blocks_new(void) +static hz_bitstream_readblocks_t *hz_bitstream_read_blocks_new(void) { hz_bitstream_readblocks_t *blocks; blocks = (hz_bitstream_readblocks_t *)Z_Malloc(sizeof(hz_bitstream_readblocks_t)); @@ -67,7 +67,7 @@ hz_bitstream_readblocks_t *hz_bitstream_read_blocks_new(void) return blocks; } -void hz_bitstream_read_blocks_free(hz_bitstream_readblocks_t *blocks) +static void hz_bitstream_read_blocks_free(hz_bitstream_readblocks_t *blocks) { hz_bitstream_readblock_t *b, *n; if (blocks == NULL) @@ -80,13 +80,13 @@ void hz_bitstream_read_blocks_free(hz_bitstream_readblocks_t *blocks) Z_Free(blocks); } -void hz_bitstream_read_flushbits(hz_bitstream_readblocks_t *blocks) +static void hz_bitstream_read_flushbits(hz_bitstream_readblocks_t *blocks) { blocks->store = 0; blocks->count = 0; } -int hz_bitstream_read_blocks_read(hz_bitstream_readblocks_t *blocks, hz_bitstream_read_t *stream, unsigned int size) +static int hz_bitstream_read_blocks_read(hz_bitstream_readblocks_t *blocks, hz_bitstream_read_t *stream, unsigned int size) { int s; hz_bitstream_readblock_t *b, *p; @@ -133,7 +133,7 @@ int hz_bitstream_read_blocks_read(hz_bitstream_readblocks_t *blocks, hz_bitstrea return HZREADERROR_OK; } -unsigned int hz_bitstream_read_blocks_getbyte(hz_bitstream_readblocks_t *blocks) +static unsigned int hz_bitstream_read_blocks_getbyte(hz_bitstream_readblocks_t *blocks) { while (blocks->current != NULL && blocks->position >= blocks->current->size) { @@ -145,7 +145,7 @@ unsigned int hz_bitstream_read_blocks_getbyte(hz_bitstream_readblocks_t *blocks) return blocks->current->data[blocks->position++]; } -int hz_bitstream_read_bit(hz_bitstream_readblocks_t *blocks) +static int hz_bitstream_read_bit(hz_bitstream_readblocks_t *blocks) { if (!blocks->count) { @@ -157,7 +157,7 @@ int hz_bitstream_read_bit(hz_bitstream_readblocks_t *blocks) return (blocks->store >> blocks->count) & 1; } -unsigned int hz_bitstream_read_bits(hz_bitstream_readblocks_t *blocks, int size) +static unsigned int hz_bitstream_read_bits(hz_bitstream_readblocks_t *blocks, int size) { unsigned int num = 0; // we can only handle about 24 bits at a time safely @@ -178,18 +178,18 @@ unsigned int hz_bitstream_read_bits(hz_bitstream_readblocks_t *blocks, int size) return num; } -unsigned int hz_bitstream_read_byte(hz_bitstream_readblocks_t *blocks) +static unsigned int hz_bitstream_read_byte(hz_bitstream_readblocks_t *blocks) { return hz_bitstream_read_blocks_getbyte(blocks); } -unsigned int hz_bitstream_read_short(hz_bitstream_readblocks_t *blocks) +static unsigned int hz_bitstream_read_short(hz_bitstream_readblocks_t *blocks) { return (hz_bitstream_read_byte(blocks) << 8) | (hz_bitstream_read_byte(blocks)); } -unsigned int hz_bitstream_read_int(hz_bitstream_readblocks_t *blocks) +static unsigned int hz_bitstream_read_int(hz_bitstream_readblocks_t *blocks) { return (hz_bitstream_read_byte(blocks) << 24) | (hz_bitstream_read_byte(blocks) << 16) @@ -197,7 +197,7 @@ unsigned int hz_bitstream_read_int(hz_bitstream_readblocks_t *blocks) | (hz_bitstream_read_byte(blocks)); } -void hz_bitstream_read_bytes(hz_bitstream_readblocks_t *blocks, void *outdata, unsigned int size) +static void hz_bitstream_read_bytes(hz_bitstream_readblocks_t *blocks, void *outdata, unsigned int size) { unsigned char *out; out = (unsigned char *)outdata; @@ -230,6 +230,7 @@ typedef struct dpvsimpledecodestream_s unsigned int info_imageBmask; unsigned int info_imageBshift; unsigned int info_imagesize; + double info_aspectratio; // current video frame (needed because of delta compression) int videoframenum; @@ -360,6 +361,7 @@ void *dpvsimpledecode_open(clvideo_t *video, char *filename, const char **errors s->info_imagewidth = hz_bitstream_read_short(s->framedatablocks); s->info_imageheight = hz_bitstream_read_short(s->framedatablocks); s->info_framerate = (double) hz_bitstream_read_int(s->framedatablocks) * (1.0 / 65536.0); + s->info_aspectratio = (double)s->info_imagewidth / (double)s->info_imageheight; if (s->info_framerate > 0.0) { @@ -391,6 +393,7 @@ void *dpvsimpledecode_open(clvideo_t *video, char *filename, const char **errors video->getheight = dpvsimpledecode_getheight; video->getframerate = dpvsimpledecode_getframerate; video->decodeframe = dpvsimpledecode_video; + video->getaspectratio = dpvsimpledecode_getaspectratio; return s; } @@ -429,7 +432,7 @@ void dpvsimpledecode_close(void *stream) if (s->videopixels) Z_Free(s->videopixels); if (s->sndchan != -1) - S_StopChannel (s->sndchan, true); + S_StopChannel (s->sndchan, true, true); if (s->framedatablocks) hz_bitstream_read_blocks_free(s->framedatablocks); if (s->bitstream) @@ -512,6 +515,13 @@ double dpvsimpledecode_getframerate(void *stream) return s->info_framerate; } +// return aspect ratio of the stream +double dpvsimpledecode_getaspectratio(void *stream) +{ + dpvsimpledecodestream_t *s = (dpvsimpledecodestream_t *)stream; + return s->info_aspectratio; +} + static int dpvsimpledecode_convertpixels(dpvsimpledecodestream_t *s, void *imagedata, int imagebytesperrow) { unsigned int a, x, y, width, height;