X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fqtrleenc.c;h=e7de20919a1c5f60fa3414df073fdfc95fc14dac;hb=3df77b58e35a30ed550f99936a308f6bd2f47a20;hp=7f95c7f5a4aa47ee3b30a4a1fe47eea814d56aa2;hpb=72415b2adb2c25f95ceede49001bb97ed9247dbb;p=ffmpeg diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 7f95c7f5a4a..e7de20919a1 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -5,25 +5,27 @@ * * This file is based on flashsvenc.c. * - * 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 "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" +#include "internal.h" /** Maximum RLE code for bulk copy */ #define MAX_RLE_BULK 127 @@ -34,9 +36,8 @@ typedef struct QtrleEncContext { AVCodecContext *avctx; - AVFrame frame; int pixel_size; - AVPicture previous_frame; + AVFrame *previous_frame; unsigned int max_buf_size; /** * This array will contain at ith position the value of the best RLE code @@ -56,25 +57,39 @@ typedef struct QtrleEncContext { * Will contain at ith position the number of consecutive pixels equal to the previous * frame starting from pixel i */ uint8_t* skip_table; + + /** Encoded frame is a key frame */ + int key_frame; } QtrleEncContext; +static av_cold int qtrle_encode_end(AVCodecContext *avctx) +{ + QtrleEncContext *s = avctx->priv_data; + + av_frame_free(&s->previous_frame); + av_free(s->rlecode_table); + av_free(s->length_table); + av_free(s->skip_table); + return 0; +} + static av_cold int qtrle_encode_init(AVCodecContext *avctx) { QtrleEncContext *s = avctx->priv_data; - if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { + if (av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) { return -1; } s->avctx=avctx; switch (avctx->pix_fmt) { - case PIX_FMT_RGB555BE: + case AV_PIX_FMT_RGB555BE: s->pixel_size = 2; break; - case PIX_FMT_RGB24: + case AV_PIX_FMT_RGB24: s->pixel_size = 3; break; - case PIX_FMT_ARGB: + case AV_PIX_FMT_ARGB: s->pixel_size = 4; break; default: @@ -90,23 +105,24 @@ static av_cold int qtrle_encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Error allocating memory.\n"); return -1; } - if (avpicture_alloc(&s->previous_frame, avctx->pix_fmt, avctx->width, avctx->height) < 0) { + s->previous_frame = av_frame_alloc(); + if (!s->previous_frame) { av_log(avctx, AV_LOG_ERROR, "Error allocating picture\n"); return -1; } - s->max_buf_size = s->avctx->width*s->avctx->height*s->pixel_size /* image base material */ + s->max_buf_size = s->avctx->width*s->avctx->height*s->pixel_size*2 /* image base material */ + 15 /* header + footer */ + s->avctx->height*2 /* skip code+rle end */ + s->avctx->width/MAX_RLE_BULK + 1 /* rle codes */; - avctx->coded_frame = &s->frame; + return 0; } /** - * Computes the best RLE sequence for a line + * Compute the best RLE sequence for a line */ -static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t **buf) +static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, uint8_t **buf) { int width=s->avctx->width; int i; @@ -114,12 +130,12 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t /* We will use it to compute the best bulk copy sequence */ unsigned int bulkcount; - /* This will be the number of pixels equal to the preivous frame one's + /* This will be the number of pixels equal to the previous frame one's * starting from the ith pixel */ unsigned int skipcount; /* This will be the number of consecutive equal pixels in the current * frame, starting from the ith one also */ - unsigned int av_uninit(repeatcount); + unsigned int repeatcount; /* The cost of the three different possibilities */ int total_bulk_cost; @@ -131,7 +147,7 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t uint8_t *this_line = p-> data[0] + line*p-> linesize[0] + (width - 1)*s->pixel_size; - uint8_t *prev_line = s->previous_frame.data[0] + line*s->previous_frame.linesize[0] + + uint8_t *prev_line = s->previous_frame->data[0] + line * s->previous_frame->linesize[0] + (width - 1)*s->pixel_size; s->length_table[width] = 0; @@ -139,7 +155,7 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t for (i = width - 1; i >= 0; i--) { - if (!s->frame.key_frame && !memcmp(this_line, prev_line, s->pixel_size)) + if (!s->key_frame && !memcmp(this_line, prev_line, s->pixel_size)) skipcount = FFMIN(skipcount + 1, MAX_RLE_SKIP); else skipcount = 0; @@ -198,7 +214,7 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t prev_line -= s->pixel_size; } - /* Good ! Now we have the best sequence for this line, let's ouput it */ + /* Good! Now we have the best sequence for this line, let's output it. */ /* We do a special case for the first pixel so that we avoid testing it in * the whole loop */ @@ -235,25 +251,25 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t bytestream_put_byte(buf, -1); // end RLE line } -/** Encodes frame including header */ -static int encode_frame(QtrleEncContext *s, AVFrame *p, uint8_t *buf) +/** Encode frame including header */ +static int encode_frame(QtrleEncContext *s, const AVFrame *p, uint8_t *buf) { int i; int start_line = 0; int end_line = s->avctx->height; uint8_t *orig_buf = buf; - if (!s->frame.key_frame) { + if (!s->key_frame) { unsigned line_size = s->avctx->width * s->pixel_size; for (start_line = 0; start_line < s->avctx->height; start_line++) if (memcmp(p->data[0] + start_line*p->linesize[0], - s->previous_frame.data[0] + start_line*s->previous_frame.linesize[0], + s->previous_frame->data[0] + start_line * s->previous_frame->linesize[0], line_size)) break; for (end_line=s->avctx->height; end_line > start_line; end_line--) if (memcmp(p->data[0] + (end_line - 1)*p->linesize[0], - s->previous_frame.data[0] + (end_line - 1)*s->previous_frame.linesize[0], + s->previous_frame->data[0] + (end_line - 1) * s->previous_frame->linesize[0], line_size)) break; } @@ -277,57 +293,69 @@ static int encode_frame(QtrleEncContext *s, AVFrame *p, uint8_t *buf) return buf - orig_buf; } -static int qtrle_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void *data) +static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) { QtrleEncContext * const s = avctx->priv_data; - AVFrame *pict = data; - AVFrame * const p = &s->frame; - int chunksize; +#if FF_API_CODED_FRAME + enum AVPictureType pict_type; +#endif + int ret; - *p = *pict; - - if (buf_size < s->max_buf_size) { + if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) { /* Upper bound check for compressed data */ - av_log(avctx, AV_LOG_ERROR, "buf_size %d < %d\n", buf_size, s->max_buf_size); - return -1; + av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", s->max_buf_size); + return ret; } if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) { /* I-Frame */ - p->pict_type = FF_I_TYPE; - p->key_frame = 1; +#if FF_API_CODED_FRAME + pict_type = AV_PICTURE_TYPE_I; +#endif + s->key_frame = 1; } else { /* P-Frame */ - p->pict_type = FF_P_TYPE; - p->key_frame = 0; +#if FF_API_CODED_FRAME + pict_type = AV_PICTURE_TYPE_P; +#endif + s->key_frame = 0; } - chunksize = encode_frame(s, pict, buf); + pkt->size = encode_frame(s, pict, pkt->data); /* save the current frame */ - av_picture_copy(&s->previous_frame, (AVPicture *)p, avctx->pix_fmt, avctx->width, avctx->height); - return chunksize; -} + av_frame_unref(s->previous_frame); + ret = av_frame_ref(s->previous_frame, pict); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "cannot add reference\n"); + return ret; + } -static av_cold int qtrle_encode_end(AVCodecContext *avctx) -{ - QtrleEncContext *s = avctx->priv_data; +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + avctx->coded_frame->key_frame = s->key_frame; + avctx->coded_frame->pict_type = pict_type; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + if (s->key_frame) + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; - avpicture_free(&s->previous_frame); - av_free(s->rlecode_table); - av_free(s->length_table); - av_free(s->skip_table); return 0; } -AVCodec qtrle_encoder = { - "qtrle", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_QTRLE, - sizeof(QtrleEncContext), - qtrle_encode_init, - qtrle_encode_frame, - qtrle_encode_end, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB555BE, PIX_FMT_ARGB, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), +AVCodec ff_qtrle_encoder = { + .name = "qtrle", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_QTRLE, + .priv_data_size = sizeof(QtrleEncContext), + .init = qtrle_encode_init, + .encode2 = qtrle_encode_frame, + .close = qtrle_encode_end, + .pix_fmts = (const enum AVPixelFormat[]){ + AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB555BE, AV_PIX_FMT_ARGB, AV_PIX_FMT_NONE + }, };