diff options
| -rw-r--r-- | src/libspudec/spu.c | 8 | ||||
| -rw-r--r-- | src/libspudec/xine_decoder.c | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c index fa4c95085..1ab34e62c 100644 --- a/src/libspudec/spu.c +++ b/src/libspudec/spu.c @@ -35,7 +35,7 @@ * along with this program; see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: spu.c,v 1.17 2001/10/21 15:04:13 jcdutton Exp $ + * $Id: spu.c,v 1.18 2001/10/23 00:50:47 miguelfreitas Exp $ * */ @@ -171,11 +171,11 @@ void spu_do_commands(spu_state_t *state, spu_seq_t* seq, vo_overlay_t *ovl) case CMD_SPU_SET_PALETTE: { /* CLUT */ spu_clut_t *clut = (spu_clut_t *) (buf+1); -/* state->cur_colors[3] = clut->entry0; + state->cur_colors[3] = clut->entry0; state->cur_colors[2] = clut->entry1; state->cur_colors[1] = clut->entry2; state->cur_colors[0] = clut->entry3; - */ + /* This is a bit out of context for now */ ovl->color[3] = state->clut[clut->entry0]; ovl->color[2] = state->clut[clut->entry1]; @@ -380,7 +380,7 @@ void spu_draw_picture (spu_state_t *state, spu_seq_t* seq, vo_overlay_t *ovl) border1-border2-fg-border2-border1. MINFOUND is the number of ocurrences threshold. */ -#define MINFOUND 25 +#define MINFOUND 20 void spu_discover_clut(spu_state_t *state, vo_overlay_t *ovl) { int bg,c; diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 3f96bb7b7..d5694c7ab 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,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_decoder.c,v 1.21 2001/10/22 14:56:29 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.22 2001/10/23 00:50:47 miguelfreitas Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -368,13 +368,10 @@ void spu_process (spudec_decoder_t *this, uint32_t stream_id) { if ((this->state.modified) ) { spu_draw_picture(&this->state, this->cur_seq, &this->overlay); } -/* spu_discover_clut probably goes here */ -/* Not sure where to put clut discovery */ -/* if (this->state.need_clut) - spu_discover_clut(&this->state, &this->overlay); - return ; - } - */ + + if (this->state.need_clut) + spu_discover_clut(&this->state, &this->overlay); + if (this->state.menu == 0) { /* Subtitle */ this->event.object.handle = handle; @@ -737,6 +734,8 @@ static void spudec_event_listener(void *this_gen, xine_event_t *event_gen) { * This event is for GUI -> NAVDVD plugin * SPUDEC will have to use a different EVENT * if it needs this for CLUT auto detect. + * ->that was a patch to redetect clut on spu channel change. + * not very important, i will take a look when i have time. [MF] */ /* FIXME case XINE_UI_GET_SPU_LANG: |