X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fnuv.c;h=534fd03567dcc4290587cf771c9954c3b9345705;hb=40f81769aec24a93563cd547e02ba8478aa95849;hp=176fc252f33b91ca97b92836def2e7777ee0a06a;hpb=c612b00d7eb68102fb48ce9b36030b92fb3fa0e8;p=ffmpeg diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 176fc252f33..534fd03567d 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -2,34 +2,36 @@ * NuppelVideo decoder * Copyright (c) 2006 Reimar Doeffinger * - * 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 */ #include #include +#include "libavutil/bswap.h" +#include "libavutil/lzo.h" +#include "libavutil/imgutils.h" #include "avcodec.h" - -#include "bswap.h" #include "dsputil.h" -#include "lzo.h" #include "rtjpeg.h" typedef struct { AVFrame pic; + int codec_frameheader; + int quality; int width, height; unsigned int decomp_size; unsigned char* decomp_buf; @@ -38,14 +40,36 @@ typedef struct { DSPContext dsp; } NuvContext; +static const uint8_t fallback_lquant[] = { + 16, 11, 10, 16, 24, 40, 51, 61, + 12, 12, 14, 19, 26, 58, 60, 55, + 14, 13, 16, 24, 40, 57, 69, 56, + 14, 17, 22, 29, 51, 87, 80, 62, + 18, 22, 37, 56, 68, 109, 103, 77, + 24, 35, 55, 64, 81, 104, 113, 92, + 49, 64, 78, 87, 103, 121, 120, 101, + 72, 92, 95, 98, 112, 100, 103, 99 +}; + +static const uint8_t fallback_cquant[] = { + 17, 18, 24, 47, 99, 99, 99, 99, + 18, 21, 26, 66, 99, 99, 99, 99, + 24, 26, 56, 99, 99, 99, 99, 99, + 47, 66, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99 +}; + /** - * \brief copy frame data from buffer to AVFrame, handling stride. - * \param f destination AVFrame - * \param src source buffer, does not use any line-stride - * \param width width of the video frame - * \param height height of the video frame + * @brief copy frame data from buffer to AVFrame, handling stride. + * @param f destination AVFrame + * @param src source buffer, does not use any line-stride + * @param width width of the video frame + * @param height height of the video frame */ -static void copy_frame(AVFrame *f, uint8_t *src, +static void copy_frame(AVFrame *f, const uint8_t *src, int width, int height) { AVPicture pic; avpicture_fill(&pic, src, PIX_FMT_YUV420P, width, height); @@ -53,10 +77,10 @@ static void copy_frame(AVFrame *f, uint8_t *src, } /** - * \brief extract quantization tables from codec data into our context + * @brief extract quantization tables from codec data into our context */ static int get_quant(AVCodecContext *avctx, NuvContext *c, - uint8_t *buf, int size) { + const uint8_t *buf, int size) { int i; if (size < 2 * 64 * 4) { av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n"); @@ -69,11 +93,49 @@ static int get_quant(AVCodecContext *avctx, NuvContext *c, return 0; } +/** + * @brief set quantization tables from a quality value + */ +static void get_quant_quality(NuvContext *c, int quality) { + int i; + quality = FFMAX(quality, 1); + for (i = 0; i < 64; i++) { + c->lq[i] = (fallback_lquant[i] << 7) / quality; + c->cq[i] = (fallback_cquant[i] << 7) / quality; + } +} + +static int codec_reinit(AVCodecContext *avctx, int width, int height, int quality) { + NuvContext *c = avctx->priv_data; + width = FFALIGN(width, 2); + height = FFALIGN(height, 2); + if (quality >= 0) + get_quant_quality(c, quality); + if (width != c->width || height != c->height) { + if (av_image_check_size(height, width, 0, avctx) < 0) + return 0; + avctx->width = c->width = width; + avctx->height = c->height = height; + av_fast_malloc(&c->decomp_buf, &c->decomp_size, c->height * c->width * 3 / 2); + if (!c->decomp_buf) { + av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); + return 0; + } + ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); + } else if (quality != c->quality) + ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); + return 1; +} + static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; NuvContext *c = avctx->priv_data; AVFrame *picture = data; int orig_size = buf_size; + int keyframe; + int result; enum {NUV_UNCOMPRESSED = '0', NUV_RTJPEG = '1', NUV_RTJPEG_IN_LZO = '2', NUV_LZO = '3', NUV_BLACK = 'N', NUV_COPY_LAST = 'L'} comptype; @@ -83,16 +145,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, return -1; } - if (c->pic.data[0]) - avctx->release_buffer(avctx, &c->pic); - c->pic.reference = 1; - c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE | - FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; - if (avctx->get_buffer(avctx, &c->pic) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; - } - // codec data (rtjpeg quant tables) if (buf[0] == 'D' && buf[1] == 'R') { int ret; @@ -102,7 +154,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, ret = get_quant(avctx, c, buf, buf_size); if (ret < 0) return ret; - rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); + ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); return orig_size; } @@ -111,19 +163,53 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, return -1; } comptype = buf[1]; + switch (comptype) { + case NUV_RTJPEG_IN_LZO: + case NUV_RTJPEG: + keyframe = !buf[2]; break; + case NUV_COPY_LAST: + keyframe = 0; break; + default: + keyframe = 1; break; + } // skip rest of the frameheader. buf = &buf[12]; buf_size -= 12; if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { int outlen = c->decomp_size, inlen = buf_size; - if (lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) + if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); buf = c->decomp_buf; buf_size = c->decomp_size; } + if (c->codec_frameheader) { + int w, h, q; + if (buf[0] != 'V' || buf_size < 12) { + av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame (wrong codec_tag?)\n"); + return AVERROR_INVALIDDATA; + } + w = AV_RL16(&buf[6]); + h = AV_RL16(&buf[8]); + q = buf[10]; + if (!codec_reinit(avctx, w, h, q)) + return -1; + buf = &buf[12]; + buf_size -= 12; + } + + if (keyframe && c->pic.data[0]) + avctx->release_buffer(avctx, &c->pic); + c->pic.reference = 3; + c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE | + FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; + result = avctx->reget_buffer(avctx, &c->pic); + if (result < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return -1; + } - c->pic.pict_type = FF_I_TYPE; - c->pic.key_frame = 1; + c->pic.pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; + c->pic.key_frame = keyframe; // decompress/copy/whatever data switch (comptype) { case NUV_LZO: @@ -138,7 +224,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, } case NUV_RTJPEG_IN_LZO: case NUV_RTJPEG: { - rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size); + ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size); break; } case NUV_BLACK: { @@ -148,8 +234,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, break; } case NUV_COPY_LAST: { - c->pic.pict_type = FF_P_TYPE; - c->pic.key_frame = 0; /* nothing more to do here */ break; } @@ -163,31 +247,24 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, return orig_size; } -static int decode_init(AVCodecContext *avctx) { +static av_cold int decode_init(AVCodecContext *avctx) { NuvContext *c = avctx->priv_data; - avctx->width = (avctx->width + 1) & ~1; - avctx->height = (avctx->height + 1) & ~1; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { - return 1; - } avctx->pix_fmt = PIX_FMT_YUV420P; c->pic.data[0] = NULL; - c->width = avctx->width; - c->height = avctx->height; - c->decomp_size = c->height * c->width * 3 / 2; - c->decomp_buf = av_malloc(c->decomp_size + LZO_OUTPUT_PADDING); - if (!c->decomp_buf) { - av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); - return 1; - } - dsputil_init(&c->dsp, avctx); + c->decomp_buf = NULL; + c->quality = -1; + c->width = 0; + c->height = 0; + c->codec_frameheader = avctx->codec_tag == MKTAG('R', 'J', 'P', 'G'); if (avctx->extradata_size) get_quant(avctx, c, avctx->extradata, avctx->extradata_size); - rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); + ff_dsputil_init(&c->dsp, avctx); + if (!codec_reinit(avctx, avctx->width, avctx->height, -1)) + return 1; return 0; } -static int decode_end(AVCodecContext *avctx) { +static av_cold int decode_end(AVCodecContext *avctx) { NuvContext *c = avctx->priv_data; av_freep(&c->decomp_buf); if (c->pic.data[0]) @@ -195,15 +272,14 @@ static int decode_end(AVCodecContext *avctx) { return 0; } -AVCodec nuv_decoder = { - "nuv", - CODEC_TYPE_VIDEO, - CODEC_ID_NUV, - sizeof(NuvContext), - decode_init, - NULL, - decode_end, - decode_frame, - CODEC_CAP_DR1, +AVCodec ff_nuv_decoder = { + .name = "nuv", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_NUV, + .priv_data_size = sizeof(NuvContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), }; -