Commit 88a6bd45 authored by Rocky Bernstein's avatar Rocky Bernstein

RV24 color-setting fixed. Fullscreen mode doesn't work though.

RGB2 sorta works, but to do better we need a way to lookup a palette
color in a colormap.
parent 164db27b
......@@ -2,7 +2,7 @@
* parse.c: Philips OGT (SVCD subtitle) packet parser
*****************************************************************************
* Copyright (C) 2003, 2004 VideoLAN
* $Id: cvd_parse.c,v 1.13 2004/01/21 04:45:47 rocky Exp $
* $Id: cvd_parse.c,v 1.14 2004/01/22 04:46:19 rocky Exp $
*
* Authors: Rocky Bernstein
* based on code from:
......@@ -318,6 +318,11 @@ E_(ParsePacket)( decoder_t *p_dec)
p_spu->i_x = p_sys->i_x_start
+ config_GetInt( p_dec, MODULE_STRING "-horizontal-correct" );
p_spu->p_sys->p_palette[0] = p_sys->p_palette[0];
p_spu->p_sys->p_palette[1] = p_sys->p_palette[1];
p_spu->p_sys->p_palette[2] = p_sys->p_palette[2];
p_spu->p_sys->p_palette[3] = p_sys->p_palette[3];
/* FIXME: use aspect ratio for x? */
p_spu->i_x = (p_spu->i_x * 3) / 4;
p_spu->i_y = p_sys->i_y_start
......
......@@ -2,7 +2,7 @@
* Philips OGT (SVCD subtitle) packet parser
*****************************************************************************
* Copyright (C) 2003, 2004 VideoLAN
* $Id: ogt_parse.c,v 1.11 2004/01/21 04:45:47 rocky Exp $
* $Id: ogt_parse.c,v 1.12 2004/01/22 04:46:19 rocky Exp $
*
* Author: Rocky Bernstein
* based on code from:
......@@ -191,6 +191,11 @@ E_(ParsePacket)( decoder_t *p_dec)
p_spu->i_x = p_sys->i_x_start
+ config_GetInt( p_dec, MODULE_STRING "-horizontal-correct" );
p_spu->p_sys->p_palette[0] = p_sys->p_palette[0];
p_spu->p_sys->p_palette[1] = p_sys->p_palette[1];
p_spu->p_sys->p_palette[2] = p_sys->p_palette[2];
p_spu->p_sys->p_palette[3] = p_sys->p_palette[3];
/* FIXME: use aspect ratio for x? */
p_spu->i_x = (p_spu->i_x * 3) / 4;
p_spu->i_y = p_sys->i_y_start
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
* subtitle.h : Common SVCD and CVD subtitles header
*****************************************************************************
* Copyright (C) 2003,2004 VideoLAN
* $Id: subtitle.h,v 1.10 2004/01/21 04:45:47 rocky Exp $
* $Id: subtitle.h,v 1.11 2004/01/22 04:46:19 rocky Exp $
*
* Author: Rocky Bernstein
* based on code from:
......@@ -185,6 +185,7 @@ struct subpicture_sys_t
uint8_t *p_data; /* Image data one byte T, Y, U, V */
/* Link to our input */
vlc_object_t * p_input;
......@@ -192,4 +193,9 @@ struct subpicture_sys_t
vlc_mutex_t lock;
vlc_bool_t b_crop;
unsigned int i_x_start, i_y_start, i_x_end, i_y_end;
/* This is only used for color palette Chromas like RGB2. */
ogt_yuvt_t p_palette[NUM_SUBTITLE_COLORS]; /* Palette of colors used
in subtitle */
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment