Skip to content

V
vlc-2-2
Commit b82f5755 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

bluray: cosmetics

parent 1cf7e446
Show whitespace changes
Inline Side-by-side
Showing with 214 additions and 216 deletions
modules/access/bluray.c
View file @ b82f5755
......@@ -235,9 +235,9 @@ static int blurayOpen( vlc_object_t *object )
/* */
p_demux->p_sys = p_sys = calloc(1, sizeof(*p_sys));
if (unlikely(!p_sys)) {
if (unlikely(!p_sys))
return VLC_ENOMEM;
}
p_sys->current_overlay = -1;
p_sys->i_audio_stream = -1;
p_sys->i_video_stream = -1;
......@@ -363,9 +363,8 @@ static int blurayOpen( vlc_object_t *object )
vlc_array_init(&p_sys->es);
p_sys->p_out = esOutNew( p_demux );
if (unlikely(p_sys->p_out == NULL)) {
if (unlikely(p_sys->p_out == NULL))
goto error;
}
blurayResetParser( p_demux );
if (!p_sys->p_parser) {
......@@ -404,8 +403,8 @@ static void blurayClose( vlc_object_t *object )
bd_close(p_sys->bluray);
if (p_sys->p_vout != NULL) {
var_DelCallback(p_sys->p_vout, "mouse-moved", &onMouseEvent, p_demux);
var_DelCallback(p_sys->p_vout, "mouse-clicked", &onMouseEvent, p_demux);
var_DelCallback(p_sys->p_vout, "mouse-moved", onMouseEvent, p_demux);
var_DelCallback(p_sys->p_vout, "mouse-clicked", onMouseEvent, p_demux);
vlc_object_release(p_sys->p_vout);
}
if (p_sys->p_input != NULL)
......@@ -532,11 +531,11 @@ static es_out_t *esOutNew( demux_t *p_demux )
if ( unlikely(p_out == NULL) )
return NULL;
p_out->pf_add = &esOutAdd;
p_out->pf_control = &esOutControl;
p_out->pf_del = &esOutDel;
p_out->pf_destroy = &esOutDestroy;
p_out->pf_send = &esOutSend;
p_out->pf_add = esOutAdd;
p_out->pf_control = esOutControl;
p_out->pf_del = esOutDel;
p_out->pf_destroy = esOutDestroy;
p_out->pf_send = esOutSend;
p_out->p_sys = malloc( sizeof(*p_out->p_sys) );
if ( unlikely( p_out->p_sys == NULL ) ) {
......@@ -624,12 +623,12 @@ static void subpictureUpdaterUpdate(subpicture_t *p_subpic,
return;
}
subpicture_region_t **p_dst = &(p_subpic->p_region);
subpicture_region_t **p_dst = &p_subpic->p_region;
while (p_src != NULL) {
*p_dst = subpicture_region_Clone(p_src);
if (*p_dst == NULL)
break;
p_dst = &((*p_dst)->p_next);
p_dst = &(*p_dst)->p_next;
p_src = p_src->p_next;
}
if (*p_dst != NULL)
......@@ -847,7 +846,7 @@ static void blurayDrawOverlay(demux_t *p_demux, const BD_OVERLAY* const ov)
/* Now we can update the region, regardless it's an update or an insert */
const BD_PG_RLE_ELEM *img = ov->img;
for (int y = 0; y < ov->h; y++) {
for (int y = 0; y < ov->h; y++)
for (int x = 0; x < ov->w;) {
memset(p_reg->p_picture->p[0].p_pixels +
y * p_reg->p_picture->p[0].i_pitch + x,
......@@ -855,7 +854,7 @@ static void blurayDrawOverlay(demux_t *p_demux, const BD_OVERLAY* const ov)
x += img->len;
img++;
}
}
if (ov->palette) {
p_reg->fmt.p_palette->i_entries = 256;
for (int i = 0; i < 256; ++i) {
......@@ -865,6 +864,7 @@ static void blurayDrawOverlay(demux_t *p_demux, const BD_OVERLAY* const ov)
p_reg->fmt.p_palette->palette[i][3] = ov->palette[i].T;
}
}
vlc_mutex_unlock(&p_sys->p_overlays[ov->plane]->lock);
/*
* /!\ The region is now stored in our internal list, but not in the subpicture /!\
......@@ -880,6 +880,7 @@ static void blurayOverlayProc(void *ptr, const BD_OVERLAY *const overlay)
blurayCloseAllOverlays(p_demux);
return;
}
switch (overlay->cmd) {
case BD_OVERLAY_INIT:
msg_Info(p_demux, "Initializing overlay");
......@@ -1059,10 +1060,11 @@ static void blurayResetParser( demux_t *p_demux )
demux_sys_t *p_sys = p_demux->p_sys;
if (p_sys->p_parser)
stream_Delete(p_sys->p_parser);
p_sys->p_parser = stream_DemuxNew(p_demux, "ts", p_sys->p_out);
if (!p_sys->p_parser) {
if (!p_sys->p_parser)
msg_Err(p_demux, "Failed to create TS demuxer");
}
}
static void blurayUpdateTitle(demux_t *p_demux, unsigned i_title)
......@@ -1092,7 +1094,6 @@ static int bluraySetTitle(demux_t *p_demux, int i_title)
msg_Dbg( p_demux, "Selecting Title %i", i_title);
/* Select Blu-Ray title */
if (bd_select_title(p_demux->p_sys->bluray, i_title) == 0 ) {
msg_Err(p_demux, "cannot select bd title '%d'", p_demux->info.i_title);
return VLC_EGENERIC;
......@@ -1102,7 +1103,6 @@ static int bluraySetTitle(demux_t *p_demux, int i_title)
return VLC_SUCCESS;
}
/*****************************************************************************
* blurayControl: handle the controls
*****************************************************************************/
......@@ -1122,8 +1122,7 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
case DEMUX_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 =
INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
*pi_64 = INT64_C(1000) * var_InheritInteger(p_demux, "disc-caching");
break;
case DEMUX_SET_PAUSE_STATE:
......@@ -1158,9 +1157,9 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
/* Duplicate local title infos */
*pi_int = p_sys->i_title;
*ppp_title = calloc( p_sys->i_title, sizeof(input_title_t **) );
for( unsigned int i = 0; i < p_sys->i_title; i++ )
(*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->pp_title[i]);
*ppp_title = malloc(p_sys->i_title * sizeof(input_title_t **));
for (unsigned int i = 0; i < p_sys->i_title; i++)
(*ppp_title)[i] = vlc_input_title_Duplicate(p_sys->pp_title[i]);
return VLC_SUCCESS;
}
......@@ -1289,24 +1288,22 @@ static void blurayHandleEvent( demux_t *p_demux, const BD_EVENT *e )
blurayUpdateCurrentClip(p_demux, e->param);
break;
case BD_EVENT_AUDIO_STREAM:
{
if ( e->param == 0xFF )
break ;
BLURAY_TITLE_INFO *info = bd_get_title_info(p_sys->bluray,
bd_get_current_title(p_sys->bluray), 0);
if ( info == NULL )
if (info == NULL)
break ;
/* The param we get is the real stream id, not an index, ie. it starts from 1 */
int pid = info->clips[p_sys->i_current_clip].audio_streams[e->param - 1].pid;
int idx = findEsPairIndex( p_sys, pid );
if ( idx >= 0 ) {
int idx = findEsPairIndex(p_sys, pid);
if (idx >= 0) {
es_out_id_t *p_es = vlc_array_item_at_index(&p_sys->es, idx);
es_out_Control( p_demux->out, ES_OUT_SET_ES, p_es );
}
bd_free_title_info( info );
p_sys->i_audio_stream = pid;
break ;
}
case BD_EVENT_CHAPTER:
p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
p_demux->info.i_seekpoint = e->param;
......@@ -1314,7 +1311,7 @@ static void blurayHandleEvent( demux_t *p_demux, const BD_EVENT *e )
case BD_EVENT_ANGLE:
case BD_EVENT_IG_STREAM:
default:
msg_Warn( p_demux, "event: %d param: %d", e->event, e->param );
msg_Warn(p_demux, "event: %d param: %d", e->event, e->param);
break;
}
}
......@@ -1367,6 +1364,7 @@ static int blurayDemux(demux_t *p_demux)
block_Release(p_block);
return 1;
}
if (p_sys->current_overlay != -1) {
vlc_mutex_lock(&p_sys->p_overlays[p_sys->current_overlay]->lock);
if (p_sys->p_overlays[p_sys->current_overlay]->status == ToDisplay) {
......@@ -1374,8 +1372,8 @@ static int blurayDemux(demux_t *p_demux)
if (p_sys->p_vout == NULL)
p_sys->p_vout = input_GetVout(p_sys->p_input);
if (p_sys->p_vout != NULL) {
var_AddCallback(p_sys->p_vout, "mouse-moved", &onMouseEvent, p_demux);
var_AddCallback(p_sys->p_vout, "mouse-clicked", &onMouseEvent, p_demux);
var_AddCallback(p_sys->p_vout, "mouse-moved", onMouseEvent, p_demux);
var_AddCallback(p_sys->p_vout, "mouse-clicked", onMouseEvent, p_demux);
bluraySendOverlayToVout(p_demux);
}
} else
......
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