*/
#include "avcodec.h"
-#include "common.h"
+#include "bytestream.h"
typedef enum CinVideoBitmapIndex {
static int cinvideo_decode_init(AVCodecContext *avctx)
{
- CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+ CinVideoContext *cin = avctx->priv_data;
unsigned int i;
cin->avctx = avctx;
avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
cin->frame.data[0] = NULL;
void *data, int *data_size,
uint8_t *buf, int buf_size)
{
- CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+ CinVideoContext *cin = avctx->priv_data;
int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size;
cin->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
}
palette_type = buf[0];
- palette_colors_count = buf[1] | (buf[2] << 8);
+ palette_colors_count = AV_RL16(buf+1);
bitmap_frame_type = buf[3];
buf += 4;
/* handle palette */
if (palette_type == 0) {
for (i = 0; i < palette_colors_count; ++i) {
- cin->palette[i] = (buf[2] << 16) | (buf[1] << 8) | buf[0];
- buf += 3;
+ cin->palette[i] = bytestream_get_le24(&buf);
bitmap_frame_size -= 3;
}
} else {
for (i = 0; i < palette_colors_count; ++i) {
- cin->palette[buf[0]] = (buf[3] << 16) | (buf[2] << 8) | buf[1];
+ cin->palette[buf[0]] = AV_RL24(buf+1);
buf += 4;
bitmap_frame_size -= 4;
}
static int cinvideo_decode_end(AVCodecContext *avctx)
{
- CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+ CinVideoContext *cin = avctx->priv_data;
int i;
if (cin->frame.data[0])
static int cinaudio_decode_init(AVCodecContext *avctx)
{
- CinAudioContext *cin = (CinAudioContext *)avctx->priv_data;
+ CinAudioContext *cin = avctx->priv_data;
cin->avctx = avctx;
cin->initial_decode_frame = 1;
void *data, int *data_size,
uint8_t *buf, int buf_size)
{
- CinAudioContext *cin = (CinAudioContext *)avctx->priv_data;
+ CinAudioContext *cin = avctx->priv_data;
uint8_t *src = buf;
int16_t *samples = (int16_t *)data;
}
while (buf_size > 0) {
cin->delta += cinaudio_delta16_table[*src++];
- cin->delta = clip(cin->delta, -32768, 32767);
+ cin->delta = av_clip(cin->delta, -32768, 32767);
*samples++ = cin->delta;
--buf_size;
}