File libdv-cvsfixes.patch of Package libdv

Overview Repositories Revisions Requests Users Attributes Meta

File libdv-cvsfixes.patch of Package libdv (Revision 44146fc61bcc8e973de91152d783feeb)

Currently displaying revision 44146fc61bcc8e973de91152d783feeb , Show latest

--- libdv-0.104/ChangeLog	2004-11-30 02:44:55.000000000 +0100
+++ libdv-2006-01-15/ChangeLog	2006-01-15 22:23:15.000000000 +0100
@@ -1,3 +1,29 @@
+2006-01-15  Dan Dennedy <dan@dennedy.org>
+	* encode.c: apply patch from Burkhard Plaum to use gcc
+	  destructor attribute to invoke dv_cleanup() when unloading
+	  libdv after loading dynamically and thereby fixing a
+	  memory leak.
+	  
+	* playdv.c: bugfix segfault on exit due to dv_display_exit()
+	  being called twice: once in main() and second in atexit
+	  handler created by dv_display. Thanks for hint provided
+	  by Jean-Francois Panisset.
+
+2005-01-31  Dan Dennedy <dan@dennedy.org>
+	* *.S: apply patch from Nicholas Miell <nmiell@gmail.com>
+	  to not require execution stack for assembler functions.
+
+2004-12-20  Dan Dennedy <dan@dennedy.org>
+	* vlc.h, mmx.h: apply patch from Daniel Kobras to improve
+	  compile compatibillity by making extern inlinei, static inline..
+
+2004-12-12  Dan Dennedy <dan@dennedy.org>
+	* *_x86_64.S: apply patch from Dean Kolosiek to fix linker
+	  compatibility.
+	
+2004-11-29  Charles "Buck" Krasic  <krasic@acm.org>
+	* libdv 0.104 release
+
 2004-11-29  Dan Dennedy <dan@dennedy.org>
 	* libdv.pc: added -lm to make build more portable.
 
--- libdv-0.104/libdv/dct_block_mmx.S	2003-10-20 21:46:49.000000000 +0200
+++ libdv-2006-01-15/libdv/dct_block_mmx.S	2005-01-31 14:27:54.000000000 +0100
@@ -53,6 +53,8 @@
 scratch3:       .quad 0
 scratch4:       .quad 0
 
+.section .note.GNU-stack, "", @progbits
+
 .text
 
 .align 8	
--- libdv-0.104/libdv/dct_block_mmx_x86_64.S	2004-10-20 05:49:24.000000000 +0200
+++ libdv-2006-01-15/libdv/dct_block_mmx_x86_64.S	2005-01-31 14:27:54.000000000 +0100
@@ -53,6 +53,8 @@
 scratch3:       .quad 0
 scratch4:       .quad 0
 
+.section .note.GNU-stack, "", @progbits
+
 .text
 
 .align 8	
--- libdv-0.104/libdv/encode.c	2004-11-17 04:36:30.000000000 +0100
+++ libdv-2006-01-15/libdv/encode.c	2006-01-15 22:10:29.000000000 +0100
@@ -1581,6 +1581,19 @@
   }
 } /* dv_encoder_free */
 
+/** @brief call dv_cleanup() automatically
+ *
+ * This function calls dv_cleanup() automatically before a dynamic
+ * libdv is unloaded.
+ * This fixes potential memory leaks when repeatedly loading 
+ * and unloading libdv.
+ */
+
+static void do_free() __attribute__ ((destructor));
+
+static void do_free() {
+  dv_cleanup();
+} /* do_free */
 
 /** @brief Free the dynamically allocated global memory.
  *
--- libdv-0.104/libdv/encode_x86.S	2003-10-20 21:46:50.000000000 +0200
+++ libdv-2006-01-15/libdv/encode_x86.S	2005-01-31 14:27:54.000000000 +0100
@@ -27,6 +27,9 @@
 ALLONE:		.word 1,1,1,1
 VLCADDMASK:	.byte 255,0,0,0,255,0,0,0
 		
+
+.section .note.GNU-stack, "", @progbits
+
 .text
 
 .global _dv_vlc_encode_block_mmx
--- libdv-0.104/libdv/encode_x86_64.S	2004-11-17 04:36:30.000000000 +0100
+++ libdv-2006-01-15/libdv/encode_x86_64.S	2005-01-31 14:27:54.000000000 +0100
@@ -27,6 +27,8 @@
 ALLONE:		.word 1,1,1,1
 VLCADDMASK:	.byte 255,0,0,0,255,0,0,0
 		
+.section .note.GNU-stack, "", @progbits
+
 .text
 
 .global _dv_vlc_encode_block_mmx_x86_64
@@ -47,7 +49,8 @@
 
 	mov	$63, %rcx                        # loop counter
 
-	mov	vlc_encode_lookup(%rip), %r11
+	mov	vlc_encode_lookup@GOTPCREL(%rip), %r11
+	mov	(%r11),%r11
 
 	pxor	%mm0, %mm0
 	pxor	%mm2, %mm2
@@ -129,7 +132,8 @@
 	add	$2, %rdi           /* skip the DC coefficient */
 	mov	$63, %rcx
 
-	mov	vlc_num_bits_lookup(%rip), %r11
+	mov	vlc_num_bits_lookup@GOTPCREL(%rip), %r11
+	mov	(%r11),%r11
 	
 vlc_num_bits_block_x86_loop:
 	movw	(%rdi), %ax        /* get the next coeffiecient */
--- libdv-0.104/libdv/idct_block_mmx.S	2003-01-01 00:04:02.000000000 +0100
+++ libdv-2006-01-15/libdv/idct_block_mmx.S	2005-01-31 14:27:54.000000000 +0100
@@ -6,7 +6,7 @@
  * (element[0][0] of the matrix)
  */
 
-
+.section .note.GNU-stack, "", @progbits
 
 .text
 	.align 4
--- libdv-0.104/libdv/idct_block_mmx_x86_64.S	2004-10-20 05:49:24.000000000 +0200
+++ libdv-2006-01-15/libdv/idct_block_mmx_x86_64.S	2005-01-31 14:27:54.000000000 +0100
@@ -13,6 +13,7 @@
 /* If we're using MMX assembler, fold weights into the iDCT
    prescale here instead of  _dv_weight_init */
 
+.section .note.GNU-stack, "", @progbits
 
 .text
 	.align 4
@@ -22,7 +23,7 @@
 /* void _dv_idct_88(dv_coeff_t *block) */
 	/* argument block=rdi */
 	
-	lea	 preSC(%rip), %r11
+	mov	 preSC@GOTPCREL(%rip), %r11
 
 /* 
  *	column 0: even part
--- libdv-0.104/libdv/mmx.h	2001-10-28 04:23:57.000000000 +0100
+++ libdv-2006-01-15/libdv/mmx.h	2004-12-21 06:08:03.000000000 +0100
@@ -59,7 +59,7 @@
 
 /*	Function to test if multimedia instructions are supported...
 */
-inline extern int
+inline static int
 mm_support(void)
 {
 	/* Returns 1 if MMX instructions are supported,
@@ -223,7 +223,7 @@
 
 /*	Function to test if mmx instructions are supported...
 */
-inline extern int
+inline static int
 mmx_ok(void)
 {
 	/* Returns 1 if MMX instructions are supported, 0 otherwise */
--- libdv-0.104/libdv/quant_x86.S	2003-10-20 21:46:50.000000000 +0200
+++ libdv-2006-01-15/libdv/quant_x86.S	2005-01-31 14:27:54.000000000 +0100
@@ -24,6 +24,8 @@
  *  The libdv homepage is http://libdv.sourceforge.net/.  
  */
 
+.section .note.GNU-stack, "", @progbits
+.previous
 
 /*
 
--- libdv-0.104/libdv/quant_x86_64.S	2004-11-17 04:36:30.000000000 +0100
+++ libdv-2006-01-15/libdv/quant_x86_64.S	2005-01-31 14:27:54.000000000 +0100
@@ -24,6 +24,8 @@
  *  The libdv homepage is http://libdv.sourceforge.net/.  
  */
 
+.section .note.GNU-stack, "", @progbits
+.previous
 
 /*
 
@@ -73,10 +75,10 @@
 	/*  pq = dv_quant_shifts[qno + dv_quant_offset[class]]; */
 	mov	%rsi,%rax	/* qno */
 	mov	%rdx,%r12	/* class */
-	lea	dv_quant_offset(%rip),%rcx
+	mov	dv_quant_offset@GOTPCREL(%rip),%rcx
 	movzbq	(%rcx,%r12,1),%rcx   /* dv_quant_offset[class] */
 	add	%rcx,%rax                       /* qno + */
-	lea	dv_quant_shifts(%rip),%r11
+	mov	dv_quant_shifts@GOTPCREL(%rip),%r11
 	lea	(%r11,%rax,4),%r11	/* r11 is pq = dv_quant_shifts[...] */
 
 	/* extra = (class == 3); */
@@ -217,10 +219,10 @@
 	mov	%rsi,%rax	/* qno */
 	mov	%rdx,%r12	/* class */
 
-	lea	dv_quant_offset(%rip),%rcx
+	mov	dv_quant_offset@GOTPCREL(%rip),%rcx
 	movzbq	(%rcx,%r12,1),%rcx
 	add	%rcx,%rax
-	lea	dv_quant_shifts(%rip),%r11
+	mov	dv_quant_shifts@GOTPCREL(%rip),%r11
 	lea	(%r11,%rax,4),%r11	/* r11 is pq */
 
 	/* extra = (class == 3); */
--- libdv-0.104/libdv/rgbtoyuv.S	2003-10-20 21:46:50.000000000 +0200
+++ libdv-2006-01-15/libdv/rgbtoyuv.S	2005-01-31 14:27:54.000000000 +0100
@@ -111,6 +111,8 @@
 	
 #endif	
 	
+.section .note.GNU-stack, "", @progbits
+
 .text
 
 #define _inPtr     8
--- libdv-0.104/libdv/rgbtoyuv_x86_64.S	2004-10-20 05:49:24.000000000 +0200
+++ libdv-2006-01-15/libdv/rgbtoyuv_x86_64.S	2005-01-31 14:27:54.000000000 +0100
@@ -111,6 +111,8 @@
 	
 #endif	
 	
+.section .note.GNU-stack, "", @progbits
+
 .text
 
 #define _inPtr     8
Only in libdv-2006-01-15/libdv: testdct.c
--- libdv-0.104/libdv/transpose_x86.S	2003-01-01 00:04:03.000000000 +0100
+++ libdv-2006-01-15/libdv/transpose_x86.S	2005-01-31 14:27:54.000000000 +0100
@@ -1,3 +1,5 @@
+.section .note.GNU-stack, "", @progbits
+
 .text
 .global _dv_transpose_mmx
 	
--- libdv-0.104/libdv/transpose_x86_64.S	2004-10-20 05:49:24.000000000 +0200
+++ libdv-2006-01-15/libdv/transpose_x86_64.S	2005-01-31 14:27:54.000000000 +0100
@@ -1,3 +1,5 @@
+.section .note.GNU-stack, "", @progbits
+
 .text
 .global _dv_transpose_mmx_x86_64
 	
--- libdv-0.104/libdv/vlc.h	2003-10-20 21:46:50.000000000 +0200
+++ libdv-2006-01-15/libdv/vlc.h	2004-12-21 06:08:04.000000000 +0100
@@ -69,7 +69,7 @@
 extern void dv_decode_vlc(int bits,int maxbits, dv_vlc_t *result);
 extern void __dv_decode_vlc(int bits, dv_vlc_t *result);
 
-extern __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
+static inline void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
   if(maxbits < 16)
     dv_decode_vlc(bitstream_show(bs,16),maxbits,result);
   else
--- libdv-0.104/libdv/vlc_x86.S	2002-05-20 14:31:25.000000000 +0200
+++ libdv-2006-01-15/libdv/vlc_x86.S	2005-01-31 14:27:54.000000000 +0100
@@ -1,4 +1,6 @@
 	#include "asmoff.h"
+.section .note.GNU-stack, "", @progbits
+
 .text
 	.align 4
 .globl dv_decode_vlc 
--- libdv-0.104/libdv/vlc_x86_64.S	2004-10-20 05:49:24.000000000 +0200
+++ libdv-2006-01-15/libdv/vlc_x86_64.S	2005-01-31 14:27:54.000000000 +0100
@@ -1,4 +1,6 @@
 	#include "asmoff.h"
+.section .note.GNU-stack, "", @progbits
+
 .text
 	.align 4
 .globl dv_decode_vlc
@@ -16,28 +18,28 @@
 	/* klass = dv_vlc_classes[maxbits][(bits & (dv_vlc_class_index_mask[maxbits])) >> */
 	/*         (dv_vlc_class_index_rshift[maxbits])];  */
 /*	xor  %rbp,%rbp */
-	lea  dv_vlc_class_index_mask(%rip),%r11            /* use %rip for PIC code */
+	mov  dv_vlc_class_index_mask@GOTPCREL(%rip),%r11    /* use %rip for PIC code */
  	mov  (%r11,%rbx,4),%ebp           /* int32 */      /* dv_vlc_class_index_mask[maxbits] */
 	and  %eax,%ebp                                     /* bits & */
-	lea  dv_vlc_class_index_rshift(%rip),%rcx
+	mov  dv_vlc_class_index_rshift@GOTPCREL(%rip),%rcx
 	mov  (%rcx,%rbx,4),%ecx           /* int32 */      /* dv_vlc_class_index_rshift[maxbits] */
 	sar  %cl,%ebp                                      /* >> */
-	lea  dv_vlc_classes(%rip),%rcx
+	mov  dv_vlc_classes@GOTPCREL(%rip),%rcx
 	mov  (%rcx,%rbx,8),%rcx           /* ptr */        /* dv_vlc_classes[maxbits], a pointer */
 	movsbq  (%rcx,%rbp,1),%rbp        /* int8 */       /* klass = */
 
 	/* *result = dv_vlc_lookups[klass][(bits & (dv_vlc_index_mask[klass])) >> */
 	/*           (dv_vlc_index_rshift[klass])];   */
 /*	xor  %rbx,%rbx */
-	lea  dv_vlc_index_mask(%rip),%r11
+	mov  dv_vlc_index_mask@GOTPCREL(%rip),%r11
 	mov  (%r11,%rbp,4),%ebx          /* int32 */       /* (dv_vlc_index_mask[klass]) */
 /*	xor  %rcx,%rcx */
-	lea  dv_vlc_index_rshift(%rip),%r11
+	mov  dv_vlc_index_rshift@GOTPCREL(%rip),%r11
 	mov  (%r11,%rbp,4),%ecx          /* int32 */       /* dv_vlc_index_rshift[klass] */
 	and  %eax,%ebx                                     /* bits &  */
 	sar  %cl,%ebx                                      /* >> */
 
-	lea  dv_vlc_lookups(%rip),%r11
+	mov  dv_vlc_lookups@GOTPCREL(%rip),%r11
 	mov  (%r11,%rbp,8),%rbp          /* ptr */         /* dv_vlc_lookups[klass] */
 	mov  (%rbp,%rbx,4),%ebp          /* int32 */       /* *result = */
 
@@ -57,7 +59,7 @@
 	mov  %ebp,%ecx
 	sar  $8,%ecx
 	and  $0xff,%ecx                /* result->len */
-	lea  sign_mask(%rip),%rbx
+	mov  sign_mask@GOTPCREL(%rip),%rbx
 	mov  (%rbx,%rcx,4),%ebx        /* int32 */
 	and  %ebx,%eax
 	neg  %eax
@@ -109,17 +111,17 @@
 	mov  %rax,%rbp
 	and  $0xfe00,%ebp
 	sar  $9,%ebp
-	lea  dv_vlc_class_lookup5(%rip),%r11
+	mov  dv_vlc_class_lookup5@GOTPCREL(%rip),%r11
 	movsbq  (%r11,%rbp),%rbp        /* int8 klass */
 
-	lea  dv_vlc_index_mask(%rip),%rbx
+	mov  dv_vlc_index_mask@GOTPCREL(%rip),%rbx
 	mov  (%rbx,%rbp,4),%ebx         /* int32 */
-	lea  dv_vlc_index_rshift(%rip),%rcx
+	mov  dv_vlc_index_rshift@GOTPCREL(%rip),%rcx
 	mov  (%rcx,%rbp,4),%ecx         /* int32 */
 	and  %eax,%ebx
 	sar  %cl,%ebx			/* %rbx is klass */
 
-	lea  dv_vlc_lookups(%rip),%r11
+	mov  dv_vlc_lookups@GOTPCREL(%rip),%r11
 	mov  (%r11,%rbp,8),%rbp         /* ptr */
 	mov  (%rbp,%rbx,4),%ebp         /* int32 */
 
@@ -138,7 +140,7 @@
 	mov  %ebp,%ecx
 	sar  $8,%ecx
 	and  $0xff,%ecx
-	lea  sign_mask(%rip),%r11
+	mov  sign_mask@GOTPCREL(%rip),%r11
 	mov  (%r11,%rcx,4),%ecx        /* int32 */
 	and  %ecx,%eax
 	neg  %eax
@@ -253,7 +255,7 @@
 
 	/* Attempt to use the shortcut first.  If it hits, then
 	   this vlc term has been decoded. */
-	lea	dv_vlc_class1_shortcut(%rip),%r10
+	mov	dv_vlc_class1_shortcut@GOTPCREL(%rip),%r10
 	mov	(%r10,%rcx,4),%r11d    /* record32 dv_vlc_tab_t */
 	test	$0x80,%r11d
 	
@@ -267,17 +269,17 @@
 
 	/* %rax is bits */
 	
-	lea  dv_vlc_class_lookup5(%rip),%r10
+	mov  dv_vlc_class_lookup5@GOTPCREL(%rip),%r10
 	movsbq  (%r10,%rcx,1),%rcx     /* int8 */
 
 /*	xor  %r12,%r12 */
-	lea  dv_vlc_index_mask(%rip),%r10
+	mov  dv_vlc_index_mask@GOTPCREL(%rip),%r10
 	mov  (%r10,%rcx,4),%r12d       /* int32 */
 	
-	lea  dv_vlc_lookups(%rip),%r10
+	mov  dv_vlc_lookups@GOTPCREL(%rip),%r10
 	mov  (%r10,%rcx,8),%r11       /* ptr->record32 */
 	
-	lea  dv_vlc_index_rshift(%rip),%r10
+	mov  dv_vlc_index_rshift@GOTPCREL(%rip),%r10
 	mov  (%r10,%rcx,4),%ecx        /* int32 */
 	
 	and  %eax,%r12d
@@ -303,7 +305,7 @@
 	mov  %r11d,%ecx
 	sar  $8,%ecx
 	and  $0xff,%ecx
-	lea  sign_mask(%rip),%r10
+	mov  sign_mask@GOTPCREL(%rip),%r10
 	mov  (%r10,%rcx,4),%ecx      /* int32 */
 	and  %ecx,%eax
 	neg  %eax
@@ -388,7 +390,8 @@
 	mov	%r11,%rsi        /* bits */
 	mov	%rax,%rdi        /* bits_left */
 	lea	vlc(%rip),%rdx   /* *vlc */
-	call	dv_decode_vlc
+	mov	dv_decode_vlc@GOTPCREL(%rip),%r11
+	call	*%r11
 	pop	%rdx
 	pop	%rsi
 	pop	%rdi
@@ -473,7 +476,7 @@
 	movl	%r11d,dv_macroblock_t_eob_count(%r13) /* int32 */
 
 	/* mb->i = (seg->i + dv_super_map_vertical[m]) % (seg->isPAL?12:10); */
-	lea	dv_super_map_vertical(%rip),%r11
+	mov	dv_super_map_vertical@GOTPCREL(%rip),%r11
 	movl	(%r11,%rax,4),%r11d                     /* int32 */
 /*	xor	%rcx,%rcx */
 	movl	dv_videosegment_t_i(%r12),%ecx          /* int32 */
@@ -493,7 +496,7 @@
 	movl	%r11d,dv_macroblock_t_i(%r13)         /* int32 */
 
 	/*  mb->j = dv_super_map_horizontal[m]; */		
-	lea	dv_super_map_horizontal(%rip),%r11
+	mov	dv_super_map_horizontal@GOTPCREL(%rip),%r11
 	movl	(%r11,%rax,4),%r11d                   /* int32 */
 	movl	%r11d,dv_macroblock_t_j(%r13)         /* int32 */
 
@@ -546,7 +549,8 @@
 
 	/* bl->reorder = &dv_reorder[bl->dct_mode][1]; */
 	shl	$6,%rax                          /* *64 */
-	lea	(dv_reorder+1)(%rip),%rcx
+	mov	dv_reorder@GOTPCREL(%rip),%rcx
+	add	$1,%rcx
 	add	%rcx,%rax
 	mov	%rax,dv_block_t_reorder(%r15)    /* ptr */
 
@@ -557,13 +561,13 @@
 	/* bl->offset= mb_start + dv_parse_bit_start[b]; */
 /*	xor	%rcx,%rcx */
 	movl	mb_start(%rip),%ecx             /* int32 */
-	lea	dv_parse_bit_start(%rip),%rax
+	mov	dv_parse_bit_start@GOTPCREL(%rip),%rax
 	mov	(%rax,%r12,4),%eax              /* int32 */
 	add	%rcx,%rax
 	movl	%eax,dv_block_t_offset(%r15)    /* int32 */
 
 	/* bl->end= mb_start + dv_parse_bit_end[b]; */
-	lea	dv_parse_bit_end(%rip),%rax
+	mov	dv_parse_bit_end@GOTPCREL(%rip),%rax
 	mov	(%rax,%r12,4),%eax            /* int32 */
 	add	%ecx,%eax
 	mov	%eax,dv_block_t_end(%r15)     /* int32 */
@@ -603,7 +607,8 @@
 	mov	dv_videosegment_t_bs(%rdi),%rdi   /* passed in rdi was seg, now passing seg->bs */
 	mov	%r13,%rsi                         /* mb */
 	mov	%r15,%rdx                         /* bl */
-	call	dv_parse_ac_coeffs_pass0
+	mov     dv_parse_ac_coeffs_pass0@GOTPCREL(%rip),%r11
+	call	*%r11
 	pop	%rdi
 	pop	%rsi
 	pop	%rdx
@@ -635,10 +640,12 @@
 	mov	%rsi,%rax	            /* quality */
 	and	$DV_QUALITY_AC_MASK,%rax
 	cmp	$DV_QUALITY_AC_2,%rax
+
+	jne	done
+	mov	dv_parse_ac_coeffs@GOTPCREL(%rip),%r11
+	jmp	*%r11
 	
-	jz	dv_parse_ac_coeffs
-	
-	mov	$0,%rax
+done:	mov	$0,%rax
 	
 	ret
 
--- libdv-0.104/playdv/playdv.c	2003-11-23 23:59:08.000000000 +0100
+++ libdv-2006-01-15/playdv/playdv.c	2006-01-15 22:23:15.000000000 +0100
@@ -511,9 +511,6 @@
   if(!dv_player->arg_disable_video) {
     dv_display_exit(dv_player->display);
   } /* if */
-  if(!dv_player->arg_disable_audio) {
-    dv_oss_close(dv_player->oss);
-  } /* if  */
   dv_decoder_free(dv_player->decoder);
   free(dv_player);
   exit(0);

Places

File libdv-cvsfixes.patch of Package libdv (Revision 44146fc61bcc8e973de91152d783feeb)

Places