On Wed, Feb 22, 2012 at 06:29:42PM +0100, Anton Khirnov wrote:
> ---
> libavcodec/libtheoraenc.c | 24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
> index eccecea..e981642 100644
> --- a/libavcodec/libtheoraenc.c
> +++ b/libavcodec/libtheoraenc.c
> @@ -35,6 +35,7 @@
> #include "libavutil/log.h"
> #include "libavutil/base64.h"
> #include "avcodec.h"
> +#include "internal.h"
>
> /* libtheora includes */
> #include <theora/theoraenc.h>
> @@ -260,14 +261,13 @@ static av_cold int encode_init(AVCodecContext*
> avc_context)
> return 0;
> }
>
> -static int encode_frame(AVCodecContext* avc_context, uint8_t *outbuf,
> - int buf_size, void *data)
> +static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt,
> + const AVFrame *frame, int *got_packet)
> {
> th_ycbcr_buffer t_yuv_buffer;
> TheoraContext *h = avc_context->priv_data;
> - AVFrame *frame = data;
> ogg_packet o_packet;
> - int result, i;
> + int result, i, ret;
>
> // EOS, finish and get 1st pass stats if applicable
> if (!frame) {
> @@ -328,18 +328,20 @@ static int encode_frame(AVCodecContext* avc_context,
> uint8_t *outbuf,
> }
>
> /* Copy ogg_packet content out to buffer */
> - if (buf_size < o_packet.bytes) {
> - av_log(avc_context, AV_LOG_ERROR, "encoded frame too large\n");
> - return -1;
> + if ((ret = ff_alloc_packet(pkt, o_packet.bytes)) < 0) {
> + av_log(avc_context, AV_LOG_ERROR, "Error getting output packet of
> size %ld.\n", o_packet.bytes);
> + return ret;
> }
> - memcpy(outbuf, o_packet.packet, o_packet.bytes);
> + memcpy(pkt->data, o_packet.packet, o_packet.bytes);
>
> // HACK: assumes no encoder delay, this is true until libtheora becomes
> // multithreaded (which will be disabled unless explictly requested)
> - avc_context->coded_frame->pts = frame->pts;
> + pkt->pts = pkt->dts = frame->pts;
> avc_context->coded_frame->key_frame = !(o_packet.granulepos &
> h->keyframe_mask);
> + pkt->flags |= AV_PKT_FLAG_KEY*avc_context->coded_frame->key_frame;
With an if() it would be good.
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
