virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

flashsvenc: switch to encode2().

Browse Source
This commit is contained in:
Anton Khirnov 2012-02-20 13:21:58 +01:00
parent b315042c8c
commit 0ecf54f9dc
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/flashsvenc.c
View File

@ -49,6 +49,7 @@
#include <zlib.h> #include <zlib.h>
#include "avcodec.h" #include "avcodec.h"
#include "internal.h"
#include "put_bits.h" #include "put_bits.h"
#include "bytestream.h" #include "bytestream.h"
@ -194,11 +195,10 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf,
} }
static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
int buf_size, void *data) const AVFrame *pict, int *got_packet)
{ {
FlashSVContext * const s = avctx->priv_data; FlashSVContext * const s = avctx->priv_data;
AVFrame *pict = data;
AVFrame * const p = &s->frame; AVFrame * const p = &s->frame;
uint8_t *pfptr; uint8_t *pfptr;
int res; int res;
@ -228,15 +228,15 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf,
I_frame = 1; I_frame = 1;
} }
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 //Conservative upper bound check for compressed data
av_log(avctx, AV_LOG_ERROR, "buf_size %d < %d\n", av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n",
buf_size, s->image_width * s->image_height * 3); s->image_width * s->image_height * 3);
return -1; return res;
} }
res = encode_bitstream(s, p, buf, buf_size, opt_w * 16, opt_h * 16, pkt->size = encode_bitstream(s, p, pkt->data, pkt->size, opt_w * 16, opt_h * 16,
pfptr, &I_frame); pfptr, &I_frame);
//save the current frame //save the current frame
if (p->linesize[0] > 0) if (p->linesize[0] > 0)
@ -259,7 +259,11 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf,
avctx->coded_frame = p; 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) static av_cold int flashsv_encode_end(AVCodecContext *avctx)
@ -281,7 +285,7 @@ AVCodec ff_flashsv_encoder = {
.id = CODEC_ID_FLASHSV, .id = CODEC_ID_FLASHSV,
.priv_data_size = sizeof(FlashSVContext), .priv_data_size = sizeof(FlashSVContext),
.init = flashsv_encode_init, .init = flashsv_encode_init,
.encode = flashsv_encode_frame, .encode2 = flashsv_encode_frame,
.close = flashsv_encode_end, .close = flashsv_encode_end,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"), .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"),