/* event */
event_thread_t *p_ev;
- /* FIXME */
- uint8_t alpha[4];
- uint32_t clut[16];
+ /* palette for menus */
+ uint32_t clut[16];
+ uint8_t palette[4][4];
+ vlc_bool_t b_spu_change;
/* */
int i_aspect;
int i_title;
input_title_t **title;
+
+ /* lenght of program group chain */
+ mtime_t i_pgc_length;
};
static int Control( demux_t *, int, va_list );
static void DemuxTitles( demux_t * );
static void ESSubtitleUpdate( demux_t * );
-static void ButtonUpdate( demux_t * );
+static void ButtonUpdate( demux_t *, vlc_bool_t );
static void ESNew( demux_t *, int );
static int ProbeDVD( demux_t *, char * );
ps_track_init( p_sys->tk );
p_sys->i_aspect = -1;
p_sys->i_mux_rate = 0;
+ p_sys->i_pgc_length = 0;
+ p_sys->b_spu_change = VLC_FALSE;
if( 1 )
{
/* Set audio language */
psz_code = DemuxGetLanguageCode( p_demux, "audio-language" );
- if( dvdnav_audio_language_select(p_sys->dvdnav, psz_code ) !=
+ if( dvdnav_audio_language_select( p_sys->dvdnav, psz_code ) !=
DVDNAV_STATUS_OK )
{
msg_Warn( p_demux, "can't set audio language to '%s' (%s)",
psz_code, dvdnav_err_to_string( p_sys->dvdnav ) );
/* We try to fall back to 'en' */
if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
- dvdnav_audio_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT );
+ dvdnav_audio_language_select( p_sys->dvdnav, LANGUAGE_DEFAULT );
}
free( psz_code );
/* Set spu language */
- psz_code = DemuxGetLanguageCode( p_demux, "spu-language" );
- if( dvdnav_spu_language_select( p_sys->dvdnav,psz_code ) !=
+ psz_code = DemuxGetLanguageCode( p_demux, "sub-language" );
+ if( dvdnav_spu_language_select( p_sys->dvdnav, psz_code ) !=
DVDNAV_STATUS_OK )
{
msg_Warn( p_demux, "can't set spu language to '%s' (%s)",
if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK )
{
- msg_Warn( p_demux, "cannot set title" );
+ msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" );
+ dvdnav_close( p_sys->dvdnav );
+ free( p_sys );
+ return VLC_EGENERIC;
}
if( dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Title ) !=
DVDNAV_STATUS_OK )
{
- msg_Warn( p_demux, "cannot go to dvd menu" );
+ /* Try going to menu root */
+ if( dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Root ) !=
+ DVDNAV_STATUS_OK )
+ msg_Warn( p_demux, "cannot go to dvd menu" );
}
}
var_Create( p_sys->p_input, "x-end", VLC_VAR_INTEGER );
var_Create( p_sys->p_input, "y-end", VLC_VAR_INTEGER );
var_Create( p_sys->p_input, "color", VLC_VAR_ADDRESS );
- var_Create( p_sys->p_input, "contrast", VLC_VAR_ADDRESS );
+ var_Create( p_sys->p_input, "menu-palette", VLC_VAR_ADDRESS );
var_Create( p_sys->p_input, "highlight", VLC_VAR_BOOL );
var_Create( p_sys->p_input, "highlight-mutex", VLC_VAR_MUTEX );
var_Destroy( p_sys->p_input, "y-start" );
var_Destroy( p_sys->p_input, "y-end" );
var_Destroy( p_sys->p_input, "color" );
- var_Destroy( p_sys->p_input, "contrast" );
+ var_Destroy( p_sys->p_input, "menu-palette" );
vlc_object_release( p_sys->p_input );
else if( i_query == DEMUX_GET_TIME )
{
pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_sys->i_mux_rate > 0 )
+ if( p_sys->i_pgc_length > 0 )
{
- *pi64 = (int64_t)1000000 * 2048 * pos / 50 /
- p_sys->i_mux_rate;
+ *pi64 = p_sys->i_pgc_length * pos / len;
return VLC_SUCCESS;
}
}
else if( i_query == DEMUX_GET_LENGTH )
{
pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_sys->i_mux_rate > 0 )
+ if( p_sys->i_pgc_length > 0 )
{
- *pi64 = (int64_t)1000000 * len * 2048 / 50 /
- p_sys->i_mux_rate;
+ *pi64 = (int64_t)p_sys->i_pgc_length;
return VLC_SUCCESS;
}
}
event->physical_pan_scan );
ESSubtitleUpdate( p_demux );
+ p_sys->b_spu_change = VLC_TRUE;
/* HACK to get the SPU tracks registered in the right order */
for( i = 0; i < 0x1f; i++ )
msg_Dbg( p_demux, " - cell_start=%lld", event->cell_start );
msg_Dbg( p_demux, " - pg_start=%lld", event->pg_start );
+ /* Store the lenght in time of the current PGC */
+ p_sys->i_pgc_length = event->pgc_length / 90 * 1000;
+
/* FIXME is it correct or there is better way to know chapter change */
if( dvdnav_current_title_info( p_sys->dvdnav, &i_title,
&i_part ) == DVDNAV_STATUS_OK )
* - ...
*/
DemuxBlock( p_demux, packet, i_len );
+ if( p_sys->b_spu_change )
+ {
+ ButtonUpdate( p_demux, VLC_FALSE );
+ p_sys->b_spu_change = VLC_FALSE;
+ }
break;
}
case DVDNAV_STOP: /* EOF */
msg_Dbg( p_demux, "DVDNAV_STOP" );
+
+#if DVD_READ_CACHE
+ dvdnav_free_cache_block( p_sys->dvdnav, packet );
+#endif
return 0;
case DVDNAV_HIGHLIGHT:
msg_Dbg( p_demux, "DVDNAV_HIGHLIGHT" );
msg_Dbg( p_demux, " - display=%d", event->display );
msg_Dbg( p_demux, " - buttonN=%d", event->buttonN );
- ButtonUpdate( p_demux );
+ ButtonUpdate( p_demux, VLC_FALSE );
break;
}
case DVDNAV_WAIT:
msg_Dbg( p_demux, "DVDNAV_WAIT" );
+ /* reset PCR */
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
dvdnav_wait_skip( p_sys->dvdnav );
break;
/*****************************************************************************
* Update functions:
*****************************************************************************/
-static void ButtonUpdate( demux_t *p_demux )
+static void ButtonUpdate( demux_t *p_demux, vlc_bool_t b_mode )
{
demux_sys_t *p_sys = p_demux->p_sys;
vlc_value_t val;
if( i_button > 0 && i_title == 0 )
{
+ int i;
pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
- dvdnav_get_highlight_area( pci, i_button, 1, &hl );
+ dvdnav_get_highlight_area( pci, i_button, b_mode, &hl );
- /* I fear it is plain wrong */
- p_sys->alpha[0] = hl.palette&0x0f;
- p_sys->alpha[1] = (hl.palette>>4)&0x0f;
- p_sys->alpha[2] = (hl.palette>>8)&0x0f;
- p_sys->alpha[3] = (hl.palette>>12)&0x0f;
+ for( i = 0; i < 4; i++ )
+ {
+ uint32_t i_yuv = p_sys->clut[(hl.palette>>(16+i*4))&0x0f];
+ uint8_t i_alpha = (hl.palette>>(i*4))&0x0f;
+ i_alpha = i_alpha == 0xf ? 0xff : i_alpha << 4;
+
+ p_sys->palette[i][0] = (i_yuv >> 16) & 0xff;
+ p_sys->palette[i][1] = (i_yuv >> 0) & 0xff;
+ p_sys->palette[i][2] = (i_yuv >> 8) & 0xff;
+ p_sys->palette[i][3] = i_alpha;
+ }
vlc_mutex_lock( p_mutex );
val.i_int = hl.sx; var_Set( p_sys->p_input, "x-start", val );
val.i_int = hl.sy; var_Set( p_sys->p_input, "y-start", val );
val.i_int = hl.ey; var_Set( p_sys->p_input, "y-end", val );
- val.p_address = (void *)p_sys->alpha;
- var_Set( p_sys->p_input, "contrast", val );
+ val.p_address = (void *)p_sys->palette;
+ var_Set( p_sys->p_input, "menu-palette", val );
val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val );
vlc_mutex_unlock( p_mutex );
int i_spu = dvdnav_get_active_spu_stream( p_sys->dvdnav );
int32_t i_title, i_part;
- ButtonUpdate( p_demux );
+ ButtonUpdate( p_demux, VLC_FALSE );
dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part );
if( i_title > 0 ) return;
}
tk->b_seen = VLC_TRUE;
- if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux );
+ if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, VLC_FALSE );
}
/*****************************************************************************
case ACTIONID_NAV_ACTIVATE:
b_activated = VLC_TRUE;
dvdnav_button_activate( p_sys->dvdnav, pci );
+ ButtonUpdate( p_ev->p_demux, VLC_TRUE );
break;
default:
break;
b_activated = VLC_TRUE;
dvdnav_mouse_activate( p_sys->dvdnav, pci, valx.i_int,
valy.i_int );
+ ButtonUpdate( p_ev->p_demux, VLC_TRUE );
}
p_ev->b_moved = VLC_FALSE;
projects / vlc / blobdiff