Skip to content

Commit

Permalink
avcodec/libwebpenc_animencoder: Allow user-supplied buffers
Browse files Browse the repository at this point in the history
Here the packet size is known before allocating the packet,
so that supporting user-supplied buffers is trivial.

Reviewed-by: James Almer <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
  • Loading branch information
mkver committed May 23, 2021
1 parent ad26efb commit cfff94b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions libavcodec/libwebpenc_animencoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/

#include "config.h"
#include "encode.h"
#include "libwebpenc_common.h"

#include <webp/mux.h>
Expand Down Expand Up @@ -67,7 +68,7 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
WebPData assembled_data = { 0 };
ret = WebPAnimEncoderAssemble(s->enc, &assembled_data);
if (ret) {
ret = ff_alloc_packet2(avctx, pkt, assembled_data.size, assembled_data.size);
ret = ff_get_encode_buffer(avctx, pkt, assembled_data.size, 0);
if (ret < 0)
return ret;
memcpy(pkt->data, assembled_data.bytes, assembled_data.size);
Expand Down Expand Up @@ -136,11 +137,11 @@ const AVCodec ff_libwebp_anim_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WEBP,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.priv_data_size = sizeof(LibWebPAnimContext),
.init = libwebp_anim_encode_init,
.encode2 = libwebp_anim_encode_frame,
.close = libwebp_anim_encode_close,
.capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_RGB32,
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P,
Expand Down

0 comments on commit cfff94b

Please sign in to comment.