diff mbox series

[FFmpeg-devel,33/34] avcodec/libshine: Avoid copying packet data

Message ID HE1PR0301MB2154CF0AE1B43FC29EED12538F439@HE1PR0301MB2154.eurprd03.prod.outlook.com
State Superseded
Headers show
Series [FFmpeg-devel,01/34] avcodec/adpcmenc: Avoid copying packet data | expand


Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate fail Make fate failed
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate warning Make fate failed

Commit Message

Andreas Rheinhardt April 25, 2021, 10:34 p.m. UTC
The libshine encoder already uses an internal buffer, so that the
packet size is already known before allocating the packet; therefore
one can avoid another (implicit) intermediate buffer by setting
the min_size parameter in ff_alloc_packet2().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 libavcodec/libshine.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series


diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c
index 7056fcd2e3..dcda996ad1 100644
--- a/libavcodec/libshine.c
+++ b/libavcodec/libshine.c
@@ -102,7 +102,7 @@  static int libshine_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     len = hdr.frame_size;
     if (len <= s->buffer_index) {
-        if ((ret = ff_alloc_packet2(avctx, avpkt, len, 0)))
+        if ((ret = ff_alloc_packet2(avctx, avpkt, len, len)))
             return ret;
         memcpy(avpkt->data, s->buffer, len);
         s->buffer_index -= len;
@@ -111,7 +111,6 @@  static int libshine_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts,
-        avpkt->size = len;
         *got_packet_ptr = 1;
     return 0;