Browse code

Support filters and decoders that dont support negative linesizes. This patch is based on work by stefano.

Originally committed as revision 26108 to svn://svn.ffmpeg.org/ffmpeg/trunk

Michael Niedermayer authored on 2010/12/28 00:10:21
Showing 4 changed files
... ...
@@ -1616,6 +1616,9 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
1616 1616
     int i, w, h, stride[4];
1617 1617
     unsigned edge;
1618 1618
 
1619
+    if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
1620
+        perms |= AV_PERM_NEG_LINESIZES;
1621
+
1619 1622
     if(pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
1620 1623
         if(pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
1621 1624
         if(pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
... ...
@@ -197,12 +197,13 @@ int avfilter_config_links(AVFilterContext *filter)
197 197
 
198 198
 char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms)
199 199
 {
200
-    snprintf(buf, buf_size, "%s%s%s%s%s",
200
+    snprintf(buf, buf_size, "%s%s%s%s%s%s",
201 201
              perms & AV_PERM_READ      ? "r" : "",
202 202
              perms & AV_PERM_WRITE     ? "w" : "",
203 203
              perms & AV_PERM_PRESERVE  ? "p" : "",
204 204
              perms & AV_PERM_REUSE     ? "u" : "",
205
-             perms & AV_PERM_REUSE2    ? "U" : "");
205
+             perms & AV_PERM_REUSE2    ? "U" : "",
206
+             perms & AV_PERM_NEG_LINESIZES ? "n" : "");
206 207
     return buf;
207 208
 }
208 209
 
... ...
@@ -360,15 +361,17 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
360 360
 {
361 361
     void (*start_frame)(AVFilterLink *, AVFilterBufferRef *);
362 362
     AVFilterPad *dst = link->dstpad;
363
+    int perms = picref->perms;
363 364
 
364 365
     FF_DPRINTF_START(NULL, start_frame); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " "); ff_dprintf_ref(NULL, picref, 1);
365 366
 
366 367
     if (!(start_frame = dst->start_frame))
367 368
         start_frame = avfilter_default_start_frame;
368 369
 
370
+    if (picref->linesize[0] < 0)
371
+        perms |= AV_PERM_NEG_LINESIZES;
369 372
     /* prepare to copy the picture if it has insufficient permissions */
370
-    if ((dst->min_perms & picref->perms) != dst->min_perms ||
371
-         dst->rej_perms & picref->perms) {
373
+    if ((dst->min_perms & perms) != dst->min_perms || dst->rej_perms & perms) {
372 374
         av_log(link->dst, AV_LOG_DEBUG,
373 375
                 "frame copy needed (have perms %x, need %x, reject %x)\n",
374 376
                 picref->perms,
... ...
@@ -87,6 +87,7 @@ typedef struct AVFilterBuffer {
87 87
 #define AV_PERM_PRESERVE 0x04   ///< nobody else can overwrite the buffer
88 88
 #define AV_PERM_REUSE    0x08   ///< can output the buffer multiple times, with the same contents each time
89 89
 #define AV_PERM_REUSE2   0x10   ///< can output the buffer multiple times, modified each time
90
+#define AV_PERM_NEG_LINESIZES 0x20  ///< the buffer requested can have negative linesizes
90 91
 
91 92
 /**
92 93
  * Audio specific properties in a reference to an AVFilterBuffer. Since
... ...
@@ -43,11 +43,13 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms,
43 43
                                         int w, int h)
44 44
 {
45 45
     FlipContext *flip = link->dst->priv;
46
+    AVFilterBufferRef *picref;
46 47
     int i;
47 48
 
48
-    AVFilterBufferRef *picref = avfilter_get_video_buffer(link->dst->outputs[0],
49
-                                                       perms, w, h);
49
+    if (!(perms & AV_PERM_NEG_LINESIZES))
50
+        return avfilter_default_get_video_buffer(link, perms, w, h);
50 51
 
52
+    picref = avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
51 53
     for (i = 0; i < 4; i ++) {
52 54
         int vsub = i == 1 || i == 2 ? flip->vsub : 0;
53 55