echo "LIBDL=-ldl"
echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
- echo "CFLAGS+=-Wall \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
+ echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
) > config.mak
echo "#!/bin/sh" > mlt-config
mlt_pool.o \
mlt_tokeniser.o
+INCS = mlt_consumer.h \
+ mlt_factory.h \
+ mlt_filter.h \
+ mlt.h \
+ mlt_multitrack.h \
+ mlt_pool.h \
+ mlt_properties.h \
+ mlt_repository.h \
+ mlt_tractor.h \
+ mlt_types.h \
+ mlt_deque.h \
+ mlt_field.h \
+ mlt_frame.h \
+ mlt_playlist.h \
+ mlt_producer.h \
+ mlt_property.h \
+ mlt_service.h \
+ mlt_transition.h \
+ mlt_tokeniser.h
+
SRCS := $(OBJS:.o=.c)
CFLAGS += -rdynamic -DPREFIX="\"$(prefix)\""
install:
install -m 755 $(TARGET) $(prefix)/lib/libmlt.so
install -d "$(prefix)/include/mlt/framework"
- install -m 644 mlt_consumer.h \
- mlt_factory.h \
- mlt_filter.h \
- mlt.h \
- mlt_multitrack.h \
- mlt_pool.h \
- mlt_properties.h \
- mlt_repository.h \
- mlt_tractor.h \
- mlt_types.h \
- mlt_deque.h \
- mlt_field.h \
- mlt_frame.h \
- mlt_playlist.h \
- mlt_producer.h \
- mlt_property.h \
- mlt_service.h \
- mlt_transition.h \
- mlt_tokeniser.h \
- "$(prefix)/include/mlt/framework"
+ install -m 644 $(INCS) "$(prefix)/include/mlt/framework"
ifneq ($(wildcard .depend),)
include .depend
return 0;
}
-unsigned char *mlt_frame_get_waveform( mlt_frame this, double fps, int w, int h )
+unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h )
{
int16_t *pcm = NULL;
mlt_properties properties = mlt_frame_properties( this );
mlt_audio_format format = mlt_audio_pcm;
int frequency = 32000; // lower frequency available?
int channels = 2;
+ double fps = mlt_properties_get_double( properties, "fps" );
int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) );
// Get the pcm data
extern int mlt_frame_get_image( mlt_frame self, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable );
extern uint8_t *mlt_frame_get_alpha_mask( mlt_frame self );
extern int mlt_frame_get_audio( mlt_frame self, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples );
-extern unsigned char *mlt_frame_get_waveform( mlt_frame self, double fps, int w, int h );
+extern unsigned char *mlt_frame_get_waveform( mlt_frame self, int w, int h );
extern int mlt_frame_push_get_image( mlt_frame self, mlt_get_image get_image );
extern mlt_get_image mlt_frame_pop_get_image( mlt_frame self );
extern int mlt_frame_push_frame( mlt_frame self, mlt_frame that );
if ( hide )
xmlNewProp( track, "hide", hide == 1 ? "video" : ( hide == 2 ? "audio" : "both" ) );
}
+ serialise_producer_filters( context, service, child );
}
}
}
}
}
+
+ serialise_producer_filters( context, service, child );
}
else if ( strcmp( (const char*) node->name, "tractor" ) != 0 )
{
// Recurse on connected producer
serialise_service( context, mlt_service_producer( service ), child );
+ serialise_producer_filters( context, service, child );
}
}
valerie_remote.o \
valerie_socket.o
+INCS = valerie.h \
+ valerie_notifier.h \
+ valerie_parser.h \
+ valerie_remote.h \
+ valerie_response.h \
+ valerie_socket.h \
+ valerie_status.h \
+ valerie_tokeniser.h \
+ valerie_util.h
+
SRCS := $(OBJS:.o=.c)
LDFLAGS += -lpthread
install: all
install -m 755 $(TARGET) $(prefix)/lib/libvalerie.so
mkdir -p "$(prefix)/include/mlt/valerie"
- install -m 644 \
- valerie.h \
- valerie_notifier.h \
- valerie_parser.h \
- valerie_remote.h \
- valerie_response.h \
- valerie_socket.h \
- valerie_status.h \
- valerie_tokeniser.h \
- valerie_util.h \
- "$(prefix)/include/mlt/valerie"
+ install -m 644 $(INCS) "$(prefix)/include/mlt/valerie"
ifneq ($(wildcard .depend),)
include .depend