diff options
author | Mike Melanson <mike@multimedia.cx> | 2003-02-27 01:15:50 +0000 |
---|---|---|
committer | Mike Melanson <mike@multimedia.cx> | 2003-02-27 01:15:50 +0000 |
commit | d5881f74b9871b86a761c2d15b405725071ebb14 (patch) | |
tree | 6825bbca5a691dfc2404c82e64d7a6985dbcb2ce | |
parent | 2b1bc840db82a78eb38bf13f570c98b4f8f50f2a (diff) | |
download | xine-lib-d5881f74b9871b86a761c2d15b405725071ebb14.tar.gz xine-lib-d5881f74b9871b86a761c2d15b405725071ebb14.tar.bz2 |
we do not allow '//' comments in native xine code (and it breaks
compilation, too)
CVS patchset: 4295
CVS date: 2003/02/27 01:15:50
-rw-r--r-- | src/post/mosaico/mosaico.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index bf4b03634..a9c7e479b 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.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: mosaico.c,v 1.1 2003/02/26 18:26:40 skaboy Exp $ + * $Id: mosaico.c,v 1.2 2003/02/27 01:15:50 tmmm Exp $ */ /* @@ -62,7 +62,7 @@ struct post_mosaico_out_s { vo_frame_t *saved_frame_2[MAXPIP]; pthread_mutex_t mut1, mut2; mosaico_stream_t info[MAXPIP]; - //pthread_key_t key; +/* //pthread_key_t key;*/ unsigned int pip; }; @@ -148,10 +148,12 @@ static void *mosaico_init_plugin(xine_t *xine, void *data) config_values_t *cfg; int i; char string[255]; +/* //add config entry management //post.mosaico_input_0_xywh //background //post.mosaico_input_[1..MAX]_(x, y, w, h) //little screen - +*/ + if (!this) return NULL; @@ -207,7 +209,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, this->input = xine_list_new(); this->output = xine_list_new(); - //background +/* //background*/ port = post_intercept_video_port(this, video_target[0]); port->port.open = mosaico_open; port->port.get_frame = mosaico_get_frame; @@ -223,7 +225,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, output->pip = inputs-1; xine_list_append_content(this->output, output); - //init mutex +/* //init mutex*/ pthread_mutex_init(&output->mut1, NULL); pthread_mutex_init(&output->mut2, NULL); output->saved_frame = NULL; @@ -272,7 +274,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, this->xine_post.video_input[i+1] = NULL; this->dispose = mosaico_dispose; - //pthread_key_create(&output->key, NULL); +/* //pthread_key_create(&output->key, NULL);*/ return this; } @@ -407,7 +409,7 @@ static void frame_copy_content(vo_frame_t *to, vo_frame_t *from) { printf("oi oi oi \n\n"); return; } - //it works only for XINE_IMGFMT_YV12 + /* //it works only for XINE_IMGFMT_YV12*/ switch (from->format) { case XINE_IMGFMT_YUY2: printf("not supported\n"); @@ -522,8 +524,10 @@ static int _mosaico_draw_2(vo_frame_t *frame, post_mosaico_out_t *output, int co for (i = 0; i < wx; i++) { des1 = (i+ j*wid); des2 = ((i*zx)>>scalex)+(((j*zy)>>scaley) * (wid2>>scalex)); +/* //if(!j) printf("%d %d\n", (i*zx)/scalex, wid2/scalex); //if(!i) printf("%d %d\n", ((j*zy)>>scaley), (hei>>scaley)); +*/ output->saved_frame->base[0][pos_in + des1] = output->saved_frame_2[ciclo-1]->base[0][des2]; } @@ -565,7 +569,7 @@ static int _mosaico_draw_2(vo_frame_t *frame, post_mosaico_out_t *output, int co static int mosaico_draw(vo_frame_t *frame, xine_stream_t *stream) { - //vo_frame_t *new_frame; +/* //vo_frame_t *new_frame;*/ int skip; post_video_port_t *port = (post_video_port_t *)frame->port; post_mosaico_out_t *output = (post_mosaico_out_t *)xine_list_first_content(port->post->output); @@ -575,7 +579,7 @@ static int mosaico_draw(vo_frame_t *frame, xine_stream_t *stream) pthread_mutex_lock(&output->mut1); if(output->saved_frame != NULL) { skip = output->saved_frame->draw(output->saved_frame, stream); - //new_frame->free(new_frame); +/* //new_frame->free(new_frame);*/ frame->vpts = output->saved_frame->vpts; pthread_mutex_unlock(&output->mut1); post_restore_video_frame(frame, port); @@ -588,7 +592,7 @@ static int mosaico_draw(vo_frame_t *frame, xine_stream_t *stream) static int mosaico_draw_2(vo_frame_t *frame, xine_stream_t *stream) { - //vo_frame_t *new_frame; +/* //vo_frame_t *new_frame;*/ post_video_port_t *port = (post_video_port_t *)frame->port; post_mosaico_out_t *output = (post_mosaico_out_t *)xine_list_first_content(port->post->output); int *dato; @@ -602,7 +606,7 @@ static int mosaico_draw_2(vo_frame_t *frame, xine_stream_t *stream) while(in != NULL) { pt = in->data; if(pt == frame->port) { - //printf("trovato %d\n", i); +/* //printf("trovato %d\n", i);*/ break; } in = xine_list_next_content(port->post->input); |