Changeset 1173

Timestamp:

10/23/09 17:32:03 (9 months ago)

Author:

astrange

Message:

Use av_fast_malloc instead of av_fast_realloc in some places.
Also use av_malloc instead of malloc (just for style reasons).
Also use input buffer padding properly.

Location:

trunk

Files:

• CommonUtils.c (modified) (1 diff)
• CommonUtils.h (modified) (1 diff)
• FrameBuffer.c (modified) (1 diff)
• VobSubCodec.c (modified) (2 diffs)

trunk/CommonUtils.c

@@ -442 +442 @@
                 pthread_mutex_unlock(&init_mutex);
 }
+
+void *fast_realloc_with_padding(void *ptr, unsigned int *size, unsigned int min_size)
+{
+        void *res = ptr;
+        av_fast_malloc(&res, size, min_size + FF_INPUT_BUFFER_PADDING_SIZE);
+        if (res) memset(res + min_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+        return res;
+}

trunk/CommonUtils.h

@@ -66 +66 @@
 int PerianInitEnter(volatile Boolean *inited);
 void PerianInitExit(int unlock);
-        
+
+void *fast_realloc_with_padding(void *ptr, unsigned int *size, unsigned int min_size);
+
 #define PERIAN_PREF_DOMAIN CFSTR("org.perian.Perian")
 

trunk/FrameBuffer.c

@@ -76 +76 @@
 uint8_t *FFusionCreateEntireDataBuffer(FFusionData *data, uint8_t *buffer, int bufferSize)
 {
-        data->ringBuffer = av_fast_realloc(data->ringBuffer, &(data->ringSize), bufferSize + FF_INPUT_BUFFER_PADDING_SIZE);
+        data->ringBuffer = fast_realloc_with_padding(data->ringBuffer, &data->ringSize, bufferSize);
         if (data->ringBuffer) {
-                uint8_t *dataPtr = data->ringBuffer;
-                memcpy(dataPtr, buffer, bufferSize);
-                memset(dataPtr + bufferSize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+                memcpy(data->ringBuffer, buffer, bufferSize);
         }
         return data->ringBuffer;

trunk/VobSubCodec.c

@@ -293 +293 @@
         // reallocate our buffer to be big enough to store the decompressed packet
         *bufferSize = AV_RB16(glob->codecData);
-        glob->codecData = av_fast_realloc(glob->codecData, &glob->bufferSize, *bufferSize);
+        glob->codecData = fast_realloc_with_padding(glob->codecData, &glob->bufferSize, *bufferSize);
         
         // then decompress the rest of it
@@ -317 +317 @@
         
         if (glob->codecData == NULL) {
-                glob->codecData = malloc(myDrp->bufferSize + 2);
+                glob->codecData = av_malloc(myDrp->bufferSize + 2);
                 glob->bufferSize = myDrp->bufferSize + 2;
         }
         
         // make sure we have enough space to store the packet
-        glob->codecData = av_fast_realloc(glob->codecData, &glob->bufferSize, myDrp->bufferSize + 2);
+        glob->codecData = fast_realloc_with_padding(glob->codecData, &glob->bufferSize, myDrp->bufferSize + 2);
         
         if (glob->compressed) {