*/
/**
- * @file truemotion1.c
+ * @file libavcodec/truemotion1.c
* Duck TrueMotion v1 Video Decoder by
* Alex Beregszaszi and
* Mike Melanson (melanson@pcisys.net)
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "avcodec.h"
#include "dsputil.h"
} comp_types;
/* { valid for metatype }, algorithm, num of deltas, vert res, horiz res */
-static comp_types compression_types[17] = {
+static const comp_types compression_types[17] = {
{ ALGO_NOP, 0, 0, 0 },
{ ALGO_RGB16V, 4, 4, BLOCK_4x4 },
}
}
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
static int make_ydt15_entry(int p2, int p1, int16_t *ydt)
#else
static int make_ydt15_entry(int p1, int p2, int16_t *ydt)
lo += (lo << 5) + (lo << 10);
hi = ydt[p2];
hi += (hi << 5) + (hi << 10);
- return ((lo + (hi << 16)) << 1);
+ return (lo + (hi << 16)) << 1;
}
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
static int make_cdt15_entry(int p2, int p1, int16_t *cdt)
#else
static int make_cdt15_entry(int p1, int p2, int16_t *cdt)
b = cdt[p2];
r = cdt[p1] << 10;
lo = b + r;
- return ((lo + (lo << 16)) << 1);
+ return (lo + (lo << 16)) << 1;
}
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
static int make_ydt16_entry(int p2, int p1, int16_t *ydt)
#else
static int make_ydt16_entry(int p1, int p2, int16_t *ydt)
lo += (lo << 6) + (lo << 11);
hi = ydt[p2];
hi += (hi << 6) + (hi << 11);
- return ((lo + (hi << 16)) << 1);
+ return (lo + (hi << 16)) << 1;
}
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
static int make_cdt16_entry(int p2, int p1, int16_t *cdt)
#else
static int make_cdt16_entry(int p1, int p2, int16_t *cdt)
b = cdt[p2];
r = cdt[p1] << 11;
lo = b + r;
- return ((lo + (lo << 16)) << 1);
+ return (lo + (lo << 16)) << 1;
}
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
static int make_ydt24_entry(int p2, int p1, int16_t *ydt)
#else
static int make_ydt24_entry(int p1, int p2, int16_t *ydt)
lo = ydt[p1];
hi = ydt[p2];
- return ((lo + (hi << 8) + (hi << 16)) << 1);
+ return (lo + (hi << 8) + (hi << 16)) << 1;
}
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
static int make_cdt24_entry(int p2, int p1, int16_t *cdt)
#else
static int make_cdt24_entry(int p1, int p2, int16_t *cdt)
b = cdt[p2];
r = cdt[p1]<<16;
- return ((b+r) << 1);
+ return (b+r) << 1;
}
static void gen_vector_table15(TrueMotion1Context *s, const uint8_t *sel_vector_table)
}
}
- if (header.compression > 17) {
+ if (header.compression >= 17) {
av_log(s->avctx, AV_LOG_ERROR, "invalid compression type (%d)\n", header.compression);
return -1;
}
static int truemotion1_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
TrueMotion1Context *s = avctx->priv_data;
s->buf = buf;
truemotion1_decode_end,
truemotion1_decode_frame,
CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"),
};