* IBM Ultimotion Video Decoder
* Copyright (C) 2004 Konstantin Shishkov
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file ulti.c
+ * @file
* IBM Ultimotion Video Decoder.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "avcodec.h"
#include "bytestream.h"
int width, height, blocks;
AVFrame frame;
const uint8_t *ulti_codebook;
+ GetByteContext gb;
} UltimotionDecodeContext;
-static int ulti_decode_init(AVCodecContext *avctx)
+static av_cold int ulti_decode_init(AVCodecContext *avctx)
{
UltimotionDecodeContext *s = avctx->priv_data;
s->width = avctx->width;
s->height = avctx->height;
s->blocks = (s->width / 8) * (s->height / 8);
- avctx->pix_fmt = PIX_FMT_YUV410P;
- avctx->coded_frame = (AVFrame*) &s->frame;
+ avctx->pix_fmt = AV_PIX_FMT_YUV410P;
+ avctx->coded_frame = &s->frame;
s->ulti_codebook = ulti_codebook;
return 0;
}
-static int block_coords[8] = // 4x4 block coords in 8x8 superblock
+static av_cold int ulti_decode_end(AVCodecContext *avctx){
+ UltimotionDecodeContext *s = avctx->priv_data;
+ AVFrame *pic = &s->frame;
+
+ if (pic->data[0])
+ avctx->release_buffer(avctx, pic);
+
+ return 0;
+}
+
+static const int block_coords[8] = // 4x4 block coords in 8x8 superblock
{ 0, 0, 0, 4, 4, 4, 4, 0};
-static int angle_by_index[4] = { 0, 2, 6, 12};
+static const int angle_by_index[4] = { 0, 2, 6, 12};
/* Lookup tables for luma and chroma - used by ulti_convert_yuv() */
-static uint8_t ulti_lumas[64] =
+static const uint8_t ulti_lumas[64] =
{ 0x10, 0x13, 0x17, 0x1A, 0x1E, 0x21, 0x25, 0x28,
0x2C, 0x2F, 0x33, 0x36, 0x3A, 0x3D, 0x41, 0x44,
0x48, 0x4B, 0x4F, 0x52, 0x56, 0x59, 0x5C, 0x60,
0xB7, 0xBA, 0xBE, 0xC1, 0xC5, 0xC8, 0xCC, 0xCF,
0xD3, 0xD6, 0xDA, 0xDD, 0xE1, 0xE4, 0xE8, 0xEB};
-static uint8_t ulti_chromas[16] =
+static const uint8_t ulti_chromas[16] =
{ 0x60, 0x67, 0x6D, 0x73, 0x7A, 0x80, 0x86, 0x8D,
0x93, 0x99, 0xA0, 0xA6, 0xAC, 0xB3, 0xB9, 0xC0};
static int ulti_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;
UltimotionDecodeContext *s=avctx->priv_data;
int modifier = 0;
int uniq = 0;
int skip;
int tmp;
- if(s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if(avctx->get_buffer(avctx, &s->frame) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1;
}
+ bytestream2_init(&s->gb, buf, buf_size);
+
while(!done) {
int idx;
if(blocks >= s->blocks || y >= s->height)
break;//all blocks decoded
- idx = *buf++;
+ if (bytestream2_get_bytes_left(&s->gb) < 1)
+ goto err;
+ idx = bytestream2_get_byteu(&s->gb);
if((idx & 0xF8) == 0x70) {
switch(idx) {
case 0x70: //change modifier
- modifier = *buf++;
+ modifier = bytestream2_get_byte(&s->gb);
if(modifier>1)
av_log(avctx, AV_LOG_INFO, "warning: modifier must be 0 or 1, got %i\n", modifier);
break;
done = 1;
break;
case 0x74: //skip some blocks
- skip = *buf++;
+ skip = bytestream2_get_byte(&s->gb);
if ((blocks + skip) >= s->blocks)
break;
blocks += skip;
chroma = 0;
} else {
cf = 0;
- if (idx)
- chroma = *buf++;
+ if (idx) {
+ chroma = bytestream2_get_byte(&s->gb);
+ }
}
for (i = 0; i < 4; i++) { // for every subblock
code = (idx >> (6 - i*2)) & 3; //extract 2 bits
if(!code) //skip subblock
continue;
- if(cf)
- chroma = *buf++;
+ if(cf) {
+ chroma = bytestream2_get_byte(&s->gb);
+ }
tx = x + block_coords[i * 2];
ty = y + block_coords[(i * 2) + 1];
switch(code) {
case 1:
- tmp = *buf++;
+ tmp = bytestream2_get_byte(&s->gb);
angle = angle_by_index[(tmp >> 6) & 0x3];
case 2:
if (modifier) { // unpack four luma samples
- tmp = bytestream_get_be24(&buf);
+ tmp = bytestream2_get_be24(&s->gb);
Y[0] = (tmp >> 18) & 0x3F;
Y[1] = (tmp >> 12) & 0x3F;
Y[3] = tmp & 0x3F;
angle = 16;
} else { // retrieve luma samples from codebook
- tmp = bytestream_get_be16(&buf);
+ tmp = bytestream2_get_be16(&s->gb);
angle = (tmp >> 12) & 0xF;
tmp &= 0xFFF;
if (modifier) { // all 16 luma samples
uint8_t Luma[16];
- tmp = bytestream_get_be24(&buf);
+ if (bytestream2_get_bytes_left(&s->gb) < 12)
+ goto err;
+ tmp = bytestream2_get_be24u(&s->gb);
Luma[0] = (tmp >> 18) & 0x3F;
Luma[1] = (tmp >> 12) & 0x3F;
Luma[2] = (tmp >> 6) & 0x3F;
Luma[3] = tmp & 0x3F;
- tmp = bytestream_get_be24(&buf);
+ tmp = bytestream2_get_be24u(&s->gb);
Luma[4] = (tmp >> 18) & 0x3F;
Luma[5] = (tmp >> 12) & 0x3F;
Luma[6] = (tmp >> 6) & 0x3F;
Luma[7] = tmp & 0x3F;
- tmp = bytestream_get_be24(&buf);
+ tmp = bytestream2_get_be24u(&s->gb);
Luma[8] = (tmp >> 18) & 0x3F;
Luma[9] = (tmp >> 12) & 0x3F;
Luma[10] = (tmp >> 6) & 0x3F;
Luma[11] = tmp & 0x3F;
- tmp = bytestream_get_be24(&buf);
+ tmp = bytestream2_get_be24u(&s->gb);
Luma[12] = (tmp >> 18) & 0x3F;
Luma[13] = (tmp >> 12) & 0x3F;
Luma[14] = (tmp >> 6) & 0x3F;
ulti_convert_yuv(&s->frame, tx, ty, Luma, chroma);
} else {
- tmp = *buf++;
+ if (bytestream2_get_bytes_left(&s->gb) < 4)
+ goto err;
+ tmp = bytestream2_get_byteu(&s->gb);
if(tmp & 0x80) {
angle = (tmp >> 4) & 0x7;
- tmp = (tmp << 8) + *buf++;
+ tmp = (tmp << 8) + bytestream2_get_byteu(&s->gb);
Y[0] = (tmp >> 6) & 0x3F;
Y[1] = tmp & 0x3F;
- Y[2] = (*buf++) & 0x3F;
- Y[3] = (*buf++) & 0x3F;
+ Y[2] = bytestream2_get_byteu(&s->gb) & 0x3F;
+ Y[3] = bytestream2_get_byteu(&s->gb) & 0x3F;
ulti_grad(&s->frame, tx, ty, Y, chroma, angle); //draw block
} else { // some patterns
int f0, f1;
- f0 = *buf++;
+ f0 = bytestream2_get_byteu(&s->gb);
f1 = tmp;
- Y[0] = (*buf++) & 0x3F;
- Y[1] = (*buf++) & 0x3F;
+ Y[0] = bytestream2_get_byteu(&s->gb) & 0x3F;
+ Y[1] = bytestream2_get_byteu(&s->gb) & 0x3F;
ulti_pattern(&s->frame, tx, ty, f1, f0, Y[0], Y[1], chroma);
}
}
*(AVFrame*)data= s->frame;
return buf_size;
-}
-static int ulti_decode_end(AVCodecContext *avctx)
-{
-/* UltimotionDecodeContext *s = avctx->priv_data;*/
-
- return 0;
+err:
+ av_log(avctx, AV_LOG_ERROR,
+ "Insufficient data\n");
+ return AVERROR_INVALIDDATA;
}
-AVCodec ulti_decoder = {
- "ultimotion",
- CODEC_TYPE_VIDEO,
- CODEC_ID_ULTI,
- sizeof(UltimotionDecodeContext),
- ulti_decode_init,
- NULL,
- ulti_decode_end,
- ulti_decode_frame,
- CODEC_CAP_DR1,
- NULL
+AVCodec ff_ulti_decoder = {
+ .name = "ultimotion",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_ULTI,
+ .priv_data_size = sizeof(UltimotionDecodeContext),
+ .init = ulti_decode_init,
+ .close = ulti_decode_end,
+ .decode = ulti_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"),
};
-
projects / ffmpeg / blobdiff