* Escape 124 Video Decoder
* Copyright (C) 2008 Eli Friedman (eli.friedman@gmail.com)
*
- * 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
*/
+#define BITSTREAM_READER_LE
#include "avcodec.h"
-
-#define ALT_BITSTREAM_READER_LE
#include "get_bits.h"
+#include "internal.h"
typedef union MacroBlock {
uint16_t pixels[4];
} CodeBook;
typedef struct Escape124Context {
- AVFrame frame;
+ AVFrame *frame;
unsigned num_superblocks;
} Escape124Context;
static int can_safely_read(GetBitContext* gb, int bits) {
- return get_bits_count(gb) + bits <= gb->size_in_bits;
+ return get_bits_left(gb) >= bits;
}
/**
{
Escape124Context *s = avctx->priv_data;
- avctx->pix_fmt = PIX_FMT_RGB555;
+ avctx->pix_fmt = AV_PIX_FMT_RGB555;
s->num_superblocks = ((unsigned)avctx->width / 8) *
((unsigned)avctx->height / 8);
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
return 0;
}
for (i = 0; i < 3; i++)
av_free(s->codebooks[i].blocks);
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
return 0;
}
// This function reads a maximum of 22 bits; the callers
// guard this function appropriately
unsigned block_index, depth;
-
- if (get_bits1(gb)) {
+ int value = get_bits1(gb);
+ if (value) {
static const char transitions[3][2] = { {2, 1}, {0, 2}, {1, 0} };
- *codebook_index = transitions[*codebook_index][get_bits1(gb)];
+ value = get_bits1(gb);
+ *codebook_index = transitions[*codebook_index][value];
}
depth = s->codebooks[*codebook_index].depth;
// depth = 0 means that this shouldn't read any bits;
// in theory, this is the same as get_bits(gb, 0), but
// that doesn't actually work.
- block_index = depth ? get_bits(gb, depth) : 0;
+ block_index = get_bitsz(gb, depth);
if (*codebook_index == 1) {
block_index += superblock_index << s->codebooks[1].depth;
0x100, 0x200, 0x1000, 0x2000,
0x400, 0x800, 0x4000, 0x8000};
-/**
- * Decode a single frame
- * @param avctx decoder context
- * @param data decoded frame
- * @param data_size size of the decoded frame
- * @param buf input buffer
- * @param buf_size input buffer size
- * @return 0 success, -1 on error
- */
static int escape124_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
Escape124Context *s = avctx->priv_data;
+ AVFrame *frame = data;
GetBitContext gb;
unsigned frame_flags, frame_size;
uint16_t* old_frame_data, *new_frame_data;
unsigned old_stride, new_stride;
-
- AVFrame new_frame = { { 0 } };
+ int ret;
init_get_bits(&gb, buf, buf_size * 8);
// Leave last frame unchanged
// FIXME: Is this necessary? I haven't seen it in any real samples
if (!(frame_flags & 0x114) || !(frame_flags & 0x7800000)) {
+ if (!s->frame->data[0])
+ return AVERROR_INVALIDDATA;
+
av_log(NULL, AV_LOG_DEBUG, "Skipping frame\n");
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = s->frame;
+ *got_frame = 1;
+ if ((ret = av_frame_ref(frame, s->frame)) < 0)
+ return ret;
return frame_size;
}
}
}
- new_frame.reference = 3;
- if (avctx->get_buffer(avctx, &new_frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
}
- new_frame_data = (uint16_t*)new_frame.data[0];
- new_stride = new_frame.linesize[0] / 2;
- old_frame_data = (uint16_t*)s->frame.data[0];
- old_stride = s->frame.linesize[0] / 2;
+ new_frame_data = (uint16_t*)frame->data[0];
+ new_stride = frame->linesize[0] / 2;
+ old_frame_data = (uint16_t*)s->frame->data[0];
+ old_stride = s->frame->linesize[0] / 2;
for (superblock_index = 0; superblock_index < s->num_superblocks;
superblock_index++) {
"Escape sizes: %i, %i, %i\n",
frame_size, buf_size, get_bits_count(&gb) / 8);
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_unref(s->frame);
+ if ((ret = av_frame_ref(s->frame, frame)) < 0)
+ return ret;
- *(AVFrame*)data = s->frame = new_frame;
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
return frame_size;
}
-AVCodec escape124_decoder = {
- "escape124",
- CODEC_TYPE_VIDEO,
- CODEC_ID_ESCAPE124,
- sizeof(Escape124Context),
- escape124_decode_init,
- NULL,
- escape124_decode_close,
- escape124_decode_frame,
- CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
+AVCodec ff_escape124_decoder = {
+ .name = "escape124",
+ .long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_ESCAPE124,
+ .priv_data_size = sizeof(Escape124Context),
+ .init = escape124_decode_init,
+ .close = escape124_decode_close,
+ .decode = escape124_decode_frame,
+ .capabilities = AV_CODEC_CAP_DR1,
};
-
projects / ffmpeg / blobdiff