lavfi: grant all permissions on mallocated audio buffers.
authorNicolas George <nicolas.george@normalesup.org>
Tue, 14 Aug 2012 16:35:50 +0000 (18:35 +0200)
committerNicolas George <nicolas.george@normalesup.org>
Fri, 17 Aug 2012 16:26:38 +0000 (18:26 +0200)
The permissions not requested by the filter that created
the buffer may be useful for a later filter and avoid a copy.

libavfilter/audio.c

index aa87488..525b471 100644 (file)
@@ -42,6 +42,10 @@ AVFilterBufferRef *ff_default_get_audio_buffer(AVFilterLink *link, int perms,
     int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout);
     int planes      = planar ? nb_channels : 1;
     int linesize;
+    int full_perms = AV_PERM_READ | AV_PERM_WRITE | AV_PERM_PRESERVE |
+                     AV_PERM_REUSE | AV_PERM_REUSE2 | AV_PERM_ALIGN;
+
+    av_assert1(!(perms & ~(full_perms | AV_PERM_NEG_LINESIZES)));
 
     if (!(data = av_mallocz(sizeof(*data) * planes)))
         goto fail;
@@ -49,7 +53,7 @@ AVFilterBufferRef *ff_default_get_audio_buffer(AVFilterLink *link, int perms,
     if (av_samples_alloc(data, &linesize, nb_channels, nb_samples, link->format, 0) < 0)
         goto fail;
 
-    samplesref = avfilter_get_audio_buffer_ref_from_arrays(data, linesize, perms,
+    samplesref = avfilter_get_audio_buffer_ref_from_arrays(data, linesize, full_perms,
                                                            nb_samples, link->format,
                                                            link->channel_layout);
     if (!samplesref)