virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

avcodec/pngenc: Avoid copying APNG data, allow user-supplied buffer

Browse Source 
The APNG encoder already uses internal buffers, so that the packet size
is already known before allocating the packet; therefore one can avoid
another (implicit) intermediate buffer by switching to
ff_get_encode_buffer(), thereby also supporting user-supplied buffers.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-04-25 01:43:26 +02:00
parent aaefb84b04
commit 250d8661ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pngenc.c
View File

@ -20,6 +20,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "encode.h"
#include "internal.h" #include "internal.h"
#include "bytestream.h" #include "bytestream.h"
#include "lossless_videoencdsp.h" #include "lossless_videoencdsp.h"
@ -887,12 +888,11 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt,
if (!s->last_frame_packet) if (!s->last_frame_packet)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else if (s->last_frame) { } else if (s->last_frame) {
ret = ff_alloc_packet2(avctx, pkt, max_packet_size, 0); ret = ff_get_encode_buffer(avctx, pkt, s->last_frame_packet_size, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
memcpy(pkt->data, s->last_frame_packet, s->last_frame_packet_size); memcpy(pkt->data, s->last_frame_packet, s->last_frame_packet_size);
pkt->size = s->last_frame_packet_size;
pkt->pts = pkt->dts = s->last_frame->pts; pkt->pts = pkt->dts = s->last_frame->pts;
} }
@ -1148,11 +1148,11 @@ const AVCodec ff_apng_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("APNG (Animated Portable Network Graphics) image"), .long_name = NULL_IF_CONFIG_SMALL("APNG (Animated Portable Network Graphics) image"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_APNG, .id = AV_CODEC_ID_APNG,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.priv_data_size = sizeof(PNGEncContext), .priv_data_size = sizeof(PNGEncContext),
.init = png_enc_init, .init = png_enc_init,
.close = png_enc_close, .close = png_enc_close,
.encode2 = encode_apng, .encode2 = encode_apng,
.capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA,
AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64BE, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGBA64BE,