[FFmpeg-cvslog] libx264: implement encode2().
Anton Khirnov
git at videolan.org
Thu Feb 9 01:46:12 CET 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Feb 6 07:39:23 2012 +0100| [06484d0b8a7d4d1a694ba7ab277e2ec32d6558d7] | committer: Anton Khirnov
libx264: implement encode2().
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06484d0b8a7d4d1a694ba7ab277e2ec32d6558d7
---
libavcodec/libx264.c | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index b8d9d46..3934627 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -84,12 +84,23 @@ static void X264_log(void *p, int level, const char *fmt, va_list args)
}
-static int encode_nals(AVCodecContext *ctx, uint8_t *buf, int size,
- x264_nal_t *nals, int nnal, int skip_sei)
+static int encode_nals(AVCodecContext *ctx, AVPacket *pkt,
+ x264_nal_t *nals, int nnal)
{
X264Context *x4 = ctx->priv_data;
- uint8_t *p = buf;
- int i;
+ uint8_t *p;
+ int i, size = x4->sei_size, ret;
+
+ if (!nnal)
+ return 0;
+
+ for (i = 0; i < nnal; i++)
+ size += nals[i].i_payload;
+
+ if ((ret = ff_alloc_packet(pkt, size)) < 0)
+ return ret;
+
+ p = pkt->data;
/* Write the SEI as part of the first frame. */
if (x4->sei_size > 0 && nnal > 0) {
@@ -103,16 +114,15 @@ static int encode_nals(AVCodecContext *ctx, uint8_t *buf, int size,
p += nals[i].i_payload;
}
- return p - buf;
+ return 1;
}
-static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
- int bufsize, void *data)
+static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
+ int *got_packet)
{
X264Context *x4 = ctx->priv_data;
- AVFrame *frame = data;
x264_nal_t *nal;
- int nnal, i;
+ int nnal, i, ret;
x264_picture_t pic_out;
x264_picture_init( &x4->pic );
@@ -143,13 +153,13 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
if (x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0)
return -1;
- bufsize = encode_nals(ctx, buf, bufsize, nal, nnal, 0);
- if (bufsize < 0)
+ ret = encode_nals(ctx, pkt, nal, nnal);
+ if (ret < 0)
return -1;
- } while (!bufsize && !frame && x264_encoder_delayed_frames(x4->enc));
+ } while (!ret && !frame && x264_encoder_delayed_frames(x4->enc));
- /* FIXME: libx264 now provides DTS, but AVFrame doesn't have a field for it. */
- x4->out_pic.pts = pic_out.i_pts;
+ pkt->pts = pic_out.i_pts;
+ pkt->dts = pic_out.i_dts;
switch (pic_out.i_type) {
case X264_TYPE_IDR:
@@ -165,11 +175,12 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
break;
}
- x4->out_pic.key_frame = pic_out.b_keyframe;
- if (bufsize)
+ pkt->flags |= AV_PKT_FLAG_KEY*pic_out.b_keyframe;
+ if (ret)
x4->out_pic.quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
- return bufsize;
+ *got_packet = ret;
+ return 0;
}
static av_cold int X264_close(AVCodecContext *avctx)
@@ -534,7 +545,7 @@ AVCodec ff_libx264_encoder = {
.id = CODEC_ID_H264,
.priv_data_size = sizeof(X264Context),
.init = X264_init,
- .encode = X264_frame,
+ .encode2 = X264_frame,
.close = X264_close,
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
More information about the ffmpeg-cvslog
mailing list