X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fdetelecine.c;h=20210382846cb607e4d0ce7b5131e2abbe77dc51;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=10c546ec3f1f6fa25c4b68b9e3ae69d2ff246a14;hpb=0242b94ccb6fdaf8b27af47fe716d0f246fe313e;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/detelecine.c b/libhb/detelecine.c
index 10c546ec..20210382 100644
--- a/libhb/detelecine.c
+++ b/libhb/detelecine.c
@@ -1,5 +1,5 @@
 #include "hb.h"
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 
 /*
@@ -22,53 +22,54 @@
 
 struct pullup_buffer
 {
-	int lock[2];
-	unsigned char **planes;
+    int lock[2];
+    unsigned char **planes;
 };
 
 struct pullup_field
 {
-	int parity;
-	struct pullup_buffer *buffer;
-	unsigned int flags;
-	int breaks;
-	int affinity;
-	int *diffs;
-	int *comb;
-	int *var;
-	struct pullup_field *prev, *next;
+    int parity;
+    struct pullup_buffer *buffer;
+    unsigned int flags;
+    int breaks;
+    int affinity;
+    int *diffs;
+    int *comb;
+    int *var;
+    struct pullup_field *prev, *next;
 };
 
 struct pullup_frame
 {
-	int lock;
-	int length;
-	int parity;
-	struct pullup_buffer **ifields, *ofields[2];
-	struct pullup_buffer *buffer;
+    int lock;
+    int length;
+    int parity;
+    struct pullup_buffer **ifields, *ofields[2];
+    struct pullup_buffer *buffer;
 };
 
 struct pullup_context
 {
-	/* Public interface */
-	int format;
-	int nplanes;
-	int *bpp, *w, *h, *stride, *background;
-	unsigned int cpu;
-	int junk_left, junk_right, junk_top, junk_bottom;
-	int verbose;
-	int metric_plane;
-	int strict_breaks;
-	int strict_pairs;
-	/* Internal data */
-	struct pullup_field *first, *last, *head;
-	struct pullup_buffer *buffers;
-	int nbuffers;
-	int (*diff)(unsigned char *, unsigned char *, int);
-	int (*comb)(unsigned char *, unsigned char *, int);
-	int (*var)(unsigned char *, unsigned char *, int);
-	int metric_w, metric_h, metric_len, metric_offset;
-	struct pullup_frame *frame;
+    /* Public interface */
+    int format;
+    int nplanes;
+    int *bpp, *w, *h, *stride, *background;
+    unsigned int cpu;
+    int junk_left, junk_right, junk_top, junk_bottom;
+    int verbose;
+    int metric_plane;
+    int strict_breaks;
+    int strict_pairs;
+    int parity;
+    /* Internal data */
+    struct pullup_field *first, *last, *head;
+    struct pullup_buffer *buffers;
+    int nbuffers;
+    int (*diff)(unsigned char *, unsigned char *, int);
+    int (*comb)(unsigned char *, unsigned char *, int);
+    int (*var)(unsigned char *, unsigned char *, int);
+    int metric_w, metric_h, metric_len, metric_offset;
+    struct pullup_frame *frame;
 };
 
 /*
@@ -124,53 +125,53 @@ hb_filter_object_t hb_filter_detelecine =
 
 static int pullup_diff_y( unsigned char  *a, unsigned char * b, int s )
 {
-	int i, j, diff = 0;
-	for( i = 4; i; i-- )
+    int i, j, diff = 0;
+    for( i = 4; i; i-- )
     {
-		for( j = 0; j < 8; j++ )
+        for( j = 0; j < 8; j++ )
         {
             diff += PULLUP_ABS( a[j]-b[j] );
         }
-		a+=s; b+=s;
-	}
-	return diff;
+        a+=s; b+=s;
+    }
+    return diff;
 }
 
 static int pullup_licomb_y( unsigned char * a, unsigned char * b, int s )
 {
-	int i, j, diff = 0;
-	for( i = 4; i; i-- )
+    int i, j, diff = 0;
+    for( i = 4; i; i-- )
     {
-		for( j = 0; j < 8; j++ )
+        for( j = 0; j < 8; j++ )
         {
-			diff += PULLUP_ABS( (a[j]<<1) - b[j-s] - b[j] )
-				  + PULLUP_ABS( (b[j]<<1) - a[j] - a[j+s] );
+            diff += PULLUP_ABS( (a[j]<<1) - b[j-s] - b[j] )
+                  + PULLUP_ABS( (b[j]<<1) - a[j] - a[j+s] );
         }
-		a+=s; b+=s;
-	}
-	return diff;
+        a+=s; b+=s;
+    }
+    return diff;
 }
 
 static int pullup_var_y( unsigned char * a, unsigned char * b, int s )
 {
-	int i, j, var = 0;
-	for( i = 3; i; i-- )
+    int i, j, var = 0;
+    for( i = 3; i; i-- )
     {
-		for( j = 0; j < 8; j++ )
+        for( j = 0; j < 8; j++ )
         {
-			var += PULLUP_ABS( a[j]-a[j+s] );
-		}
-		a+=s; b+=s;
-	}
-	return 4*var;
+            var += PULLUP_ABS( a[j]-a[j+s] );
+        }
+        a+=s; b+=s;
+    }
+    return 4*var;
 }
 
 static void pullup_alloc_metrics( struct pullup_context * c,
                                   struct pullup_field * f )
 {
-	f->diffs = calloc( c->metric_len, sizeof(int) );
-	f->comb  = calloc( c->metric_len, sizeof(int) );
-	f->var   = calloc( c->metric_len, sizeof(int) );
+    f->diffs = calloc( c->metric_len, sizeof(int) );
+    f->comb  = calloc( c->metric_len, sizeof(int) );
+    f->var   = calloc( c->metric_len, sizeof(int) );
 }
 
 static void pullup_compute_metric( struct pullup_context * c,
@@ -180,65 +181,65 @@ static void pullup_compute_metric( struct pullup_context * c,
                                                  unsigned char *, int),
                                    int * dest )
 {
-	unsigned char *a, *b;
-	int x, y;
-	int mp    = c->metric_plane;
-	int xstep = c->bpp[mp];
-	int ystep = c->stride[mp]<<3;
-	int s     = c->stride[mp]<<1; /* field stride */
-	int w     = c->metric_w*xstep;
-
-	if( !fa->buffer || !fb->buffer ) return;
-
-	/* Shortcut for duplicate fields (e.g. from RFF flag) */
-	if( fa->buffer == fb->buffer && pa == pb )
+    unsigned char *a, *b;
+    int x, y;
+    int mp    = c->metric_plane;
+    int xstep = c->bpp[mp];
+    int ystep = c->stride[mp]<<3;
+    int s     = c->stride[mp]<<1; /* field stride */
+    int w     = c->metric_w*xstep;
+
+    if( !fa->buffer || !fb->buffer ) return;
+
+    /* Shortcut for duplicate fields (e.g. from RFF flag) */
+    if( fa->buffer == fb->buffer && pa == pb )
     {
-		memset( dest, 0, c->metric_len * sizeof(int) );
-		return;
-	}
+        memset( dest, 0, c->metric_len * sizeof(int) );
+        return;
+    }
 
-	a = fa->buffer->planes[mp] + pa * c->stride[mp] + c->metric_offset;
-	b = fb->buffer->planes[mp] + pb * c->stride[mp] + c->metric_offset;
+    a = fa->buffer->planes[mp] + pa * c->stride[mp] + c->metric_offset;
+    b = fb->buffer->planes[mp] + pb * c->stride[mp] + c->metric_offset;
 
-	for( y = c->metric_h; y; y-- )
+    for( y = c->metric_h; y; y-- )
     {
-		for( x = 0; x < w; x += xstep )
+        for( x = 0; x < w; x += xstep )
         {
-			*dest++ = func( a + x, b + x, s );
-		}
-		a += ystep; b += ystep;
-	}
+            *dest++ = func( a + x, b + x, s );
+        }
+        a += ystep; b += ystep;
+    }
 }
 
 static struct pullup_field * pullup_make_field_queue( struct pullup_context * c,
                                                       int len )
 {
-	struct pullup_field * head, * f;
-	f = head = calloc( 1, sizeof(struct pullup_field) );
-	pullup_alloc_metrics( c, f );
-	for ( ; len > 0; len-- )
+    struct pullup_field * head, * f;
+    f = head = calloc( 1, sizeof(struct pullup_field) );
+    pullup_alloc_metrics( c, f );
+    for ( ; len > 0; len-- )
     {
-		f->next = calloc( 1, sizeof(struct pullup_field) );
-		f->next->prev = f;
-		f = f->next;
-		pullup_alloc_metrics( c, f );
-	}
-	f->next = head;
-	head->prev = f;
-	return head;
+        f->next = calloc( 1, sizeof(struct pullup_field) );
+        f->next->prev = f;
+        f = f->next;
+        pullup_alloc_metrics( c, f );
+    }
+    f->next = head;
+    head->prev = f;
+    return head;
 }
 
 static void pullup_check_field_queue( struct pullup_context * c )
 {
-	if( c->head->next == c->first )
+    if( c->head->next == c->first )
     {
-		struct pullup_field *f = calloc( 1, sizeof(struct pullup_field) );
-		pullup_alloc_metrics( c, f );
-		f->prev = c->head;
-		f->next = c->first;
-		c->head->next = f;
-		c->first->prev = f;
-	}
+        struct pullup_field *f = calloc( 1, sizeof(struct pullup_field) );
+        pullup_alloc_metrics( c, f );
+        f->prev = c->head;
+        f->next = c->first;
+        c->head->next = f;
+        c->first->prev = f;
+    }
 }
 
 static void pullup_copy_field( struct pullup_context * c,
@@ -246,108 +247,108 @@ static void pullup_copy_field( struct pullup_context * c,
                                struct pullup_buffer * src,
                                int parity )
 {
-	int i, j;
-	unsigned char *d, *s;
-	for( i = 0; i < c->nplanes; i++ )
+    int i, j;
+    unsigned char *d, *s;
+    for( i = 0; i < c->nplanes; i++ )
     {
-		s = src->planes[i] + parity*c->stride[i];
-		d = dest->planes[i] + parity*c->stride[i];
-		for( j = c->h[i]>>1; j; j-- )
+        s = src->planes[i] + parity*c->stride[i];
+        d = dest->planes[i] + parity*c->stride[i];
+        for( j = c->h[i]>>1; j; j-- )
         {
-			memcpy( d, s, c->stride[i] );
-			s += c->stride[i]<<1;
-			d += c->stride[i]<<1;
-		}
-	}
+            memcpy( d, s, c->stride[i] );
+            s += c->stride[i]<<1;
+            d += c->stride[i]<<1;
+        }
+    }
 }
 
 
 static int pullup_queue_length( struct pullup_field * begin,
                                 struct pullup_field * end )
 {
-	int count = 1;
-	struct pullup_field * f;
+    int count = 1;
+    struct pullup_field * f;
 
-	if( !begin || !end ) return 0;
-	for( f = begin; f != end; f = f->next ) count++;
-	return count;
+    if( !begin || !end ) return 0;
+    for( f = begin; f != end; f = f->next ) count++;
+    return count;
 }
 
 static int pullup_find_first_break( struct pullup_field * f, int max )
 {
-	int i;
-	for( i = 0; i < max; i++ )
+    int i;
+    for( i = 0; i < max; i++ )
     {
-		if( f->breaks & PULLUP_BREAK_RIGHT ||
+        if( f->breaks & PULLUP_BREAK_RIGHT ||
             f->next->breaks & PULLUP_BREAK_LEFT )
         {
-			return i+1;
+            return i+1;
         }
-		f = f->next;
-	}
-	return 0;
+        f = f->next;
+    }
+    return 0;
 }
 
 static void pullup_compute_breaks( struct pullup_context * c,
                                    struct pullup_field * f0 )
 {
-	int i;
-	struct pullup_field *f1 = f0->next;
-	struct pullup_field *f2 = f1->next;
-	struct pullup_field *f3 = f2->next;
-	int l, max_l=0, max_r=0;
+    int i;
+    struct pullup_field *f1 = f0->next;
+    struct pullup_field *f2 = f1->next;
+    struct pullup_field *f3 = f2->next;
+    int l, max_l=0, max_r=0;
 
-	if( f0->flags & PULLUP_HAVE_BREAKS ) return;
-	f0->flags |= PULLUP_HAVE_BREAKS;
+    if( f0->flags & PULLUP_HAVE_BREAKS ) return;
+    f0->flags |= PULLUP_HAVE_BREAKS;
 
-	/* Special case when fields are 100% identical */
-	if( f0->buffer == f2->buffer && f1->buffer != f3->buffer )
+    /* Special case when fields are 100% identical */
+    if( f0->buffer == f2->buffer && f1->buffer != f3->buffer )
     {
-		f2->breaks |= PULLUP_BREAK_RIGHT;
-		return;
-	}
-	if( f0->buffer != f2->buffer && f1->buffer == f3->buffer )
+        f2->breaks |= PULLUP_BREAK_RIGHT;
+        return;
+    }
+    if( f0->buffer != f2->buffer && f1->buffer == f3->buffer )
     {
-		f1->breaks |= PULLUP_BREAK_LEFT;
-		return;
-	}
+        f1->breaks |= PULLUP_BREAK_LEFT;
+        return;
+    }
 
-	for( i = 0; i < c->metric_len; i++ )
+    for( i = 0; i < c->metric_len; i++ )
     {
-		l = f2->diffs[i] - f3->diffs[i];
-		if(  l > max_l) max_l = l;
-		if( -l > max_r) max_r = -l;
-	}
-
-	/* Don't get tripped up when differences are mostly quant error */
-	if( max_l + max_r < 128 ) return;
-	if( max_l > 4*max_r ) f1->breaks |= PULLUP_BREAK_LEFT;
-	if( max_r > 4*max_l ) f2->breaks |= PULLUP_BREAK_RIGHT;
+        l = f2->diffs[i] - f3->diffs[i];
+        if(  l > max_l) max_l = l;
+        if( -l > max_r) max_r = -l;
+    }
+
+    /* Don't get tripped up when differences are mostly quant error */
+    if( max_l + max_r < 128 ) return;
+    if( max_l > 4*max_r ) f1->breaks |= PULLUP_BREAK_LEFT;
+    if( max_r > 4*max_l ) f2->breaks |= PULLUP_BREAK_RIGHT;
 }
 
 static void pullup_compute_affinity( struct pullup_context * c,
                                      struct pullup_field * f )
 {
-	int i;
-	int max_l = 0, max_r = 0, l;
+    int i;
+    int max_l = 0, max_r = 0, l;
 
     if( f->flags & PULLUP_HAVE_AFFINITY )
     {
         return;
     }
-	f->flags |= PULLUP_HAVE_AFFINITY;
+    f->flags |= PULLUP_HAVE_AFFINITY;
 
-	if( f->buffer == f->next->next->buffer )
+    if( f->buffer == f->next->next->buffer )
     {
-		f->affinity             =  1;
-		f->next->affinity       =  0;
-		f->next->next->affinity = -1;
+        f->affinity             =  1;
+        f->next->affinity       =  0;
+        f->next->next->affinity = -1;
 
-		f->next->flags       |= PULLUP_HAVE_AFFINITY;
-		f->next->next->flags |= PULLUP_HAVE_AFFINITY;
+        f->next->flags       |= PULLUP_HAVE_AFFINITY;
+        f->next->next->flags |= PULLUP_HAVE_AFFINITY;
 
-		return;
-	}
+        return;
+    }
 
     for( i = 0; i < c->metric_len; i++ )
     {
@@ -381,35 +382,35 @@ static void pullup_compute_affinity( struct pullup_context * c,
 
 static void pullup_foo( struct pullup_context * c )
 {
-	struct pullup_field * f = c->first;
-	int i, n = pullup_queue_length (f, c->last );
-	for( i = 0; i < n-1; i++ )
+    struct pullup_field * f = c->first;
+    int i, n = pullup_queue_length (f, c->last );
+    for( i = 0; i < n-1; i++ )
     {
-		if( i < n-3 ) pullup_compute_breaks( c, f );
-		pullup_compute_affinity( c, f );
-		f = f->next;
-	}
+        if( i < n-3 ) pullup_compute_breaks( c, f );
+        pullup_compute_affinity( c, f );
+        f = f->next;
+    }
 }
 
 static int pullup_decide_frame_length( struct pullup_context * c )
 {
-	struct pullup_field *f0 = c->first;
-	struct pullup_field *f1 = f0->next;
-	struct pullup_field *f2 = f1->next;
-	int l;
+    struct pullup_field *f0 = c->first;
+    struct pullup_field *f1 = f0->next;
+    struct pullup_field *f2 = f1->next;
+    int l;
 
-	if( pullup_queue_length( c->first, c->last ) < 4 )
+    if( pullup_queue_length( c->first, c->last ) < 4 )
     {
         return 0;
     }
-	pullup_foo( c );
+    pullup_foo( c );
 
-	if( f0->affinity == -1 ) return 1;
+    if( f0->affinity == -1 ) return 1;
 
-	l = pullup_find_first_break( f0, 3 );
-	if( l == 1 && c->strict_breaks < 0 ) l = 0;
+    l = pullup_find_first_break( f0, 3 );
+    if( l == 1 && c->strict_breaks < 0 ) l = 0;
 
-	switch (l)
+    switch (l)
     {
         case 1:
             if ( c->strict_breaks < 1 &&
@@ -477,37 +478,37 @@ static int pullup_decide_frame_length( struct pullup_context * c )
             {
                 return 2; /* the remaining 6 */
             }
-	}
+    }
 }
 
 static void pullup_print_aff_and_breaks(struct pullup_context * c,
                                         struct pullup_field * f )
 {
-	int i;
-	struct pullup_field * f0 = f;
-	const char aff_l[] = "+..", aff_r[] = "..+";
-	printf( "\naffinity: " );
-	for( i = 0; i < 4; i++ )
+    int i;
+    struct pullup_field * f0 = f;
+    const char aff_l[] = "+..", aff_r[] = "..+";
+    printf( "\naffinity: " );
+    for( i = 0; i < 4; i++ )
     {
-		printf( "%c%d%c",
+        printf( "%c%d%c",
                 aff_l[1+f->affinity],
                 i,
                 aff_r[1+f->affinity] );
 
-		f = f->next;
-	}
-	f = f0;
-	printf("\nbreaks:   ");
-	for( i = 0; i < 4; i++ )
+        f = f->next;
+    }
+    f = f0;
+    printf("\nbreaks:   ");
+    for( i = 0; i < 4; i++ )
     {
-		printf( "%c%d%c",
+        printf( "%c%d%c",
                 f->breaks & PULLUP_BREAK_LEFT  ? '|' : '.',
                 i,
                 f->breaks & PULLUP_BREAK_RIGHT ? '|' : '.' );
 
-		f = f->next;
-	}
-	printf("\n");
+        f = f->next;
+    }
+    printf("\n");
 }
 
 /*
@@ -518,67 +519,69 @@ static void pullup_print_aff_and_breaks(struct pullup_context * c,
 
 struct pullup_context * pullup_alloc_context( void )
 {
-	struct pullup_context * c;
+    struct pullup_context * c;
 
-	c = calloc( 1, sizeof(struct pullup_context)) ;
+    c = calloc( 1, sizeof(struct pullup_context)) ;
 
-	return c;
+    return c;
 }
 
 void pullup_preinit_context( struct pullup_context * c )
 {
-	c->bpp        = calloc( c->nplanes, sizeof(int) );
-	c->w          = calloc( c->nplanes, sizeof(int) );
-	c->h          = calloc( c->nplanes, sizeof(int) );
-	c->stride     = calloc( c->nplanes, sizeof(int) );
-	c->background = calloc( c->nplanes, sizeof(int) );
+    c->bpp        = calloc( c->nplanes, sizeof(int) );
+    c->w          = calloc( c->nplanes, sizeof(int) );
+    c->h          = calloc( c->nplanes, sizeof(int) );
+    c->stride     = calloc( c->nplanes, sizeof(int) );
+    c->background = calloc( c->nplanes, sizeof(int) );
 }
 
 void pullup_init_context( struct pullup_context * c )
 {
-	int mp = c->metric_plane;
-	if ( c->nbuffers < 10 )
+    int mp = c->metric_plane;
+    if ( c->nbuffers < 10 )
     {
         c->nbuffers = 10;
     }
-	c->buffers = calloc( c->nbuffers, sizeof (struct pullup_buffer) );
+    c->buffers = calloc( c->nbuffers, sizeof (struct pullup_buffer) );
 
-	c->metric_w      = (c->w[mp] - ((c->junk_left + c->junk_right) << 3)) >> 3;
-	c->metric_h      = (c->h[mp] - ((c->junk_top + c->junk_bottom) << 1)) >> 3;
-	c->metric_offset = c->junk_left*c->bpp[mp] + (c->junk_top<<1)*c->stride[mp];
-	c->metric_len    = c->metric_w * c->metric_h;
+    c->metric_w      = (c->w[mp] - ((c->junk_left + c->junk_right) << 3)) >> 3;
+    c->metric_h      = (c->h[mp] - ((c->junk_top + c->junk_bottom) << 1)) >> 3;
+    c->metric_offset = c->junk_left*c->bpp[mp] + (c->junk_top<<1)*c->stride[mp];
+    c->metric_len    = c->metric_w * c->metric_h;
 
-	c->head = pullup_make_field_queue( c, 8 );
+    c->head = pullup_make_field_queue( c, 8 );
 
-	c->frame = calloc( 1, sizeof (struct pullup_frame) );
-	c->frame->ifields = calloc( 3, sizeof (struct pullup_buffer *) );
+    c->frame = calloc( 1, sizeof (struct pullup_frame) );
+    c->frame->ifields = calloc( 3, sizeof (struct pullup_buffer *) );
 
-	if( c->format == PULLUP_FMT_Y )
+    if( c->format == PULLUP_FMT_Y )
     {
         c->diff = pullup_diff_y;
         c->comb = pullup_licomb_y;
         c->var  = pullup_var_y;
-	}
+    }
 }
 
 void pullup_free_context( struct pullup_context * c )
 {
-	struct pullup_field * f;
+    struct pullup_field * f;
 
     free( c->buffers );
 
-	f = c->head;
-	do
+    f = c->head->next;
+    while( f != c->head )
     {
-		free( f->diffs );
-		free( f->comb );
-		f = f->next;
-		free( f->prev );
-	}
-    while( f != c->head );
+        free( f->diffs );
+        free( f->comb );
+        f = f->next;
+        free( f->prev );
+    }
+    free( f->diffs );
+    free( f->comb );
+    free(f);
 
     free( c->frame );
-	free( c );
+    free( c );
 }
 
 /*
@@ -590,71 +593,71 @@ void pullup_free_context( struct pullup_context * c )
 static void pullup_alloc_buffer( struct pullup_context * c,
                                  struct pullup_buffer * b )
 {
-	int i;
-	if( b->planes ) return;
-	b->planes = calloc( c->nplanes, sizeof(unsigned char *) );
-	for ( i = 0; i < c->nplanes; i++ )
+    int i;
+    if( b->planes ) return;
+    b->planes = calloc( c->nplanes, sizeof(unsigned char *) );
+    for ( i = 0; i < c->nplanes; i++ )
     {
-		b->planes[i] = malloc(c->h[i]*c->stride[i]);
-		/* Deal with idiotic 128=0 for chroma: */
-		memset( b->planes[i], c->background[i], c->h[i]*c->stride[i] );
-	}
+        b->planes[i] = malloc(c->h[i]*c->stride[i]);
+        /* Deal with idiotic 128=0 for chroma: */
+        memset( b->planes[i], c->background[i], c->h[i]*c->stride[i] );
+    }
 }
 
 struct pullup_buffer * pullup_lock_buffer( struct pullup_buffer * b,
                                            int parity )
 {
-	if( !b ) return 0;
-	if( (parity+1) & 1 ) b->lock[0]++;
-	if( (parity+1) & 2 ) b->lock[1]++;
+    if( !b ) return 0;
+    if( (parity+1) & 1 ) b->lock[0]++;
+    if( (parity+1) & 2 ) b->lock[1]++;
 
-	return b;
+    return b;
 }
 
 void pullup_release_buffer( struct pullup_buffer * b,
                             int parity )
 {
-	if( !b ) return;
-	if( (parity+1) & 1 ) b->lock[0]--;
-	if( (parity+1) & 2 ) b->lock[1]--;
+    if( !b ) return;
+    if( (parity+1) & 1 ) b->lock[0]--;
+    if( (parity+1) & 2 ) b->lock[1]--;
 }
 
 struct pullup_buffer * pullup_get_buffer( struct pullup_context * c,
                                           int parity )
 {
-	int i;
+    int i;
 
-	/* Try first to get the sister buffer for the previous field */
-	if( parity < 2 &&
+    /* Try first to get the sister buffer for the previous field */
+    if( parity < 2 &&
         c->last &&
         parity != c->last->parity &&
-	    !c->last->buffer->lock[parity])
+        !c->last->buffer->lock[parity])
     {
-		pullup_alloc_buffer( c, c->last->buffer );
-		return pullup_lock_buffer( c->last->buffer, parity );
-	}
+        pullup_alloc_buffer( c, c->last->buffer );
+        return pullup_lock_buffer( c->last->buffer, parity );
+    }
 
-	/* Prefer a buffer with both fields open */
-	for( i = 0; i < c->nbuffers; i++ )
+    /* Prefer a buffer with both fields open */
+    for( i = 0; i < c->nbuffers; i++ )
     {
-		if( c->buffers[i].lock[0] ) continue;
-		if( c->buffers[i].lock[1] ) continue;
-		pullup_alloc_buffer( c, &c->buffers[i] );
-		return pullup_lock_buffer( &c->buffers[i], parity );
-	}
+        if( c->buffers[i].lock[0] ) continue;
+        if( c->buffers[i].lock[1] ) continue;
+        pullup_alloc_buffer( c, &c->buffers[i] );
+        return pullup_lock_buffer( &c->buffers[i], parity );
+    }
 
-	if( parity == 2 ) return 0;
+    if( parity == 2 ) return 0;
 
-	/* Search for any half-free buffer */
-	for( i = 0; i < c->nbuffers; i++ )
+    /* Search for any half-free buffer */
+    for( i = 0; i < c->nbuffers; i++ )
     {
-		if( ((parity+1) & 1) && c->buffers[i].lock[0] ) continue;
-		if( ((parity+1) & 2) && c->buffers[i].lock[1] ) continue;
-		pullup_alloc_buffer( c, &c->buffers[i] );
-		return pullup_lock_buffer( &c->buffers[i], parity );
-	}
+        if( ((parity+1) & 1) && c->buffers[i].lock[0] ) continue;
+        if( ((parity+1) & 2) && c->buffers[i].lock[1] ) continue;
+        pullup_alloc_buffer( c, &c->buffers[i] );
+        return pullup_lock_buffer( &c->buffers[i], parity );
+    }
 
-	return 0;
+    return 0;
 }
 
 /*
@@ -665,92 +668,92 @@ struct pullup_buffer * pullup_get_buffer( struct pullup_context * c,
 
 struct pullup_frame * pullup_get_frame( struct pullup_context * c )
 {
-	int i;
-	struct pullup_frame * fr = c->frame;
-	int n = pullup_decide_frame_length( c );
-	int aff = c->first->next->affinity;
+    int i;
+    struct pullup_frame * fr = c->frame;
+    int n = pullup_decide_frame_length( c );
+    int aff = c->first->next->affinity;
 
-	if ( !n ) return 0;
-	if ( fr->lock ) return 0;
+    if ( !n ) return 0;
+    if ( fr->lock ) return 0;
 
-	if ( c->verbose )
+    if ( c->verbose )
     {
-		pullup_print_aff_and_breaks(c, c->first);
-		printf("duration: %d    \n", n);
-	}
-
-	fr->lock++;
-	fr->length = n;
-	fr->parity = c->first->parity;
-	fr->buffer = 0;
-	for( i = 0; i < n; i++ )
+        pullup_print_aff_and_breaks(c, c->first);
+        printf("duration: %d    \n", n);
+    }
+
+    fr->lock++;
+    fr->length = n;
+    fr->parity = c->first->parity;
+    fr->buffer = 0;
+    for( i = 0; i < n; i++ )
     {
-		/* We cheat and steal the buffer without release+relock */
-		fr->ifields[i] = c->first->buffer;
-		c->first->buffer = 0;
-		c->first = c->first->next;
-	}
+        /* We cheat and steal the buffer without release+relock */
+        fr->ifields[i] = c->first->buffer;
+        c->first->buffer = 0;
+        c->first = c->first->next;
+    }
 
-	if( n == 1 )
+    if( n == 1 )
     {
-		fr->ofields[fr->parity] = fr->ifields[0];
-		fr->ofields[fr->parity^1] = 0;
-	}
+        fr->ofields[fr->parity] = fr->ifields[0];
+        fr->ofields[fr->parity^1] = 0;
+    }
     else if( n == 2 )
     {
-		fr->ofields[fr->parity] = fr->ifields[0];
-		fr->ofields[fr->parity^1] = fr->ifields[1];
-	}
+        fr->ofields[fr->parity] = fr->ifields[0];
+        fr->ofields[fr->parity^1] = fr->ifields[1];
+    }
     else if( n == 3 )
     {
-		if( aff == 0 )
+        if( aff == 0 )
         {
-			aff = (fr->ifields[0] == fr->ifields[1]) ? -1 : 1;
+            aff = (fr->ifields[0] == fr->ifields[1]) ? -1 : 1;
         }
-		fr->ofields[fr->parity]   = fr->ifields[1+aff];
-		fr->ofields[fr->parity^1] = fr->ifields[1];
-	}
-	pullup_lock_buffer( fr->ofields[0], 0 );
-	pullup_lock_buffer( fr->ofields[1], 1 );
+        fr->ofields[fr->parity]   = fr->ifields[1+aff];
+        fr->ofields[fr->parity^1] = fr->ifields[1];
+    }
+    pullup_lock_buffer( fr->ofields[0], 0 );
+    pullup_lock_buffer( fr->ofields[1], 1 );
 
-	if( fr->ofields[0] == fr->ofields[1] )
+    if( fr->ofields[0] == fr->ofields[1] )
     {
-		fr->buffer = fr->ofields[0];
-		pullup_lock_buffer(fr->buffer, 2);
-		return fr;
-	}
-	return fr;
+        fr->buffer = fr->ofields[0];
+        pullup_lock_buffer(fr->buffer, 2);
+        return fr;
+    }
+    return fr;
 }
 
 void pullup_pack_frame( struct pullup_context * c, struct pullup_frame * fr)
 {
-	int i;
-	if (fr->buffer) return;
-	if (fr->length < 2) return; /* FIXME: deal with this */
-	for( i = 0; i < 2; i++ )
-	{
-		if( fr->ofields[i]->lock[i^1] ) continue;
-		fr->buffer = fr->ofields[i];
-		pullup_lock_buffer(fr->buffer, 2);
-		pullup_copy_field( c, fr->buffer, fr->ofields[i^1], i^1 );
-		return;
-	}
-	fr->buffer = pullup_get_buffer( c, 2 );
-	pullup_copy_field( c, fr->buffer, fr->ofields[0], 0 );
-	pullup_copy_field( c, fr->buffer, fr->ofields[1], 1 );
+    int i;
+    if (fr->buffer) return;
+    if (fr->length < 2) return; /* FIXME: deal with this */
+    for( i = 0; i < 2; i++ )
+    {
+        if( fr->ofields[i]->lock[i^1] ) continue;
+        fr->buffer = fr->ofields[i];
+        pullup_lock_buffer(fr->buffer, 2);
+        pullup_copy_field( c, fr->buffer, fr->ofields[i^1], i^1 );
+        return;
+    }
+    fr->buffer = pullup_get_buffer( c, 2 );
+    pullup_copy_field( c, fr->buffer, fr->ofields[0], 0 );
+    pullup_copy_field( c, fr->buffer, fr->ofields[1], 1 );
 }
 
 void pullup_release_frame( struct pullup_frame * fr )
 {
-	int i;
-	for( i = 0; i < fr->length; i++ )
+    int i;
+    for( i = 0; i < fr->length; i++ )
     {
-		pullup_release_buffer( fr->ifields[i], fr->parity ^ (i&1) );
+        pullup_release_buffer( fr->ifields[i], fr->parity ^ (i&1) );
     }
-	pullup_release_buffer( fr->ofields[0], 0 );
-	pullup_release_buffer( fr->ofields[1], 1 );
-	if (fr->buffer) pullup_release_buffer( fr->buffer, 2 );
-	fr->lock--;
+    pullup_release_buffer( fr->ofields[0], 0 );
+    pullup_release_buffer( fr->ofields[1], 1 );
+    if (fr->buffer) pullup_release_buffer( fr->buffer, 2 );
+    fr->lock--;
 }
 
 /*
@@ -763,44 +766,44 @@ void pullup_submit_field( struct pullup_context * c,
                           struct pullup_buffer * b,
                           int parity )
 {
-	struct pullup_field * f;
+    struct pullup_field * f;
 
-	/* Grow the circular list if needed */
-	pullup_check_field_queue( c );
+    /* Grow the circular list if needed */
+    pullup_check_field_queue( c );
 
-	/* Cannot have two fields of same parity in a row; drop the new one */
-	if( c->last && c->last->parity == parity ) return;
+    /* Cannot have two fields of same parity in a row; drop the new one */
+    if( c->last && c->last->parity == parity ) return;
 
-	f = c->head;
-	f->parity = parity;
-	f->buffer = pullup_lock_buffer( b, parity );
-	f->flags = 0;
-	f->breaks = 0;
-	f->affinity = 0;
+    f = c->head;
+    f->parity = parity;
+    f->buffer = pullup_lock_buffer( b, parity );
+    f->flags = 0;
+    f->breaks = 0;
+    f->affinity = 0;
 
-	pullup_compute_metric( c, f, parity, f->prev->prev,
+    pullup_compute_metric( c, f, parity, f->prev->prev,
                            parity, c->diff, f->diffs );
-	pullup_compute_metric( c, parity?f->prev:f, 0,
+    pullup_compute_metric( c, parity?f->prev:f, 0,
                            parity?f:f->prev, 1, c->comb, f->comb );
-	pullup_compute_metric( c, f, parity, f,
+    pullup_compute_metric( c, f, parity, f,
                            -1, c->var, f->var );
 
-	/* Advance the circular list */
-	if( !c->first ) c->first = c->head;
-	c->last = c->head;
-	c->head = c->head->next;
+    /* Advance the circular list */
+    if( !c->first ) c->first = c->head;
+    c->last = c->head;
+    c->head = c->head->next;
 }
 
 void pullup_flush_fields( struct pullup_context * c )
 {
-	struct pullup_field * f;
+    struct pullup_field * f;
 
-	for( f = c->first; f && f != c->head; f = f->next )
+    for( f = c->first; f && f != c->head; f = f->next )
     {
-		pullup_release_buffer( f->buffer, f->parity );
-		f->buffer = 0;
-	}
-	c->first = c->last = 0;
+        pullup_release_buffer( f->buffer, f->parity );
+        f->buffer = 0;
+    }
+    c->first = c->last = 0;
 }
 
 /*
@@ -827,8 +830,7 @@ hb_filter_private_t * hb_detelecine_init( int pix_fmt,
     pv->width[1]  = pv->width[2] = width >> 1;
     pv->height[1] = pv->height[2] = height >> 1;
 
-    int buf_size = 3 * width * height / 2;
-    pv->buf_out = hb_buffer_init( buf_size );
+    pv->buf_out = hb_video_buffer_init( width, height );
 
     struct pullup_context * ctx;
     pv->pullup_ctx = ctx = pullup_alloc_context();
@@ -837,17 +839,19 @@ hb_filter_private_t * hb_detelecine_init( int pix_fmt,
     ctx->junk_top  = ctx->junk_bottom = 4;
     ctx->strict_breaks = -1;
     ctx->metric_plane  = 0;
-
+    ctx->parity = -1;
+    
     if( settings )
     {
-		sscanf( settings, "%d:%d:%d:%d:%d:%d",
+        sscanf( settings, "%d:%d:%d:%d:%d:%d:%d",
                 &ctx->junk_left,
                 &ctx->junk_right,
                 &ctx->junk_top,
                 &ctx->junk_bottom,
                 &ctx->strict_breaks,
-                &ctx->metric_plane );
-	}
+                &ctx->metric_plane,
+                &ctx->parity );
+    }
 
     ctx->format = PULLUP_FMT_Y;
     ctx->nplanes = 4;
@@ -920,9 +924,9 @@ int hb_detelecine_work( const hb_buffer_t * buf_in,
         return FILTER_FAILED;
     }
 
-	struct pullup_context * ctx = pv->pullup_ctx;
-	struct pullup_buffer  * buf;
-	struct pullup_frame   * frame;
+    struct pullup_context * ctx = pv->pullup_ctx;
+    struct pullup_buffer  * buf;
+    struct pullup_frame   * frame;
 
     buf = pullup_get_buffer( ctx, 2 );
     if( !buf )
@@ -946,22 +950,35 @@ int hb_detelecine_work( const hb_buffer_t * buf_in,
     memcpy( buf->planes[2], pv->pic_in.data[2],
             pv->width[2] * pv->height[2] * sizeof(uint8_t) );
 
-    /* Submit buffer fields based on buffer flags */
+    /* Submit buffer fields based on buffer flags.
+       Detelecine assumes BFF when the TFF flag isn't present. */
     int parity = 1;
     if( buf_in->flags & PIC_FLAG_TOP_FIELD_FIRST )
     {
+        /* Source signals TFF */
+        parity = 0;
+    }
+    else if( ctx->parity == 0 )
+    {
+        /* Many non-MPEG-2 sources lack parity flags even though
+           they are TFF, so this allow users to override. */
         parity = 0;
     }
-	pullup_submit_field( ctx, buf, parity );
-	pullup_submit_field( ctx, buf, parity^1 );
+    if( ctx->parity == 1 )
+    {
+        /* Override autodetected parity with BFF */
+        parity = 1;
+    }
+    pullup_submit_field( ctx, buf, parity );
+    pullup_submit_field( ctx, buf, parity^1 );
     if( buf_in->flags & PIC_FLAG_REPEAT_FIRST_FIELD )
     {
         pullup_submit_field( ctx, buf, parity );
     }
-	pullup_release_buffer( buf, 2 );
+    pullup_release_buffer( buf, 2 );
 
     /* Get frame and check if pullup is ready */
-	frame = pullup_get_frame( ctx );
+    frame = pullup_get_frame( ctx );
     if( !frame )
     {
         if( pv->pullup_fakecount )
@@ -981,18 +998,18 @@ int hb_detelecine_work( const hb_buffer_t * buf_in,
     /* Check to see if frame should be dropped */
     if( frame->length < 2 )
     {
-		pullup_release_frame( frame );
-		frame = pullup_get_frame( ctx );
+        pullup_release_frame( frame );
+        frame = pullup_get_frame( ctx );
 
-		if (!frame)
+        if (!frame)
         {
             goto discard_frame;
         }
-		if( frame->length < 2 )
+        if( frame->length < 2 )
         {
-			pullup_release_frame( frame );
+            pullup_release_frame( frame );
 
-			if( !(buf_in->flags & PIC_FLAG_REPEAT_FIRST_FIELD) )
+            if( !(buf_in->flags & PIC_FLAG_REPEAT_FIRST_FIELD) )
             {
                 goto discard_frame;
             }
@@ -1003,12 +1020,12 @@ int hb_detelecine_work( const hb_buffer_t * buf_in,
             {
                 goto discard_frame;
             }
-			if( frame->length < 2 )
+            if( frame->length < 2 )
             {
-				pullup_release_frame( frame );
+                pullup_release_frame( frame );
                 goto discard_frame;
-			}
-		}
+            }
+        }
     }
 
     /* Check to see if frame buffer is ready for export */