avformat-cvs build fix and audio filter correction

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

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index aba87afffb7462ac2939eaf13de7c47c13e243ed..37bf55a2c9b06a17b2df2e9c3aa10d523b718d26 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -7,20 +7,32 @@ OBJS = factory.o \
           producer_avformat.o \
           consumer_avformat.o \
           filter_avcolour_space.o \
-          filter_avdeinterlace.o \
           filter_avresample.o
 
+ifdef MMX_FLAGS
+       OBJS += filter_avdeinterlace.o
+endif
+
 CFLAGS+=-I../..
 
-LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS)
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS+=-L../../framework
+
+ifdef LOCAL_FFMPEG 
+       LDFLAGS+=-lmltavformat -lmltavcodec $(EXTRA_LIBS) -lmlt
+else
+       LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS) -lmlt
+endif
 
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)
 
 $(TARGET): $(OBJS)
-               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg all ; fi
+               if [ $(LOCAL_FFMPEG) ] ; then \
+                       $(MAKE) -C ffmpeg all ; \
+                       cp -f ffmpeg/libavcodec/libavcodec.so ../../framework/libmltavcodec.so ; \
+                       cp -f ffmpeg/libavformat/libavformat.so ../../framework/libmltavformat.so ; \
+               fi
                $(CC) -shared -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
@@ -32,11 +44,15 @@ dist-clean: clean
                rm -f .depend
 
 clean: 
-               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
+               #if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
                rm -f $(OBJS) $(TARGET) 
 
 install: all
                install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+               if [ $(LOCAL_FFMPEG) ] ; then \
+                       install -m 755 ../../framework/libmltavcodec.so "$(prefix)/share/mlt/modules" ; \
+                       install -m 755 ../../framework/libmltavformat.so "$(prefix)/share/mlt/modules" ; \
+               fi
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index e60ff280a0299d4aa49503ceb8057a94f9c3f977..722b7f5dede6b9ed1bb643b29999b4ba6f7cfb75 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -40,11 +40,10 @@ else
 
        if [ "$cvs_ffmpeg" != "" ]
        then
-               [ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "10/11/2004 20:30 CET" ffmpeg
-               [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure )
+               [ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
+               [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared )
                #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
                echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec" >> config.mak
-               echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec" >> config.mak
                echo "LOCAL_FFMPEG=1" >> config.mak
                extra_libs="$extra_libs -lz"
        elif [ "$static_ffmpeg" != "" ]

diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 3247532e44ab62ead833ea1c8adb292235853fbb..49d6b93dc3b0d45cd6f442600e9b6c322f517245 100644 (file)
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -104,8 +104,10 @@ void *mlt_create_filter( char *id, void *arg )
        avformat_init( );
        if ( !strcmp( id, "avcolour_space" ) )
                return filter_avcolour_space_init( arg );
+#ifdef USE_MMX
        if ( !strcmp( id, "avdeinterlace" ) )
                return filter_avdeinterlace_init( arg );
+#endif
        if ( !strcmp( id, "avresample" ) )
                return filter_avresample_init( arg );
        return NULL;

diff --git a/src/modules/avformat/filter_avresample.c b/src/modules/avformat/filter_avresample.c
index 4ed2abafab404ebcbad6a4d4c000d1017fa087e4..a79d453c051ad7123afb29fdf1c5a22a572fd5aa 100644 (file)
--- a/src/modules/avformat/filter_avresample.c
+++ b/src/modules/avformat/filter_avresample.c
@@ -150,7 +150,7 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
        // Only call this if we have a means to get audio
-       if ( mlt_frame_is_test_audio( frame ) != 0 )
+       if ( mlt_frame_is_test_audio( frame ) == 0 )
        {
                // Push the filter on to the stack
                mlt_frame_push_audio( frame, this );

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index be7fefd9613771597503a62214b5af3af0f15af3..c0ec6de2fbfdcc07e788f708d8673eeb517cb3ae 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -9,9 +9,8 @@ OBJS = factory.o \
           pixops.o \
           filter_rescale.o
 
-ifeq ($(MMX_FLAGS),-DUSE_MMX)
-ASM_OBJS = have_mmx.o \
-                  scale_line_22_yuv_mmx.o
+ifdef ($(MMX_FLAGS))
+ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o
 endif
 
 CFLAGS += `pkg-config gtk+-2.0 --cflags` `pkg-config gdk-pixbuf-2.0 --cflags` `pkg-config pangoft2 --cflags` -I../..

diff --git a/src/modules/jackrack/filter_jackrack.c b/src/modules/jackrack/filter_jackrack.c
index a8803c82aaea851621d1f98ed034edb1a64c025d..101bab0c3da6d3285dad8dcd517a458730ff7749 100644 (file)
--- a/src/modules/jackrack/filter_jackrack.c
+++ b/src/modules/jackrack/filter_jackrack.c
@@ -34,7 +34,7 @@
 
 #include "ui.h"
 
-#define BUFFER_LEN 2048 * 3
+#define BUFFER_LEN 204800 * 3
 
 static void *jackrack_thread( void *arg )
 {
@@ -258,46 +258,46 @@ static int jackrack_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        
        // Process the audio
        int16_t *q = *buffer;
-       float sample;
+       float sample[ 2 ][ 10000 ];
        int i, j;
+       struct timespec tm = { 0, 0 };
 
        // Convert to floats and write into output ringbuffer
        if ( jack_ringbuffer_write_space( output_buffers[0] ) >= ( *samples * sizeof(float) ) )
        {
                for ( i = 0; i < *samples; i++ )
                        for ( j = 0; j < *channels; j++ )
-                       {
-                               sample = ( float )( *q ++ ) / 32768.0;
-                               jack_ringbuffer_write( output_buffers[j], ( char * )&sample, sizeof(float) );
-                       }
+                               sample[ j ][ i ] = ( float )( *q ++ ) / 32768.0;
+
+               for ( j = 0; j < *channels; j++ )
+                       jack_ringbuffer_write( output_buffers[j], ( char * )sample[ j ], *samples * sizeof(float) );
        }
 
        // Synchronization phase - wait for signal from Jack process
-       while ( mlt_properties_get_int( filter_properties, "_sync" )
-                   && jack_ringbuffer_read_space( input_buffers[ *channels - 1 ] ) < ( *samples * sizeof(float) ) )
-               pthread_cond_wait( output_ready, output_lock );
+       while ( jack_ringbuffer_read_space( input_buffers[ *channels - 1 ] ) < ( *samples * sizeof(float) ) ) ;
+               //pthread_cond_wait( output_ready, output_lock );
                
        // Read from input ringbuffer and convert from floats
-       //if ( jack_ringbuffer_read_space( input_buffers[0] ) >= ( *samples * sizeof(float) ) )
+       if ( jack_ringbuffer_read_space( input_buffers[0] ) >= ( *samples * sizeof(float) ) )
        {
                // Initialise to silence, but repeat last frame if available in case of 
                // buffer underrun
-               sample = 0;
+               for ( j = 0; j < *channels; j++ )
+                       jack_ringbuffer_read( input_buffers[j], ( char * )sample[ j ], *samples * sizeof(float) );
+
                q = *buffer;
                for ( i = 0; i < *samples; i++ )
                        for ( j = 0; j < *channels; j++ )
                        {
-                               jack_ringbuffer_read( input_buffers[j], ( char * )&sample, sizeof(float) );
-       
-                               if ( sample > 1.0 )
-                                       sample = 1.0;
-                               else if ( sample < -1.0 )
-                                       sample = -1.0;
+                               if ( sample[ j ][ i ] > 1.0 )
+                                       sample[ j ][ i ] = 1.0;
+                               else if ( sample[ j ][ i ] < -1.0 )
+                                       sample[ j ][ i ] = -1.0;
                        
-                               if ( sample > 0 )
-                                       *q ++ = 32767 * sample;
+                               if ( sample[ j ][ i ] > 0 )
+                                       *q ++ = 32767 * sample[ j ][ i ];
                                else
-                                       *q ++ = 32768 * sample;
+                                       *q ++ = 32768 * sample[ j ][ i ];
                        }
        }
 
@@ -310,7 +310,6 @@ static int jackrack_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
-       if ( mlt_frame_is_test_audio( frame ) != 0 )
        {
                mlt_properties properties = MLT_FILTER_PROPERTIES( this );
                mlt_frame_push_audio( frame, this );

diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c
index 8a1eed875304439ae157eb2d00ba5a807a6e0856..ca8e3d3bcfbca372aade793fbe145d26af3b899b 100644 (file)
--- a/src/modules/sox/filter_sox.c
+++ b/src/modules/sox/filter_sox.c
@@ -334,7 +334,7 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format
 
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
-       if ( mlt_frame_is_test_audio( frame ) != 0 )
+       if ( mlt_frame_is_test_audio( frame ) == 0 )
        {
                // Add the filter to the frame
                mlt_frame_push_audio( frame, this );