From e11d0145e29c38a2721fe131728d83512e5c30b9 Mon Sep 17 00:00:00 2001
From: Roberto Togni <r_togni@tiscali.it>
Date: Sun, 18 Nov 2007 22:40:02 +0000
Subject: [PATCH] Optimize memory management to create an av_packet from
multiple slices: - remove memmove to pack the data, instead copy only the
used areas from the temp buffer in their final position - use the minimum
possible size for the av_packet (relevant when some slices are missing)
Originally committed as revision 11052 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/rmdec.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 6027e311026..8793487dd97 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -519,14 +519,11 @@ static int rm_assemble_video_frame(AVFormatContext *s, RMContext *rm, AVPacket *
rm->remaining_len-= len;
if(type == 2 || (rm->videobufpos) == rm->videobufsize){
- //adjust slice headers
- memmove(rm->videobuf + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, rm->videobufsize - 1 - 8*rm->slices);
- ssize = rm->videobufsize - 8*(rm->slices - rm->cur_slice);
-
rm->videobuf[0] = rm->cur_slice-1;
- if(av_new_packet(pkt, ssize) < 0)
+ if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0)
return AVERROR(ENOMEM);
- memcpy(pkt->data, rm->videobuf, ssize);
+ memcpy(pkt->data, rm->videobuf, 1 + 8*rm->cur_slice);
+ memcpy(pkt->data + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, rm->videobufpos - 1 - 8*rm->slices);
pkt->pts = AV_NOPTS_VALUE;
pkt->pos = rm->pktpos;
return 0;
--
GitLab