X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fflashsvenc.c;h=0b788802d6f36c2f307a2bdc006c87962d7c9296;hb=594d4d5df3c70404168701dd5c90b7e6e5587793;hp=c26d893ef13f03520d1aaf6f05c41c22dc8bd999;hpb=98a6fff98c3f2e963783e52fb193529bdc14e040;p=ffmpeg diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index c26d893ef13..0b788802d6f 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -3,55 +3,45 @@ * Copyright (C) 2004 Alex Beregszaszi * Copyright (C) 2006 Benjamin Larsson * - * 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 */ /* Encoding development sponsored by http://fh-campuswien.ac.at */ /** - * @file flashsvenc.c + * @file * Flash Screen Video encoder * @author Alex Beregszaszi * @author Benjamin Larsson + * + * A description of the bitstream format for Flash Screen Video version 1/2 + * is part of the SWF File Format Specification (version 10), which can be + * downloaded from http://www.adobe.com/devnet/swf.html. */ -/* Bitstream description - * The picture is divided into blocks that are zlib-compressed. - * - * The decoder is fed complete frames, the frameheader contains: - * 4bits of block width - * 12bits of frame width - * 4bits of block height - * 12bits of frame height - * - * Directly after the header are the compressed blocks. The blocks - * have their compressed size represented with 16bits in the beginig. - * If the size = 0 then the block is unchanged from the previous frame. - * All blocks are decompressed until the buffer is consumed. - * - * Encoding ideas, a basic encoder would just use a fixed block size. - * Block sizes can be multipels of 16, from 16 to 256. The blocks don't +/* + * Encoding ideas: A basic encoder would just use a fixed block size. + * Block sizes can be multiples of 16, from 16 to 256. The blocks don't * have to be quadratic. A brute force search with a set of different * block sizes should give a better result than to just use a fixed size. - */ - -/* TODO: - * Don't reencode the frame in brute force mode if the frame is a dupe. Speed up. - * Make the difference check faster. + * + * TODO: + * Don't reencode the frame in brute force mode if the frame is a dupe. + * Speed up. Make the difference check faster. */ #include @@ -59,38 +49,40 @@ #include #include "avcodec.h" -#include "bitstream.h" +#include "internal.h" +#include "put_bits.h" #include "bytestream.h" typedef struct FlashSVContext { AVCodecContext *avctx; - uint8_t *previous_frame; - AVFrame frame; - int image_width, image_height; - int block_width, block_height; - uint8_t* tmpblock; - uint8_t* encbuffer; - int block_size; - z_stream zstream; - int last_key_frame; + uint8_t *previous_frame; + AVFrame frame; + int image_width, image_height; + int block_width, block_height; + uint8_t *tmpblock; + uint8_t *encbuffer; + int block_size; + z_stream zstream; + int last_key_frame; } FlashSVContext; -static int copy_region_enc(uint8_t *sptr, uint8_t *dptr, - int dx, int dy, int h, int w, int stride, uint8_t *pfptr) { - int i,j; +static int copy_region_enc(uint8_t *sptr, uint8_t *dptr, int dx, int dy, + int h, int w, int stride, uint8_t *pfptr) +{ + int i, j; uint8_t *nsptr; uint8_t *npfptr; int diff = 0; - for (i = dx+h; i > dx; i--) { - nsptr = sptr+(i*stride)+dy*3; - npfptr = pfptr+(i*stride)+dy*3; - for (j=0 ; j dx; i--) { + nsptr = sptr + i * stride + dy * 3; + npfptr = pfptr + i * stride + dy * 3; + for (j = 0; j < w * 3; j++) { + diff |= npfptr[j] ^ nsptr[j]; + dptr[j] = nsptr[j]; } - dptr += w*3; + dptr += w * 3; } if (diff) return 1; @@ -103,93 +95,92 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx) s->avctx = avctx; - if ((avctx->width > 4095) || (avctx->height > 4095)) { - av_log(avctx, AV_LOG_ERROR, "Input dimensions too large, input must be max 4096x4096 !\n"); - return -1; - } - - if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { - return -1; + if (avctx->width > 4095 || avctx->height > 4095) { + av_log(avctx, AV_LOG_ERROR, + "Input dimensions too large, input must be max 4096x4096 !\n"); + return AVERROR_INVALIDDATA; } // Needed if zlib unused or init aborted before deflateInit - memset(&(s->zstream), 0, sizeof(z_stream)); + memset(&s->zstream, 0, sizeof(z_stream)); - s->last_key_frame=0; + s->last_key_frame = 0; - s->image_width = avctx->width; + s->image_width = avctx->width; s->image_height = avctx->height; - s->tmpblock = av_mallocz(3*256*256); - s->encbuffer = av_mallocz(s->image_width*s->image_height*3); + s->tmpblock = av_mallocz(3 * 256 * 256); + s->encbuffer = av_mallocz(s->image_width * s->image_height * 3); if (!s->tmpblock || !s->encbuffer) { av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); - return -1; + return AVERROR(ENOMEM); } return 0; } -static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf_size, - int block_width, int block_height, uint8_t *previous_frame, int* I_frame) { +static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, + int buf_size, int block_width, int block_height, + uint8_t *previous_frame, int *I_frame) +{ PutBitContext pb; int h_blocks, v_blocks, h_part, v_part, i, j; int buf_pos, res; int pred_blocks = 0; - init_put_bits(&pb, buf, buf_size*8); + init_put_bits(&pb, buf, buf_size * 8); - put_bits(&pb, 4, (block_width/16)-1); + put_bits(&pb, 4, block_width / 16 - 1); put_bits(&pb, 12, s->image_width); - put_bits(&pb, 4, (block_height/16)-1); + put_bits(&pb, 4, block_height / 16 - 1); put_bits(&pb, 12, s->image_height); flush_put_bits(&pb); - buf_pos=4; + buf_pos = 4; - h_blocks = s->image_width / block_width; - h_part = s->image_width % block_width; + h_blocks = s->image_width / block_width; + h_part = s->image_width % block_width; v_blocks = s->image_height / block_height; - v_part = s->image_height % block_height; + v_part = s->image_height % block_height; /* loop over all block columns */ - for (j = 0; j < v_blocks + (v_part?1:0); j++) - { + for (j = 0; j < v_blocks + (v_part ? 1 : 0); j++) { - int hp = j*block_height; // horiz position in frame - int hs = (jdata[0], s->tmpblock, s->image_height-(hp+hs+1), wp, hs, ws, p->linesize[0], previous_frame); + for (i = 0; i < h_blocks + (h_part ? 1 : 0); i++) { + int x_pos = i * block_width; // horizontal position in frame + int cur_blk_width = (i < h_blocks) ? block_width : h_part; + int ret = Z_OK; + uint8_t *ptr = buf + buf_pos; + + /* copy the block to the temp buffer before compression + * (if it differs from the previous frame's block) */ + res = copy_region_enc(p->data[0], s->tmpblock, + s->image_height - (y_pos + cur_blk_height + 1), + x_pos, cur_blk_height, cur_blk_width, + p->linesize[0], previous_frame); if (res || *I_frame) { - unsigned long zsize; - zsize = 3*block_width*block_height; - ret = compress2(ptr+2, &zsize, s->tmpblock, 3*ws*hs, 9); + unsigned long zsize = 3 * block_width * block_height; + ret = compress2(ptr + 2, &zsize, s->tmpblock, + 3 * cur_blk_width * cur_blk_height, 9); - - //ret = deflateReset(&(s->zstream)); + //ret = deflateReset(&s->zstream); if (ret != Z_OK) - av_log(s->avctx, AV_LOG_ERROR, "error while compressing block %dx%d\n", i, j); + av_log(s->avctx, AV_LOG_ERROR, + "error while compressing block %dx%d\n", i, j); - bytestream_put_be16(&ptr,(unsigned int)zsize); - buf_pos += zsize+2; - //av_log(avctx, AV_LOG_ERROR, "buf_pos = %d\n", buf_pos); + bytestream_put_be16(&ptr, zsize); + buf_pos += zsize + 2; + av_dlog(s->avctx, "buf_pos = %d\n", buf_pos); } else { pred_blocks++; - bytestream_put_be16(&ptr,0); + bytestream_put_be16(&ptr, 0); buf_pos += 2; } } @@ -204,78 +195,82 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf } -static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void *data) +static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) { FlashSVContext * const s = avctx->priv_data; - AVFrame *pict = data; AVFrame * const p = &s->frame; uint8_t *pfptr; int res; int I_frame = 0; - int opt_w, opt_h; + int opt_w = 4, opt_h = 4; *p = *pict; /* First frame needs to be a keyframe */ if (avctx->frame_number == 0) { - s->previous_frame = av_mallocz(FFABS(p->linesize[0])*s->image_height); + s->previous_frame = av_mallocz(FFABS(p->linesize[0]) * s->image_height); if (!s->previous_frame) { av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); - return -1; + return AVERROR(ENOMEM); } I_frame = 1; } if (p->linesize[0] < 0) - pfptr = s->previous_frame - ((s->image_height-1) * p->linesize[0]); + pfptr = s->previous_frame - (s->image_height - 1) * p->linesize[0]; else pfptr = s->previous_frame; /* Check the placement of keyframes */ - if (avctx->gop_size > 0) { - if (avctx->frame_number >= s->last_key_frame + avctx->gop_size) { - I_frame = 1; - } + if (avctx->gop_size > 0 && + avctx->frame_number >= s->last_key_frame + avctx->gop_size) { + I_frame = 1; } - opt_w=4; - opt_h=4; - - if (buf_size < s->image_width*s->image_height*3) { + if ((res = ff_alloc_packet(pkt, s->image_width * s->image_height * 3)) < 0) { //Conservative upper bound check for compressed data - av_log(avctx, AV_LOG_ERROR, "buf_size %d < %d\n", buf_size, s->image_width*s->image_height*3); - return -1; + av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", + s->image_width * s->image_height * 3); + return res; } - res = encode_bitstream(s, p, buf, buf_size, opt_w*16, opt_h*16, pfptr, &I_frame); + pkt->size = encode_bitstream(s, p, pkt->data, pkt->size, opt_w * 16, opt_h * 16, + pfptr, &I_frame); //save the current frame - if(p->linesize[0] > 0) - memcpy(s->previous_frame, p->data[0], s->image_height*p->linesize[0]); + if (p->linesize[0] > 0) + memcpy(s->previous_frame, p->data[0], s->image_height * p->linesize[0]); else - memcpy(s->previous_frame, p->data[0] + p->linesize[0] * (s->image_height-1), s->image_height*FFABS(p->linesize[0])); + memcpy(s->previous_frame, + p->data[0] + p->linesize[0] * (s->image_height - 1), + s->image_height * FFABS(p->linesize[0])); //mark the frame type so the muxer can mux it correctly if (I_frame) { - p->pict_type = FF_I_TYPE; - p->key_frame = 1; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; s->last_key_frame = avctx->frame_number; - av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n",avctx->frame_number); + av_dlog(avctx, "Inserting keyframe at frame %d\n", avctx->frame_number); } else { - p->pict_type = FF_P_TYPE; + p->pict_type = AV_PICTURE_TYPE_P; p->key_frame = 0; } avctx->coded_frame = p; - return res; + if (p->key_frame) + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + + return 0; } static av_cold int flashsv_encode_end(AVCodecContext *avctx) { FlashSVContext *s = avctx->priv_data; - deflateEnd(&(s->zstream)); + deflateEnd(&s->zstream); av_free(s->encbuffer); av_free(s->previous_frame); @@ -284,14 +279,14 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx) return 0; } -AVCodec flashsv_encoder = { - "flashsv", - CODEC_TYPE_VIDEO, - CODEC_ID_FLASHSV, - sizeof(FlashSVContext), - flashsv_encode_init, - flashsv_encode_frame, - flashsv_encode_end, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1}, +AVCodec ff_flashsv_encoder = { + .name = "flashsv", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_FLASHSV, + .priv_data_size = sizeof(FlashSVContext), + .init = flashsv_encode_init, + .encode2 = flashsv_encode_frame, + .close = flashsv_encode_end, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"), }; -