generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc: drop encode() support for video.

Browse Source 
All video encoders have been converted to encode2(), all new encoders
should also use only encode2().
This commit is contained in:
Anton Khirnov 2012-02-23 11:02:11 +01:00
parent 171273fec8
commit ff311c0918
1 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libavcodec/utils.c
View File

@ -1082,9 +1082,6 @@ int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf
} }
#endif #endif
#define MAX_CODED_FRAME_SIZE(width, height)\
(8*(width)*(height) + FF_MIN_BUFFER_SIZE)
int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
AVPacket *avpkt, AVPacket *avpkt,
const AVFrame *frame, const AVFrame *frame,
@ -1103,44 +1100,15 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
if (av_image_check_size(avctx->width, avctx->height, 0, avctx)) if (av_image_check_size(avctx->width, avctx->height, 0, avctx))
return AVERROR(EINVAL); return AVERROR(EINVAL);
if (avctx->codec->encode2) { av_assert0(avctx->codec->encode2);
*got_packet_ptr = 0;
ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
if (!ret) {
if (!*got_packet_ptr)
avpkt->size = 0;
else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY))
avpkt->pts = avpkt->dts = frame->pts;
}
} else {
/* for compatibility with encoders not supporting encode2(), we need to
allocate a packet buffer if the user has not provided one or check
the size otherwise */
int buf_size = avpkt->size;
if (!user_packet) *got_packet_ptr = 0;
buf_size = MAX_CODED_FRAME_SIZE(avctx->width, avctx->height); ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
if (!ret) {
if ((ret = ff_alloc_packet(avpkt, buf_size))) if (!*got_packet_ptr)
return ret; avpkt->size = 0;
else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY))
/* encode the frame */ avpkt->pts = avpkt->dts = frame->pts;
ret = avctx->codec->encode(avctx, avpkt->data, avpkt->size, frame);
if (ret >= 0) {
if (!ret) {
/* no output. if the packet data was allocated by libavcodec,
free it */
if (!user_packet)
av_freep(&avpkt->data);
} else if (avctx->coded_frame) {
avpkt->pts = avctx->coded_frame->pts;
avpkt->flags |= AV_PKT_FLAG_KEY*avctx->coded_frame->key_frame;
}
avpkt->size = ret;
*got_packet_ptr = (ret > 0);
ret = 0;
}
} }
if (!ret) if (!ret)