2 files changed, 18 insertions, 3 deletions
diff --git a/src/pulsecore/packet.c b/src/pulsecore/packet.c
index a819ee3d8..eacff9dd6 100644
--- a/src/pulsecore/packet.c
+++ b/src/pulsecore/packet.c
@@ -29,11 +29,16 @@
 
 #include "packet.h"
 
+#define MAX_APPENDED_SIZE 128
+
 typedef struct pa_packet {
     PA_REFCNT_DECLARE;
     enum { PA_PACKET_APPENDED, PA_PACKET_DYNAMIC } type;
     size_t length;
     uint8_t *data;
+    union {
+        uint8_t appended[MAX_APPENDED_SIZE];
+    } per_type;
 } pa_packet;
 
 pa_packet* pa_packet_new(size_t length) {
@@ -41,11 +46,16 @@ pa_packet* pa_packet_new(size_t length) {
 
     pa_assert(length > 0);
 
-    p = pa_xmalloc(PA_ALIGN(sizeof(pa_packet)) + length);
+    p = pa_xnew(pa_packet, 1);
     PA_REFCNT_INIT(p);
     p->length = length;
-    p->data = (uint8_t*) p + PA_ALIGN(sizeof(pa_packet));
-    p->type = PA_PACKET_APPENDED;
+    if (length > MAX_APPENDED_SIZE) {
+        p->data = pa_xmalloc(length);
+        p->type = PA_PACKET_DYNAMIC;
+    } else {
+        p->data = p->per_type.appended;
+        p->type = PA_PACKET_APPENDED;
+    }
 
     return p;
 }
diff --git a/src/pulsecore/packet.h b/src/pulsecore/packet.h
index 83fa0b863..6d61e02e4 100644
--- a/src/pulsecore/packet.h
+++ b/src/pulsecore/packet.h
@@ -25,7 +25,12 @@
 
 typedef struct pa_packet pa_packet;
 
+/* create empty packet (either of type appended or dynamic depending
+ * on length) */
 pa_packet* pa_packet_new(size_t length);
+
+/* data must have been malloc()ed; the packet takes ownership of the memory,
+ * i.e. memory is free()d with the packet */
 pa_packet* pa_packet_new_dynamic(void* data, size_t length);
 
 const void* pa_packet_data(pa_packet *p, size_t *l);