diff options
Diffstat (limited to 'src/post')
-rw-r--r-- | src/post/deinterlace/deinterlace.c | 29 | ||||
-rw-r--r-- | src/post/goom/xine_goom.c | 11 | ||||
-rw-r--r-- | src/post/mosaico/mosaico.c | 40 | ||||
-rw-r--r-- | src/post/mosaico/switch.c | 24 |
4 files changed, 44 insertions, 60 deletions
diff --git a/src/post/deinterlace/deinterlace.c b/src/post/deinterlace/deinterlace.c index afd0093f1..df7d0e65c 100644 --- a/src/post/deinterlace/deinterlace.c +++ b/src/post/deinterlace/deinterlace.c @@ -24,9 +24,14 @@ #include <stdio.h> #include <stdlib.h> -#include "deinterlace.h" +#define LOG_MODULE "deinterlace" +#define LOG_VERBOSE +/* +#define LOG +*/ -/*#define LOG*/ +#include "deinterlace.h" +#include "xine_internal.h" typedef struct methodlist_item_s methodlist_item_t; @@ -109,22 +114,16 @@ void filter_deinterlace_methods( int accel, int fields_available ) if( (cur->method->accelrequired & accel) != cur->method->accelrequired ) { /* This method is no good, drop it from the list. */ -#ifdef LOG - printf( "deinterlace: %s disabled: required " - "CPU accelleration features unavailable.\n", - cur->method->short_name ); -#endif - drop = 1; + lprintf( "%s disabled: required CPU accelleration features unavailable.\n", + cur->method->short_name ); + drop = 1; } if( cur->method->fields_required > fields_available ) { /* This method is no good, drop it from the list. */ -#ifdef LOG - printf( "deinterlace: %s disabled: requires " - "%d field buffers, only %d available.\n", - cur->method->short_name, cur->method->fields_required, - fields_available ); -#endif - drop = 1; + lprintf( "%s disabled: requires %d field buffers, only %d available.\n", + cur->method->short_name, cur->method->fields_required, + fields_available ); + drop = 1; } if( drop ) { diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index 0bf8305a5..b0cfee656 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_goom.c,v 1.43 2003/11/26 19:30:14 mroi Exp $ + * $Id: xine_goom.c,v 1.44 2003/11/26 19:43:37 f1rmb Exp $ * * GOOM post plugin. * @@ -28,10 +28,11 @@ #include <stdio.h> -/********** logging **********/ #define LOG_MODULE "goom" -/* #define LOG_VERBOSE */ -/* #define LOG */ +#define LOG_VERBOSE +/* +#define LOG +*/ #include "config.h" #include "xine_internal.h" @@ -261,7 +262,7 @@ static post_plugin_t *goom_open_plugin(post_class_t *class_gen, int inputs, this->metronom = _x_metronom_init(1, 0, class->xine); - lprintf("goom: goom_open_plugin\n"); + lprintf("goom_open_plugin\n"); if(xine_config_lookup_entry(class->xine, "post.goom_fps", &fps_entry)) diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index 4118670c7..377069b03 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.c @@ -17,13 +17,19 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: mosaico.c,v 1.17 2003/11/11 18:44:59 f1rmb Exp $ + * $Id: mosaico.c,v 1.18 2003/11/26 19:43:37 f1rmb Exp $ */ /* * simple video mosaico plugin */ +#define LOG_MODULE "mosaico" +#define LOG_VERBOSE +/* +#define LOG +*/ + #include "xine_internal.h" #include "post.h" @@ -35,10 +41,6 @@ #define DEFAULT_H (150) #define MAXPIP (5) -/* -#define LOG -*/ - /* plugin class initialization function */ static void *mosaico_init_plugin(xine_t *xine, void *); @@ -194,9 +196,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, if(inputs < 2) return NULL; -#ifdef LOG - printf("mosaico open\n"); -#endif + lprintf("mosaico open\n"); if (!this || !input1 || !output || !video_target || !video_target[0]) { free(this); @@ -393,9 +393,7 @@ static void frame_copy_content(vo_frame_t *to, vo_frame_t *from) { int size; if((to == NULL)||(from == NULL)) { -#ifdef LOG - printf("Something wrong in frame_copy_content\n"); -#endif + lprintf("Something wrong in frame_copy_content\n"); return; } @@ -456,18 +454,14 @@ static int _mosaico_draw_2(vo_frame_t *frame, post_mosaico_out_t *output, int co pthread_mutex_lock(&output->mut2); if((output->saved_frame_2[cont] == NULL)&&(frame == NULL)) { -#ifdef LOG - printf("frame_2 NULL\n"); -#endif + lprintf("frame_2 NULL\n"); pthread_mutex_unlock(&output->mut1); pthread_mutex_unlock(&output->mut2); return 0; } if(output->saved_frame == NULL) { -#ifdef LOG - printf("saved frame NULL\n"); -#endif + lprintf("saved frame NULL\n"); pthread_mutex_unlock(&output->mut1); pthread_mutex_unlock(&output->mut2); return 0; @@ -508,9 +502,7 @@ static int _mosaico_draw_2(vo_frame_t *frame, post_mosaico_out_t *output, int co switch (output->saved_frame_2[ciclo-1]->format) { case XINE_IMGFMT_YUY2: -#ifdef LOG - printf("not supported\n"); -#endif + lprintf("not supported\n"); /*size = new_frame->pitches[0] * new_frame->height; for (i = 0; i < size; i++) new_frame->base[0][i] = frame->base[0][i];*/ @@ -584,9 +576,7 @@ static int mosaico_draw(vo_frame_t *frame, xine_stream_t *stream) return skip; } -#ifdef LOG - printf("ERROR!! oh oh\n\n"); -#endif + lprintf("ERROR!! oh oh\n\n"); return 0; } @@ -604,9 +594,7 @@ static int mosaico_draw_2(vo_frame_t *frame, xine_stream_t *stream) while(in != NULL) { pt = in->data; if(pt == frame->port) { -#ifdef LOG - /*printf("trovato %d\n", i);*/ -#endif + lprintf("trovato %d\n", i); break; } in = xine_list_next_content(port->post->input); diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index 86dd7dece..3c31c9178 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.c @@ -17,22 +17,24 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: switch.c,v 1.9 2003/11/11 18:44:59 f1rmb Exp $ + * $Id: switch.c,v 1.10 2003/11/26 19:43:37 f1rmb Exp $ */ /* * simple switch video post plugin */ +#define LOG_MODULE "switch" +#define LOG_VERBOSE +/* +#define LOG +*/ + #include "xine_internal.h" #include "post.h" #define SWVERSION (5) -/* -#define LOG -*/ - /* plugin class initialization function */ static void *switch_init_plugin(xine_t *xine, void *); @@ -143,9 +145,7 @@ static post_plugin_t *switch_open_plugin(post_class_t *class_gen, int inputs, if(inputs < 2) return NULL; -#ifdef LOG - printf("switch open\n"); -#endif + lprintf("switch open\n"); if (!this || !input1 || !output || !video_target || !video_target[0]) { free(this); @@ -340,16 +340,12 @@ static void frame_copy_content(vo_frame_t *to, vo_frame_t *from) { int size; if((to == NULL)||(from == NULL)) { -#ifdef LOG - printf("Something wrong in frame_copy_content\n"); -#endif + lprintf("Something wrong in frame_copy_content\n"); return; } if(to->format != from->format) { -#ifdef LOG - printf("frame_copy_content : buffers have different format\n"); -#endif + lprintf("frame_copy_content : buffers have different format\n"); return; } |