From: Daniel Caujolle-B. <f1...@us...> - 2003-11-26 19:43:40
|
Update of /cvsroot/xine/xine-lib/src/libxinevdec In directory sc8-pr-cvs1:/tmp/cvs-serv12593/src/libxinevdec Modified Files: image.c yuv_frames.c Log Message: lprintf cleanup, pass I. Index: image.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/image.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- image.c 16 Nov 2003 23:33:48 -0000 1.9 +++ image.c 26 Nov 2003 19:43:37 -0000 1.10 @@ -32,15 +32,17 @@ #include <png.h> +#define LOG_MODULE "image_video_decoder" +#define LOG_VERBOSE +/* +#define LOG +*/ + #include "xine_internal.h" #include "bswap.h" #include "video_out.h" #include "buffer.h" -/* -#define LOG -*/ - typedef struct { video_decoder_class_t decoder_class; @@ -141,9 +143,7 @@ int i; image_decoder_t *this = png_get_progressive_ptr(png_ptr); -#ifdef LOG - printf("image: png info cb\n"); -#endif + lprintf("png info cb\n"); png_get_IHDR(png_ptr, info_ptr, &this->width, &this->height, &this->bit_depth, &this->color_type, &this->interlace_type, &this->compression_type, &this->filter_type); @@ -221,9 +221,7 @@ image_decoder_t *this = png_get_progressive_ptr(png_ptr); finalize_png_reader(this); -#ifdef LOG - printf("image: png end cb\n"); -#endif + lprintf("png end cb\n"); if (this->rows_valid) { img = this->stream->video_out->get_frame (this->stream->video_out, this->width, @@ -286,15 +284,12 @@ } } if (!this->video_open) { -#ifdef LOG - printf("image: opening video\n"); -#endif + lprintf("opening video\n"); this->stream->video_out->open(this->stream->video_out, this->stream); this->video_open = 1; } -#ifdef LOG - printf("image: have to decode data\n"); -#endif + + lprintf("have to decode data\n"); this->pts = buf->pts; if (process_data(this, buf->content, buf->size) < 0) @@ -336,16 +331,13 @@ image_decoder_t *this = (image_decoder_t *) this_gen; if (this->video_open) { -#ifdef LOG - printf("image: closing video\n"); -#endif + lprintf("closing video\n"); + this->stream->video_out->close(this->stream->video_out, this->stream); this->video_open = 0; } -#ifdef LOG - printf("image: closed\n"); -#endif + lprintf("closed\n"); free (this); } @@ -356,9 +348,7 @@ image_class_t *cls = (image_class_t *) class_gen; image_decoder_t *this; -#ifdef LOG - printf("image: opened\n"); -#endif + lprintf("opened\n"); this = (image_decoder_t *) xine_xmalloc (sizeof (image_decoder_t)); @@ -396,9 +386,7 @@ static void dispose_class (video_decoder_class_t *this_gen) { image_class_t *this = (image_class_t *) this_gen; -#ifdef LOG - printf("image: class closed\n"); -#endif + lprintf("class closed\n"); free (this); } @@ -419,9 +407,7 @@ * initialisation of privates */ -#ifdef LOG - printf("image: class opened\n"); -#endif + lprintf("class opened\n"); return this; } Index: yuv_frames.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libxinevdec/yuv_frames.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yuv_frames.c 23 Oct 2003 20:12:34 -0000 1.6 +++ yuv_frames.c 26 Nov 2003 19:43:37 -0000 1.7 @@ -30,14 +30,16 @@ #include <fcntl.h> #include <unistd.h> -#include "xine_internal.h" -#include "video_out.h" -#include "buffer.h" - +#define LOG_MODULE "yuv_frame_video_decoder" +#define LOG_VERBOSE /* #define LOG */ +#include "xine_internal.h" +#include "video_out.h" +#include "buffer.h" + typedef struct { video_decoder_class_t decoder_class; } mpeg2_class_t; @@ -54,9 +56,7 @@ int frame_size; vo_frame_t *img; -#ifdef LOG - printf ("yuv_frames: decode_data, flags=0x%08x ...\n", buf->decoder_flags); -#endif + lprintf ("decode_data, flags=0x%08x ...\n", buf->decoder_flags); img = this->stream->video_out->get_frame (this->stream->video_out, buf->decoder_info[0], @@ -77,17 +77,13 @@ img->draw (img, this->stream); img->free (img); -#ifdef LOG - printf ("yuv_frames: decode_data...done\n"); -#endif + lprintf ("decode_data...done\n"); } static void yuv_frames_flush (video_decoder_t *this_gen) { /* yuv_frames_decoder_t *this = (yuv_frames_decoder_t *) this_gen; */ -#ifdef LOG - printf ("yuv_frames: flush\n"); -#endif + lprintf ("flush\n"); } static void yuv_frames_reset (video_decoder_t *this_gen) { @@ -102,9 +98,7 @@ yuv_frames_decoder_t *this = (yuv_frames_decoder_t *) this_gen; -#ifdef LOG - printf ("yuv_frames: close\n"); -#endif + lprintf ("close\n"); this->stream->video_out->close(this->stream->video_out, this->stream); |