Commit aac6528e authored by Rocky Bernstein's avatar Rocky Bernstein

Some of RV32 bugs worked out - pretty close. Some RGB2 work.

Render->Blend
parent 50b9bf83
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* parse.c: Philips OGT (SVCD subtitle) packet parser * parse.c: Philips OGT (SVCD subtitle) packet parser
***************************************************************************** *****************************************************************************
* Copyright (C) 2003, 2004 VideoLAN * Copyright (C) 2003, 2004 VideoLAN
* $Id: cvd_parse.c,v 1.12 2004/01/16 13:32:37 rocky Exp $ * $Id: cvd_parse.c,v 1.13 2004/01/21 04:45:47 rocky Exp $
* *
* Authors: Rocky Bernstein * Authors: Rocky Bernstein
* based on code from: * based on code from:
...@@ -308,7 +308,7 @@ E_(ParsePacket)( decoder_t *p_dec) ...@@ -308,7 +308,7 @@ E_(ParsePacket)( decoder_t *p_dec)
/* Fill the p_spu structure */ /* Fill the p_spu structure */
vlc_mutex_init( p_dec, &p_spu->p_sys->lock ); vlc_mutex_init( p_dec, &p_spu->p_sys->lock );
p_spu->pf_render = VCDSubRender; p_spu->pf_render = VCDSubBlend;
p_spu->pf_destroy = VCDSubDestroySPU; p_spu->pf_destroy = VCDSubDestroySPU;
p_spu->p_sys->p_data = (uint8_t*)p_spu->p_sys + sizeof( subpicture_sys_t ); p_spu->p_sys->p_data = (uint8_t*)p_spu->p_sys + sizeof( subpicture_sys_t );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Philips OGT (SVCD subtitle) packet parser * Philips OGT (SVCD subtitle) packet parser
***************************************************************************** *****************************************************************************
* Copyright (C) 2003, 2004 VideoLAN * Copyright (C) 2003, 2004 VideoLAN
* $Id: ogt_parse.c,v 1.10 2004/01/16 13:32:37 rocky Exp $ * $Id: ogt_parse.c,v 1.11 2004/01/21 04:45:47 rocky Exp $
* *
* Author: Rocky Bernstein * Author: Rocky Bernstein
* based on code from: * based on code from:
...@@ -181,7 +181,7 @@ E_(ParsePacket)( decoder_t *p_dec) ...@@ -181,7 +181,7 @@ E_(ParsePacket)( decoder_t *p_dec)
/* Fill the p_spu structure */ /* Fill the p_spu structure */
vlc_mutex_init( p_dec, &p_spu->p_sys->lock ); vlc_mutex_init( p_dec, &p_spu->p_sys->lock );
p_spu->pf_render = VCDSubRender; p_spu->pf_render = VCDSubBlend;
p_spu->pf_destroy = VCDSubDestroySPU; p_spu->pf_destroy = VCDSubDestroySPU;
p_spu->p_sys->p_data = (uint8_t*)p_spu->p_sys + sizeof( subpicture_sys_t ); p_spu->p_sys->p_data = (uint8_t*)p_spu->p_sys + sizeof( subpicture_sys_t );
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* render.h : Common SVCD and CVD rendering routine(s). * render.h : Common SVCD and CVD rendering routine(s).
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: render.h,v 1.2 2003/12/28 04:51:52 rocky Exp $ * $Id: render.h,v 1.3 2004/01/21 04:45:47 rocky Exp $
* *
* Author: Rocky Bernstein * Author: Rocky Bernstein
* *
...@@ -24,5 +24,5 @@ ...@@ -24,5 +24,5 @@
/***************************************************************************** /*****************************************************************************
* Prototypes * Prototypes
*****************************************************************************/ *****************************************************************************/
void VCDSubRender ( vout_thread_t *, picture_t *, const subpicture_t * ); void VCDSubBlend ( vout_thread_t *, picture_t *, const subpicture_t * );
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* subtitle.h : Common SVCD and CVD subtitles header * subtitle.h : Common SVCD and CVD subtitles header
***************************************************************************** *****************************************************************************
* Copyright (C) 2003,2004 VideoLAN * Copyright (C) 2003,2004 VideoLAN
* $Id: subtitle.h,v 1.9 2004/01/16 13:32:37 rocky Exp $ * $Id: subtitle.h,v 1.10 2004/01/21 04:45:47 rocky Exp $
* *
* Author: Rocky Bernstein * Author: Rocky Bernstein
* based on code from: * based on code from:
...@@ -72,15 +72,15 @@ ...@@ -72,15 +72,15 @@
N_("Add this to starting horizontal position of subtitle.") N_("Add this to starting horizontal position of subtitle.")
#define HORIZONTAL_CORRECT_LONGTEXT N_( \ #define HORIZONTAL_CORRECT_LONGTEXT N_( \
"If you need to adjust the subtitle starting position horizontally, " \ "If you need to adjust the subtitle starting position horizontally, " \
"set this. Negative values can be used to shift left. 0 would " \ "set this. Negative values shift left and postive values right. 0 would " \
"be no deviation from where the position specified in the subtitle." \ "be no deviation from where the position specified in the subtitle." \
) )
#define VERTICAL_CORRECT \ #define VERTICAL_CORRECT \
N_("Add this to starting vertical position of subtitle.") N_("Add this to starting vertical position of subtitle.")
#define VERTICAL_CORRECT_LONGTEXT N_( \ #define VERTICAL_CORRECT_LONGTEXT N_( \
"If you need to adjust the subtitle starting position horizontally, " \ "If you need to adjust the subtitle starting position vertically, " \
"set this. Negative values can be used to shift left. 0 would " \ "set this. Negative values shift up, positive values down. 0 would " \
"be no deviation from where the position specified in the subtitle." \ "be no deviation from where the position specified in the 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