-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
+#include "quakedef.h"
#include "dpvsimpledecode.h"
-#include "wavefile.h"
-#define EMBEDDEDHZREAD 1
-
-#ifndef EMBEDDEDHZREAD
-#include "hz_read.h"
-#include "hz_read.c"
-#else
#define HZREADERROR_OK 0
#define HZREADERROR_EOF 1
#define HZREADERROR_MALLOCFAILED 2
-#define HZREADBLOCKSIZE 16000
+//#define HZREADBLOCKSIZE 16000
+#define HZREADBLOCKSIZE 1048576
-typedef struct
+typedef struct hz_bitstream_read_s
{
qfile_t *file;
int endoffile;
}
hz_bitstream_readblock_t;
-typedef struct
+typedef struct hz_bitstream_readblocks_s
{
hz_bitstream_readblock_t *blocks;
hz_bitstream_readblock_t *current;
{
qfile_t *file;
hz_bitstream_read_t *stream;
- if ((file = FS_Open (filename, "rb", false)))
+ if ((file = FS_Open (filename, "rb", false, false)))
{
- stream = malloc(sizeof(hz_bitstream_read_t));
+ stream = (hz_bitstream_read_t *)malloc(sizeof(hz_bitstream_read_t));
memset(stream, 0, sizeof(*stream));
stream->file = file;
return stream;
}
}
-unsigned int hz_bitstream_read_currentbyte(hz_bitstream_read_t *stream)
-{
- return FS_Tell(stream->file);
-}
-
-int hz_bitstream_read_seek(hz_bitstream_read_t *stream, unsigned int position)
-{
- stream->endoffile = 0;
- return FS_Seek(stream->file, position, SEEK_SET) != 0;
-}
-
hz_bitstream_readblocks_t *hz_bitstream_read_blocks_new(void)
{
hz_bitstream_readblocks_t *blocks;
- blocks = malloc(sizeof(hz_bitstream_readblocks_t));
+ blocks = (hz_bitstream_readblocks_t *)malloc(sizeof(hz_bitstream_readblocks_t));
if (blocks == NULL)
return NULL;
memset(blocks, 0, sizeof(hz_bitstream_readblocks_t));
{
if (b == NULL)
{
- b = malloc(sizeof(hz_bitstream_readblock_t));
+ b = (hz_bitstream_readblock_t *)malloc(sizeof(hz_bitstream_readblock_t));
if (b == NULL)
return HZREADERROR_MALLOCFAILED;
b->next = NULL;
else
b->size = s;
s -= b->size;
- if (FS_Read(stream->file, b->data, b->size) != b->size)
+ if (FS_Read(stream->file, b->data, b->size) != (fs_offset_t)b->size)
{
stream->endoffile = 1;
break;
void hz_bitstream_read_bytes(hz_bitstream_readblocks_t *blocks, void *outdata, unsigned int size)
{
unsigned char *out;
- out = outdata;
+ out = (unsigned char *)outdata;
while (size--)
*out++ = hz_bitstream_read_byte(blocks);
}
-#endif
#define BLOCKSIZE 8
// current video frame data (needed because of delta compression)
unsigned int *videopixels;
- // wav file the sound is being read from
- wavefile_t *wavefile;
+ // channel the sound file is being played on
+ int sndchan;
}
dpvsimpledecodestream_t;
char t[8], *wavename;
if (errorstring != NULL)
*errorstring = NULL;
- s = malloc(sizeof(dpvsimpledecodestream_t));
+ s = (dpvsimpledecodestream_t *)Z_Malloc(sizeof(dpvsimpledecodestream_t));
if (s != NULL)
{
s->bitstream = hz_bitstream_read_open(filename);
if (s->info_framerate > 0.0)
{
- s->videopixels = malloc(s->info_imagewidth * s->info_imageheight * sizeof(*s->videopixels));
+ s->videopixels = (unsigned int *)Z_Malloc(s->info_imagewidth * s->info_imageheight * sizeof(*s->videopixels));
if (s->videopixels != NULL)
{
- wavename = malloc(strlen(filename) + 10);
+ wavename = (char *)Z_Malloc(strlen(filename) + 10);
if (wavename)
{
+ sfx_t* sfx;
+
StripExtension(filename, wavename);
strcat(wavename, ".wav");
- s->wavefile = waveopen(wavename, NULL);
+ sfx = S_PrecacheSound (wavename, false, false);
+ if (sfx != NULL)
+ s->sndchan = S_StartSound (-1, 0, sfx, vec3_origin, 1.0f, 0);
+ else
+ s->sndchan = -1;
free(wavename);
}
// all is well...
// closes a stream
void dpvsimpledecode_close(void *stream)
{
- dpvsimpledecodestream_t *s = stream;
+ dpvsimpledecodestream_t *s = (dpvsimpledecodestream_t *)stream;
if (s == NULL)
return;
if (s->videopixels)
free(s->videopixels);
- if (s->wavefile)
- waveclose(s->wavefile);
+ if (s->sndchan != -1)
+ S_StopChannel (s->sndchan);
if (s->framedatablocks)
hz_bitstream_read_blocks_free(s->framedatablocks);
if (s->bitstream)
// error message
int dpvsimpledecode_error(void *stream, char **errorstring)
{
- dpvsimpledecodestream_t *s = stream;
+ dpvsimpledecodestream_t *s = (dpvsimpledecodestream_t *)stream;
int e;
e = s->error;
s->error = 0;
// returns the width of the image data
unsigned int dpvsimpledecode_getwidth(void *stream)
{
- dpvsimpledecodestream_t *s = stream;
+ dpvsimpledecodestream_t *s = (dpvsimpledecodestream_t *)stream;
return s->info_imagewidth;
}
// returns the height of the image data
unsigned int dpvsimpledecode_getheight(void *stream)
{
- dpvsimpledecodestream_t *s = stream;
+ dpvsimpledecodestream_t *s = (dpvsimpledecodestream_t *)stream;
return s->info_imageheight;
}
-// returns the sound sample rate of the stream
-unsigned int dpvsimpledecode_getsoundrate(void *stream)
-{
- dpvsimpledecodestream_t *s = stream;
- if (s->wavefile)
- return s->wavefile->info_rate;
- else
- return 0;
-}
-
// returns the framerate of the stream
double dpvsimpledecode_getframerate(void *stream)
{
- dpvsimpledecodestream_t *s = stream;
+ dpvsimpledecodestream_t *s = (dpvsimpledecodestream_t *)stream;
return s->info_framerate;
}
unsigned int *outrow;
for (y = 0;y < height;y++)
{
- outrow = (void *)((unsigned char *)imagedata + y * imagebytesperrow);
+ outrow = (unsigned int *)((unsigned char *)imagedata + y * imagebytesperrow);
for (x = 0;x < width;x++)
{
a = *in++;
unsigned short *outrow;
for (y = 0;y < height;y++)
{
- outrow = (void *)((unsigned char *)imagedata + y * imagebytesperrow);
+ outrow = (unsigned short *)((unsigned char *)imagedata + y * imagebytesperrow);
if (Rloss == 19 && Gloss == 10 && Bloss == 3 && Rshift == 11 && Gshift == 5 && Bshift == 0)
{
// optimized
// decodes a video frame to the supplied output pixels
int dpvsimpledecode_video(void *stream, void *imagedata, unsigned int Rmask, unsigned int Gmask, unsigned int Bmask, unsigned int bytesperpixel, int imagebytesperrow)
{
- dpvsimpledecodestream_t *s = stream;
+ dpvsimpledecodestream_t *s = (dpvsimpledecodestream_t *)stream;
unsigned int framedatasize;
char t[4];
s->error = DPVSIMPLEDECODEERROR_NONE;
dpvsimpledecode_convertpixels(s, imagedata, imagebytesperrow);
return s->error;
}
-
-// (note: sound is 16bit stereo native-endian, left channel first)
-int dpvsimpledecode_audio(void *stream, short *soundbuffer, int requestedlength)
-{
- int samples;
- dpvsimpledecodestream_t *s = stream;
- s->error = DPVSIMPLEDECODEERROR_NONE;
- if (requestedlength)
- {
- samples = 0;
- if (s->wavefile && requestedlength)
- samples = waveread16stereo(s->wavefile, soundbuffer, requestedlength);
- if (samples < requestedlength)
- memset(soundbuffer + samples * 2, 0, (requestedlength - samples) * sizeof(short[2]));
- }
- return s->error;
-}
projects / xonotic / darkplaces.git / blobdiff