Skip to content

Display and control your Android device

Avoid unnecessary copy on config packets demuxing

Romain Vimontbf8696d02e2f
diff --git a/app/src/demuxer.c b/app/src/demuxer.c
index 2c0c64a8..c88af220 100644
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -95,29 +95,27 @@ sc_demuxer_push_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
// A config packet must not be decoded immediately (it contains no
// frame); instead, it must be concatenated with the future data packet.
if (demuxer->pending || is_config) {
- size_t offset;
if (demuxer->pending) {
- offset = demuxer->pending->size;
+ size_t offset = demuxer->pending->size;
if (av_grow_packet(demuxer->pending, packet->size)) {
LOG_OOM();
return false;
}
+
+ memcpy(demuxer->pending->data + offset, packet->data, packet->size);
} else {
- offset = 0;
demuxer->pending = av_packet_alloc();
if (!demuxer->pending) {
LOG_OOM();
return false;
}
- if (av_new_packet(demuxer->pending, packet->size)) {
+ if (av_packet_ref(demuxer->pending, packet)) {
LOG_OOM();
av_packet_free(&demuxer->pending);
return false;
}
}
- memcpy(demuxer->pending->data + offset, packet->data, packet->size);
-
if (!is_config) {
// prepare the concat packet to send to the decoder
demuxer->pending->pts = packet->pts;