From c1317c9067169b4c6605029f4d41fe5e548b6b55 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Wed, 20 Feb 2013 20:44:41 -0800 Subject: [PATCH] Cleanup some logging from work in opengl branch. --- src/modules/opengl/consumer_xgl.c | 9 +-------- src/modules/opengl/filter_glsl_manager.cpp | 10 +--------- src/modules/opengl/filter_movit_convert.cpp | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/modules/opengl/consumer_xgl.c b/src/modules/opengl/consumer_xgl.c index 6eae9f1d..49230d55 100644 --- a/src/modules/opengl/consumer_xgl.c +++ b/src/modules/opengl/consumer_xgl.c @@ -36,7 +36,6 @@ #include #include #include -#include #include @@ -178,8 +177,6 @@ static void update() static void show_frame() { -// fprintf(stderr,"show_frame threadID : %ld\n", syscall(SYS_gettid)); - if ( (fb.width != new_frame.width) || (fb.height != new_frame.height) ) { glDeleteFramebuffers( 1, &fb.fbo ); glDeleteTextures( 1, &fb.texture ); @@ -255,7 +252,7 @@ void* video_thread( void *arg ) next = mlt_consumer_rt_frame( consumer ); if ( !mlt_properties_get_int( MLT_FILTER_PROPERTIES( glsl_manager ), "glsl_supported" ) ) { - fprintf( stderr, "OpenGL Shading Language is not supported on this machine.\n" ); + mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "OpenGL Shading Language is not supported on this machine.\n" ); xgl->running = 0; break; } @@ -414,8 +411,6 @@ static void createGLWindow() XGetGeometry( GLWin.dpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, &GLWin.width, &GLWin.height, &borderDummy, &GLWin.depth ); - fprintf(stderr, "Direct Rendering: %s\n",glXIsDirect( GLWin.dpy, GLWin.ctx ) ? "true" : "false" ); - // Verify GLSL works on this machine hiddenctx.ctx = glXCreateContext( GLWin.dpy, vi, GLWin.ctx, GL_TRUE ); if ( hiddenctx.ctx ) { @@ -527,7 +522,6 @@ void start_xgl( consumer_xgl consumer ) static void on_consumer_thread_started( mlt_properties owner, HiddenContext* context ) { - fprintf(stderr, "%s: %ld\n", __FUNCTION__, syscall(SYS_gettid)); // Initialize this thread's OpenGL state glXMakeCurrent( context->dpy, context->win, context->ctx ); mlt_events_fire( MLT_FILTER_PROPERTIES(glsl_manager), "init glsl", NULL ); @@ -550,7 +544,6 @@ static void *consumer_thread( void * ); mlt_consumer consumer_xgl_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { - fprintf(stderr, "consumer_xgl_init\n"); // Create the consumer object consumer_xgl this = calloc( sizeof( struct consumer_xgl_s ), 1 ); diff --git a/src/modules/opengl/filter_glsl_manager.cpp b/src/modules/opengl/filter_glsl_manager.cpp index e8947108..34c638a2 100644 --- a/src/modules/opengl/filter_glsl_manager.cpp +++ b/src/modules/opengl/filter_glsl_manager.cpp @@ -30,14 +30,6 @@ extern "C" { #include } -#ifdef WIN32 -#define SYS_gettid (224) -#define syscall(X) (((X == SYS_gettid) && GetCurrentThreadId()) || 0) -#else -#include -#include -#endif - void deleteManager(GlslManager *p) { delete p; @@ -177,7 +169,7 @@ glsl_pbo GlslManager::get_pbo(int size) void GlslManager::onInit( mlt_properties owner, GlslManager* filter ) { - mlt_log_verbose( filter->get_service(), "%s: %d\n", __FUNCTION__, syscall(SYS_gettid) ); + mlt_log_debug( filter->get_service(), "%s: %d\n", __FUNCTION__ ); #ifdef WIN32 std::string path = std::string(mlt_environment("MLT_APPDIR")).append("\\share\\movit"); #elif defined(__DARWIN__) && defined(RELOCATABLE) diff --git a/src/modules/opengl/filter_movit_convert.cpp b/src/modules/opengl/filter_movit_convert.cpp index 12c75dad..baf8bef7 100644 --- a/src/modules/opengl/filter_movit_convert.cpp +++ b/src/modules/opengl/filter_movit_convert.cpp @@ -67,7 +67,7 @@ static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *fo mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); - mlt_log_verbose( NULL, "filter_movit_convert: %s -> %s\n", + mlt_log_debug( NULL, "filter_movit_convert: %s -> %s\n", mlt_image_format_name( *format ), mlt_image_format_name( output_format ) ); // Use CPU if glsl not initialized or not supported. -- 2.39.2