virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

v410enc: switch to encode2().

Browse Source
This commit is contained in:
Anton Khirnov
2012-02-12 09:32:40 +01:00
parent 11505f39e1
commit 2abee9be82
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/v410enc.c
View File

@@ -22,6 +22,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h"
static av_cold int v410_encode_init(AVCodecContext *avctx) static av_cold int v410_encode_init(AVCodecContext *avctx)
{ {
@@ -40,20 +41,19 @@ static av_cold int v410_encode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf, static int v410_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
int buf_size, void *data) const AVFrame *pic, int *got_packet)
{ {
AVFrame *pic = data; uint8_t *dst;
uint8_t *dst = buf;
uint16_t *y, *u, *v; uint16_t *y, *u, *v;
uint32_t val; uint32_t val;
int i, j; int i, j, ret;
int output_size = 0;
if (buf_size < avctx->width * avctx->height * 4) { if ((ret = ff_alloc_packet(pkt, avctx->width * avctx->height * 4)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Out buffer is too small.\n"); av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
return AVERROR(ENOMEM); return ret;
} }
dst = pkt->data;
avctx->coded_frame->reference = 0; avctx->coded_frame->reference = 0;
avctx->coded_frame->key_frame = 1; avctx->coded_frame->key_frame = 1;
@@ -70,14 +70,15 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf,
val |= (uint32_t) v[j] << 22; val |= (uint32_t) v[j] << 22;
AV_WL32(dst, val); AV_WL32(dst, val);
dst += 4; dst += 4;
output_size += 4;
} }
y += pic->linesize[0] >> 1; y += pic->linesize[0] >> 1;
u += pic->linesize[1] >> 1; u += pic->linesize[1] >> 1;
v += pic->linesize[2] >> 1; v += pic->linesize[2] >> 1;
} }
return output_size; pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
return 0;
} }
static av_cold int v410_encode_close(AVCodecContext *avctx) static av_cold int v410_encode_close(AVCodecContext *avctx)
@@ -92,7 +93,7 @@ AVCodec ff_v410_encoder = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_V410, .id = CODEC_ID_V410,
.init = v410_encode_init, .init = v410_encode_init,
.encode = v410_encode_frame, .encode2 = v410_encode_frame,
.close = v410_encode_close, .close = v410_encode_close,
.pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV444P10, PIX_FMT_NONE }, .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV444P10, PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),