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

libvpxenc: switch to encode2().

Browse Source
This commit is contained in:
Anton Khirnov 2012-02-22 07:38:13 +01:00
parent 0ecf54f9dc
commit d8f3365fb0
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libavcodec/libvpxenc.c
View File

@ -362,33 +362,33 @@ static inline void cx_pktcpy(struct FrameListData *dst,
} }
/** /**
* Store coded frame information in format suitable for return from encode(). * Store coded frame information in format suitable for return from encode2().
* *
* Write buffer information from @a cx_frame to @a buf & @a buf_size. * Write information from @a cx_frame to @a pkt
* Timing/frame details to @a coded_frame. * @return packet data size on success
* @return Frame size written to @a buf on success * @return a negative AVERROR on error
* @return AVERROR(EINVAL) on error
*/ */
static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
uint8_t *buf, int buf_size, AVFrame *coded_frame) AVPacket *pkt, AVFrame *coded_frame)
{ {
if ((int) cx_frame->sz <= buf_size) { int ret = ff_alloc_packet(pkt, cx_frame->sz);
buf_size = cx_frame->sz; if (ret >= 0) {
memcpy(buf, cx_frame->buf, buf_size); memcpy(pkt->data, cx_frame->buf, pkt->size);
pkt->pts = pkt->dts = cx_frame->pts;
coded_frame->pts = cx_frame->pts; coded_frame->pts = cx_frame->pts;
coded_frame->key_frame = !!(cx_frame->flags & VPX_FRAME_IS_KEY); coded_frame->key_frame = !!(cx_frame->flags & VPX_FRAME_IS_KEY);
if (coded_frame->key_frame) if (coded_frame->key_frame) {
coded_frame->pict_type = AV_PICTURE_TYPE_I; coded_frame->pict_type = AV_PICTURE_TYPE_I;
else pkt->flags |= AV_PKT_FLAG_KEY;
} else
coded_frame->pict_type = AV_PICTURE_TYPE_P; coded_frame->pict_type = AV_PICTURE_TYPE_P;
} else { } else {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Compressed frame larger than storage provided! (%zu/%d)\n", "Error getting output packet of size %zu.\n", cx_frame->sz);
cx_frame->sz, buf_size); return ret;
return AVERROR(EINVAL);
} }
return buf_size; return pkt->size;
} }
/** /**
@ -399,7 +399,7 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
* @return AVERROR(EINVAL) on output size error * @return AVERROR(EINVAL) on output size error
* @return AVERROR(ENOMEM) on coded frame queue data allocation error * @return AVERROR(ENOMEM) on coded frame queue data allocation error
*/ */
static int queue_frames(AVCodecContext *avctx, uint8_t *buf, int buf_size, static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out,
AVFrame *coded_frame) AVFrame *coded_frame)
{ {
VP8Context *ctx = avctx->priv_data; VP8Context *ctx = avctx->priv_data;
@ -410,9 +410,9 @@ static int queue_frames(AVCodecContext *avctx, uint8_t *buf, int buf_size,
if (ctx->coded_frame_list) { if (ctx->coded_frame_list) {
struct FrameListData *cx_frame = ctx->coded_frame_list; struct FrameListData *cx_frame = ctx->coded_frame_list;
/* return the leading frame if we've already begun queueing */ /* return the leading frame if we've already begun queueing */
size = storeframe(avctx, cx_frame, buf, buf_size, coded_frame); size = storeframe(avctx, cx_frame, pkt_out, coded_frame);
if (size < 0) if (size < 0)
return AVERROR(EINVAL); return size;
ctx->coded_frame_list = cx_frame->next; ctx->coded_frame_list = cx_frame->next;
free_coded_frame(cx_frame); free_coded_frame(cx_frame);
} }
@ -429,9 +429,9 @@ static int queue_frames(AVCodecContext *avctx, uint8_t *buf, int buf_size,
provided a frame for output */ provided a frame for output */
assert(!ctx->coded_frame_list); assert(!ctx->coded_frame_list);
cx_pktcpy(&cx_frame, pkt); cx_pktcpy(&cx_frame, pkt);
size = storeframe(avctx, &cx_frame, buf, buf_size, coded_frame); size = storeframe(avctx, &cx_frame, pkt_out, coded_frame);
if (size < 0) if (size < 0)
return AVERROR(EINVAL); return size;
} else { } else {
struct FrameListData *cx_frame = struct FrameListData *cx_frame =
av_malloc(sizeof(struct FrameListData)); av_malloc(sizeof(struct FrameListData));
@ -477,11 +477,10 @@ static int queue_frames(AVCodecContext *avctx, uint8_t *buf, int buf_size,
return size; return size;
} }
static int vp8_encode(AVCodecContext *avctx, uint8_t *buf, int buf_size, static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt,
void *data) const AVFrame *frame, int *got_packet)
{ {
VP8Context *ctx = avctx->priv_data; VP8Context *ctx = avctx->priv_data;
AVFrame *frame = data;
struct vpx_image *rawimg = NULL; struct vpx_image *rawimg = NULL;
int64_t timestamp = 0; int64_t timestamp = 0;
int res, coded_size; int res, coded_size;
@ -503,7 +502,7 @@ static int vp8_encode(AVCodecContext *avctx, uint8_t *buf, int buf_size,
log_encoder_error(avctx, "Error encoding frame"); log_encoder_error(avctx, "Error encoding frame");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
coded_size = queue_frames(avctx, buf, buf_size, avctx->coded_frame); coded_size = queue_frames(avctx, pkt, avctx->coded_frame);
if (!frame && avctx->flags & CODEC_FLAG_PASS1) { if (!frame && avctx->flags & CODEC_FLAG_PASS1) {
unsigned int b64_size = AV_BASE64_SIZE(ctx->twopass_stats.sz); unsigned int b64_size = AV_BASE64_SIZE(ctx->twopass_stats.sz);
@ -517,7 +516,9 @@ static int vp8_encode(AVCodecContext *avctx, uint8_t *buf, int buf_size,
av_base64_encode(avctx->stats_out, b64_size, ctx->twopass_stats.buf, av_base64_encode(avctx->stats_out, b64_size, ctx->twopass_stats.buf,
ctx->twopass_stats.sz); ctx->twopass_stats.sz);
} }
return coded_size;
*got_packet = !!coded_size;
return 0;
} }
#define OFFSET(x) offsetof(VP8Context, x) #define OFFSET(x) offsetof(VP8Context, x)
@ -570,7 +571,7 @@ AVCodec ff_libvpx_encoder = {
.id = CODEC_ID_VP8, .id = CODEC_ID_VP8,
.priv_data_size = sizeof(VP8Context), .priv_data_size = sizeof(VP8Context),
.init = vp8_init, .init = vp8_init,
.encode = vp8_encode, .encode2 = vp8_encode,
.close = vp8_free, .close = vp8_free,
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},