From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 27 Dec 2004 21:27:29 +0000 (+0000)
Subject: fix aspect ratios in producer_libdv
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=427b602b441536159d491930d5f28b41bb896664;p=melted

fix aspect ratios in producer_libdv
tweak fezzik priorities
minor fixes to setenv and demo/consumers.ini


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@580 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/demo/consumers.ini b/demo/consumers.ini
index 44651a2..32db723 100644
--- a/demo/consumers.ini
+++ b/demo/consumers.ini
@@ -8,5 +8,5 @@ MainConcept DV to /dev/dv1394	mcdv:/dev/dv1394 rescale=nearest buffer=25
 libdv to /dev/dv1394			libdv:/dev/dv1394 rescale=nearest buffer=25
 BlueFish444 PAL					bluefish:1
 BlueFish444 NTSC				bluefish:1 standard=NTSC
-BlueFish444 PAL Prog LL			bluefish:1 progressive=1 buffer=1 n_frames=4
+BlueFish444 PAL Prog LL			bluefish:1 progressive=1 buffer=1 frames=4
 BlueFish444 NTSC Prog LL		bluefish:1 standard=NTSC progressive=1 buffer=1 frames=4
diff --git a/docs/services.txt b/docs/services.txt
index 5b9d4af..f5565a3 100644
--- a/docs/services.txt
+++ b/docs/services.txt
@@ -3,7 +3,7 @@ Service Documentation
 Copyright (C) 2004 Ushodaya Enterprises Limited
 Authors: Charles Yates <charles.yates@pandora.be>
          Dan Dennedy <dan@dennedy.org>
-Last Revision: 2004-03-20
+Last Revision: 2004-11-07
 
 
 SERVICES
@@ -1421,8 +1421,7 @@ Consumers
 	        double volume - audio level factor
 	        int video_off - if 1, disable video output
 	        int audio_off - if 1, disable audio output
-	        int scale_overlay - if 1, resample video from source pixel aspect
-	                            ratio to square pixels.
+			int resize - TODO
 	        int progressive - indicates whether to use progressive or field-
 	                          based rendering, default 0 (off).
 		int audio_buffer - size of the sdl audio buffer (default: 1024)
diff --git a/setenv b/setenv
index 23eac17..41e0ed7 100644
--- a/setenv
+++ b/setenv
@@ -8,10 +8,11 @@ export LD_LIBRARY_PATH=\
 `pwd`/src/valerie:\
 `pwd`/src/miracle:\
 `pwd`/src/modules/bluefish:\
-`pwd`/../bluefish/lib:\
+`pwd`/../BlueLinuxDriver/install/lib:\
 `pwd`/../mpeg_sdk_release/bin:\
 `pwd`/../dvcpro_sdk_release/lib:\
-`pwd`/../sr_sdk_release
+`pwd`/../sr_sdk_release:\
+$LD_LIBRARY_PATH
 
 export PATH=\
 `pwd`/src/albino:\
@@ -19,4 +20,3 @@ export PATH=\
 `pwd`/src/humperdink:\
 `pwd`/src/miracle:\
 $PATH
-
diff --git a/setenv_mc b/setenv_mc
index 7b015e5..705d4e2 100644
--- a/setenv_mc
+++ b/setenv_mc
@@ -4,5 +4,6 @@
 export LD_LIBRARY_PATH=\
 `pwd`/../mpeg_sdk_release/bin:\
 `pwd`/../dvcpro_sdk_release/lib:\
-`pwd`/../sr_sdk_release/lib
+`pwd`/../sr_sdk_release/lib:\
+$LD_LIBRARY_PATH
 
diff --git a/src/modules/dv/producer_libdv.c b/src/modules/dv/producer_libdv.c
index ae96846..0faa05a 100644
--- a/src/modules/dv/producer_libdv.c
+++ b/src/modules/dv/producer_libdv.c
@@ -236,7 +236,7 @@ static int producer_collect_info( producer_libdv this )
 			// Parse the header for meta info
 			dv_parse_header( dv_decoder, dv_data );
 			mlt_properties_set_double( properties, "aspect_ratio", 
-				dv_format_wide( dv_decoder ) ? ( this->is_pal ? 512.0/351.0 : 96.0/79.0 ) : ( this->is_pal ? 128.0/117.0 : 72.0/79.0 ) );
+				dv_format_wide( dv_decoder ) ? ( this->is_pal ? 118.0/81.0 : 40.0/33.0 ) : ( this->is_pal ? 59.0/54.0 : 10.0/11.0 ) );
 
 			// Return the decoder
 			dv_decoder_return( dv_decoder );
@@ -421,7 +421,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		dv_parse_header( dv_decoder, data );
 		//mlt_properties_set_int( properties, "progressive", dv_is_progressive( dv_decoder ) );
 		mlt_properties_set_double( properties, "aspect_ratio", 
-			dv_format_wide( dv_decoder ) ? ( this->is_pal ? 512.0/351.0 : 96.0/79.0 ) : ( this->is_pal ? 128.0/117.0 : 72.0/79.0 ) );
+			dv_format_wide( dv_decoder ) ? ( this->is_pal ? 118.0/81.0 : 40.0/33.0 ) : ( this->is_pal ? 59.0/54.0 : 10.0/11.0 ) );
 
 		// Hmm - register audio callback
 		( *frame )->get_audio = producer_get_audio;
diff --git a/src/modules/fezzik.dict b/src/modules/fezzik.dict
index 8e98b38..a3d9e66 100644
--- a/src/modules/fezzik.dict
+++ b/src/modules/fezzik.dict
@@ -4,7 +4,7 @@ http://*=avformat
 *.inigo=inigo_file
 *.asf=avformat
 *.avi=avformat
-*.dv=mcdv,libdv,avformat
+*.dv=mcdv,avformat,libdv
 *.dif=mcdv,libdv
 *.gif=pixbuf
 *.jpg=pixbuf
diff --git a/src/modules/fezzik.ini b/src/modules/fezzik.ini
index 0e20bab..c3d7fcc 100644
--- a/src/modules/fezzik.ini
+++ b/src/modules/fezzik.ini
@@ -9,5 +9,5 @@
 deinterlace=deinterlace,avdeinterlace
 rescaler=mcrescale,gtkrescale,rescale
 resizer=resize
-resampler=soxresample,avresample,resample
+resampler=resample,soxresample,avresample
 data=data_feed:attr_check