On Fri, Dec 16, 2011 at 09:30:27PM +0100, Diego Biurrun wrote:
> From: Eli Friedman <[email protected]>
>
> Some fixes provided by Paul B Mahol <[email protected]>
> and Michael Niedermayer <[email protected]> and me.
>
> Signed-off-by: Diego Biurrun <[email protected]>
> ---
> This time with libavcodec version bump.
>
> According to Paul Mahol at least the following sample is still broken:
> http://samples.libav.org/game-formats/rpl/Escape/Loving.rpl
>
> Changelog | 1 +
> doc/general.texi | 1 +
> libavcodec/Makefile | 1 +
> libavcodec/allcodecs.c | 1 +
> libavcodec/avcodec.h | 1 +
> libavcodec/escape130.c | 318
> ++++++++++++++++++++++++++++++++++++++++++++++++
> libavcodec/version.h | 2 +-
> libavformat/rpl.c | 2 -
> 8 files changed, 324 insertions(+), 3 deletions(-)
> create mode 100644 libavcodec/escape130.c
>
> diff --git a/Changelog b/Changelog
> index b99935b..bea9889 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -108,6 +108,7 @@ easier to use. The changes are:
> - CLJR encoder
> - Dxtory capture format decoder
> - v410 QuickTime uncompressed 4:4:4 10-bit encoder and decoder
> +- Escape 130 video decoder
>
>
> version 0.7:
> diff --git a/doc/general.texi b/doc/general.texi
> index 88c044d..3bdd251 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -462,6 +462,7 @@ following image formats are supported:
> @item Electronic Arts TGQ video @tab @tab X
> @item Electronic Arts TQI video @tab @tab X
> @item Escape 124 @tab @tab X
> +@item Escape 130 @tab @tab X
> @item FFmpeg video codec #1 @tab X @tab X
> @tab experimental lossless codec (fourcc: FFV1)
> @item Flash Screen Video v1 @tab X @tab X
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index be9cd36..40d768b 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -142,6 +142,7 @@ OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o
> OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o
> OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o
> OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
> +OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
> OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o rangecoder.o
> OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o
> OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index 8a09b90..3696178 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -106,6 +106,7 @@ void avcodec_register_all(void)
> REGISTER_DECODER (EIGHTSVX_EXP, eightsvx_exp);
> REGISTER_DECODER (EIGHTSVX_FIB, eightsvx_fib);
> REGISTER_DECODER (ESCAPE124, escape124);
> + REGISTER_DECODER (ESCAPE130, escape130);
> REGISTER_ENCDEC (FFV1, ffv1);
> REGISTER_ENCDEC (FFVHUFF, ffvhuff);
> REGISTER_ENCDEC (FLASHSV, flashsv);
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 1715bbb..87c66e0 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -254,6 +254,7 @@ enum CodecID {
> CODEC_ID_VBLE,
> CODEC_ID_DXTORY,
> CODEC_ID_V410,
> + CODEC_ID_ESCAPE130,
>
> /* various PCM "codecs" */
> CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the
> start of audio codecs
> diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
> new file mode 100644
> index 0000000..62ab09f
> --- /dev/null
> +++ b/libavcodec/escape130.c
> @@ -0,0 +1,318 @@
> +/*
> + * Escape 130 Video Decoder
> + * Copyright (C) 2008 Eli Friedman (eli.friedman <at> gmail.com)
> + *
> + * This file is part of Libav.
> + *
> + * 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.
> + *
> + * 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 Libav; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> + */
> +
> +#include "avcodec.h"
> +#define ALT_BITSTREAM_READER_LE
> +#include "get_bits.h"
> +
> +typedef struct Escape130Context {
> + AVFrame frame;
> + uint8_t *bases;
> +} Escape130Context;
> +
> +/**
> + * Initialize the decoder.
> + * @param avctx decoder context
> + * @return 0 success, negative on error
> + */
> +static av_cold int escape130_decode_init(AVCodecContext *avctx)
> +{
> + Escape130Context *s = avctx->priv_data;
> + avctx->pix_fmt = PIX_FMT_YUV420P;
> +
> + if ((avctx->width & 1) || (avctx->height & 1)) {
> + av_log(avctx, AV_LOG_ERROR,
> + "Dimensions are not a multiple of the block size.\n");
> + return AVERROR(EINVAL);
> + }
> +
> + s->bases = av_malloc(avctx->width * avctx->height / 4);
> + if (!s->bases) {
> + av_log(avctx, AV_LOG_ERROR,
> + "Could not allocate buffer.\n");
> + return AVERROR(ENOMEM);
> + }
> +
> + return 0;
> +}
> +
> +static av_cold int escape130_decode_close(AVCodecContext *avctx)
> +{
> + Escape130Context *s = avctx->priv_data;
> +
> + if (s->frame.data[0])
> + avctx->release_buffer(avctx, &s->frame);
> +
> + av_freep(&s->bases);
> +
> + return 0;
> +}
> +
> +static unsigned decode_skip_count(GetBitContext* gb)
> +{
> + unsigned value;
> + // This function reads a maximum of 27 bits,
> + // which is within the padding space
> + if (get_bits_left(gb) < 1 + 3)
> + return -1;
> +
> + value = get_bits1(gb);
> + if (value)
> + return 0;
> +
> + value = get_bits(gb, 3);
> + if (value)
> + return value;
> +
> + value = get_bits(gb, 8);
> + if (value)
> + return value + 7;
> +
> + value = get_bits(gb, 15);
> + if (value)
> + return value + 262;
> +
> + return -1;
> +}
> +
> +/**
> + * 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 escape130_decode_frame(AVCodecContext *avctx, void *data,
> + int *data_size, AVPacket *avpkt)
> +{
> + const uint8_t *buf = avpkt->data;
> + int buf_size = avpkt->size;
> + Escape130Context *s = avctx->priv_data;
> + GetBitContext gb;
> + AVFrame new_frame = { { 0 } };
> +
> + uint8_t *old_y, *old_cb, *old_cr,
> + *new_y, *new_cb, *new_cr;
> + unsigned old_y_stride, old_cb_stride, old_cr_stride,
> + new_y_stride, new_cb_stride, new_cr_stride;
> + unsigned total_blocks = avctx->width * avctx->height / 4,
> + block_index, row_index = 0;
> + unsigned y[4] = { 0 }, cb = 16, cr = 16;
> + unsigned skip = -1, y_base = 0, i;
skip should be signed (it is used as counter going to -1 below)
> + uint8_t *yb = s->bases;
> +
> + init_get_bits(&gb, buf, buf_size * 8);
> +
> + if (get_bits_left(&gb) < 128)
> + return -1;
why not check buf_size and init bits to buf+16 ?
> + // Header; no useful information in here
> + skip_bits_long(&gb, 128);
> +
> + new_frame.reference = 3;
> + if (avctx->get_buffer(avctx, &new_frame)) {
> + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
> + return -1;
> + }
> +
> + new_y = new_frame.data[0];
> + new_cb = new_frame.data[1];
> + new_cr = new_frame.data[2];
> + new_y_stride = new_frame.linesize[0];
> + new_cb_stride = new_frame.linesize[1];
> + new_cr_stride = new_frame.linesize[2];
> + old_y = s->frame.data[0];
> + old_cb = s->frame.data[1];
> + old_cr = s->frame.data[2];
> + old_y_stride = s->frame.linesize[0];
> + old_cb_stride = s->frame.linesize[1];
> + old_cr_stride = s->frame.linesize[2];
> +
> + av_dlog(avctx, "Strides: %i, %i\n", new_y_stride, new_cb_stride);
> +
> + for (block_index = 0; block_index < total_blocks; block_index++) {
> + // Note that this call will make us skip the rest of the blocks
> + // if the frame prematurely ends
> + if (skip == -1)
> + skip = decode_skip_count(&gb);
> +
> + if (skip) {
> + if (old_y) {
> + y[0] = old_y[0] / 4;
> + y[1] = old_y[1] / 4;
> + y[2] = old_y[old_y_stride] / 4;
> + y[3] = old_y[old_y_stride + 1] / 4;
> + y_base = yb[0];
> + cb = old_cb[0] / 8;
> + cr = old_cr[0] / 8;
> + } else {
> + y_base = y[0] = y[1] = y[2] = y[3] = 0;
> + cb = cr = 16;
> + }
> + } else {
> + if (get_bits1(&gb)) {
> + static const uint8_t offset_table[] = { 2, 4, 10, 20 };
> + static const int8_t sign_table[64][4] = {
> + { 0, 0, 0, 0 },
> + { -1, 1, 0, 0 },
> + { 1, -1, 0, 0 },
> + { -1, 0, 1, 0 },
> + { -1, 1, 1, 0 },
> + { 0, -1, 1, 0 },
> + { 1, -1, 1, 0 },
> + { -1, -1, 1, 0 },
> + { 1, 0, -1, 0 },
> + { 0, 1, -1, 0 },
> + { 1, 1, -1, 0 },
> + { -1, 1, -1, 0 },
> + { 1, -1, -1, 0 },
> + { -1, 0, 0, 1 },
> + { -1, 1, 0, 1 },
> + { 0, -1, 0, 1 },
> +
> + { 0, 0, 0, 0 },
> + { 1, -1, 0, 1 },
> + { -1, -1, 0, 1 },
> + { -1, 0, 1, 1 },
> + { -1, 1, 1, 1 },
> + { 0, -1, 1, 1 },
> + { 1, -1, 1, 1 },
> + { -1, -1, 1, 1 },
> + { 0, 0, -1, 1 },
> + { 1, 0, -1, 1 },
> + { -1, 0, -1, 1 },
> + { 0, 1, -1, 1 },
> + { 1, 1, -1, 1 },
> + { -1, 1, -1, 1 },
> + { 0, -1, -1, 1 },
> + { 1, -1, -1, 1 },
> +
> + { 0, 0, 0, 0 },
> + { -1, -1, -1, 1 },
> + { 1, 0, 0, -1 },
> + { 0, 1, 0, -1 },
> + { 1, 1, 0, -1 },
> + { -1, 1, 0, -1 },
> + { 1, -1, 0, -1 },
> + { 0, 0, 1, -1 },
> + { 1, 0, 1, -1 },
> + { -1, 0, 1, -1 },
> + { 0, 1, 1, -1 },
> + { 1, 1, 1, -1 },
> + { -1, 1, 1, -1 },
> + { 0, -1, 1, -1 },
> + { 1, -1, 1, -1 },
> + { -1, -1, 1, -1 },
> +
> + { 0, 0, 0, 0 },
> + { 1, 0, -1, -1 },
> + { 0, 1, -1, -1 },
> + { 1, 1, -1, -1 },
> + { -1, 1, -1, -1 },
> + { 1, -1, -1, -1 }
> + };
that's not the best place for tables IMO
> + unsigned sign_selector = get_bits(&gb, 6);
> + unsigned difference_selector = get_bits(&gb, 2);
> + y_base = 2 * get_bits(&gb, 5);
> + for (i = 0; i < 4; i++) {
> + y[i] = av_clip((int)y_base +
> offset_table[difference_selector] *
makes one wonder why y_base was made unsigned in the first place
And I'd rename it to y_avg - base makes me think about pointers to the
beginning of buffer, not block fill value.
> + sign_table[sign_selector][i], 0, 63);
> + }
> + } else if (get_bits1(&gb)) {
> + if (get_bits1(&gb)) {
> + y_base = get_bits(&gb, 6);
> + } else {
> + unsigned adjust_index = get_bits(&gb, 3);
> + static const int8_t adjust[] = { -4, -3, -2, -1, 1, 2,
> 3, 4 };
> + y_base = (y_base + adjust[adjust_index]) & 63;
> + }
> + for (i = 0; i < 4; i++)
> + y[i] = y_base;
> + }
> +
> + if (get_bits1(&gb)) {
> + if (get_bits1(&gb)) {
> + cb = get_bits(&gb, 5);
> + cr = get_bits(&gb, 5);
> + } else {
> + unsigned adjust_index = get_bits(&gb, 3);
> + static const int8_t adjust[2][8] = {
> + { 1, 1, 0, -1, -1, -1, 0, 1 },
> + { 0, 1, 1, 1, 0, -1, -1, -1 }
> + };
> + cb = (cb + adjust[0][adjust_index]) & 31;
> + cr = (cr + adjust[1][adjust_index]) & 31;
> + }
> + }
> + }
> + *yb++= y_base;
> +
> + new_y[0] = y[0] * 4;
> + new_y[1] = y[1] * 4;
> + new_y[new_y_stride] = y[2] * 4;
> + new_y[new_y_stride + 1] = y[3] * 4;
> + *new_cb = cb * 8;
> + *new_cr = cr * 8;
I'd recommend range expansion here:
new_y[] = (y[] << 2) | (y[] >> 4);
new_cX = (cX << 3) | (cX >> 2);
Output will look slightly better then.
Or maybe reference decoder does some other remapping for output range (like
Ultimotion) or converts it into RGB with custom formula (like Truemotion 2)
> + if (old_y)
> + old_y += 2, old_cb++, old_cr++;
> + new_y += 2, new_cb++, new_cr++;
> + row_index++;
> + if (avctx->width / 2 == row_index) {
> + row_index = 0;
> + if (old_y) {
> + old_y += old_y_stride * 2 - avctx->width;
> + old_cb += old_cb_stride - avctx->width / 2;
> + old_cr += old_cr_stride - avctx->width / 2;
> + }
> + new_y += new_y_stride * 2 - avctx->width;
> + new_cb += new_cb_stride - avctx->width / 2;
> + new_cr += new_cr_stride - avctx->width / 2;
> + }
> +
> + skip--;
> + }
> +
> + av_dlog(avctx, "Escape sizes: %i, %i\n", buf_size, get_bits_count(&gb) /
> 8);
frame data sizes: provided %d used %d
> + if (s->frame.data[0])
> + avctx->release_buffer(avctx, &s->frame);
> +
> + *(AVFrame*)data = s->frame = new_frame;
> + *data_size = sizeof(AVFrame);
> +
> + return buf_size;
> +}
> +
> +
> +AVCodec ff_escape130_decoder = {
> + .name = "escape130",
> + .type = AVMEDIA_TYPE_VIDEO,
> + .id = CODEC_ID_ESCAPE130,
> + .priv_data_size = sizeof(Escape130Context),
> + .init = escape130_decode_init,
> + .close = escape130_decode_close,
> + .decode = escape130_decode_frame,
> + .capabilities = CODEC_CAP_DR1,
> + .long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
> +};
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index d15fb48..b6c12a8 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -21,7 +21,7 @@
> #define AVCODEC_VERSION_H
>
> #define LIBAVCODEC_VERSION_MAJOR 53
> -#define LIBAVCODEC_VERSION_MINOR 28
> +#define LIBAVCODEC_VERSION_MINOR 29
> #define LIBAVCODEC_VERSION_MICRO 0
>
> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
> diff --git a/libavformat/rpl.c b/libavformat/rpl.c
> index 0fa00f3..bf5fe0a 100644
> --- a/libavformat/rpl.c
> +++ b/libavformat/rpl.c
> @@ -164,11 +164,9 @@ static int rpl_read_header(AVFormatContext *s,
> AVFormatParameters *ap)
> // The header is wrong here, at least sometimes
> vst->codec->bits_per_coded_sample = 16;
> break;
> -#if 0
> case 130:
> vst->codec->codec_id = CODEC_ID_ESCAPE130;
> break;
> -#endif
> default:
> av_log(s, AV_LOG_WARNING,
> "RPL video format %i not supported yet!\n",
> --
> 1.7.2.5
>
> _______________________________________________
> libav-devel mailing list
> [email protected]
> https://lists.libav.org/mailman/listinfo/libav-devel
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
