aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-25 01:43:26 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-05-05 12:45:49 +0200
commit1393c7edae338fd6fd3d53bde824646e1841ab2c (patch)
tree5155a931bf8f503427fc11cd4e7db00b1318a1df
parent4569c70f140f01447d1de385a2dd490976d95f89 (diff)
downloadffmpeg-1393c7edae338fd6fd3d53bde824646e1841ab2c.tar.gz
avcodec/dnxhdenc: Avoid copying packet data, allow user-supplied buffers
When the packet size is known in advance like here, one can avoid an intermediate buffer for the packet data by using ff_get_encode_buffer() and also set AV_CODEC_CAP_DR1 at the same time. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/dnxhdenc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 23c3f6fdb9..7f18aff66e 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -30,6 +30,7 @@
#include "avcodec.h"
#include "blockdsp.h"
+#include "encode.h"
#include "fdctdsp.h"
#include "internal.h"
#include "mpegvideo.h"
@@ -1257,7 +1258,7 @@ static int dnxhd_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
int offset, i, ret;
uint8_t *buf;
- if ((ret = ff_alloc_packet2(avctx, pkt, ctx->frame_size, 0)) < 0)
+ if ((ret = ff_get_encode_buffer(avctx, pkt, ctx->frame_size, 0)) < 0)
return ret;
buf = pkt->data;
@@ -1354,11 +1355,12 @@ const AVCodec ff_dnxhd_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_DNXHD,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS |
+ AV_CODEC_CAP_SLICE_THREADS,
.priv_data_size = sizeof(DNXHDEncContext),
.init = dnxhd_encode_init,
.encode2 = dnxhd_encode_picture,
.close = dnxhd_encode_end,
- .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV422P,