diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/spu_dec/spudvb_decoder.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c index 47e03ce3d..221ba187c 100644 --- a/src/spu_dec/spudvb_decoder.c +++ b/src/spu_dec/spudvb_decoder.c @@ -154,12 +154,12 @@ static void update_region (dvb_spu_decoder_t * this, int region_id, int region_w free( reg->img ); reg->img = NULL; } - lprintf("SPUDVB: rejected region %d = %dx%d\n", region_id, region_width, region_height ); + lprintf("rejected region %d = %dx%d\n", region_id, region_width, region_height ); return; } if ( reg->width*reg->height<region_width*region_height ) { - lprintf("SPUDVB: update size of region %d = %dx%d\n", region_id, region_width, region_height); + lprintf("update size of region %d = %dx%d\n", region_id, region_width, region_height); if ( reg->img ) { free( reg->img ); reg->img = NULL; @@ -177,7 +177,7 @@ static void update_region (dvb_spu_decoder_t * this, int region_id, int region_w if ( fill ) { memset( reg->img, fill_color, region_width*region_height ); reg->empty = 1; - lprintf("SPUDVB: FILL REGION %d\n", region_id); + lprintf("FILL REGION %d\n", region_id); } reg->width = region_width; reg->height = region_height; @@ -643,7 +643,7 @@ static void* dvbsub_timer_func(void *this_gen) for ( i=0; i<MAX_REGIONS; i++ ) { if ( this->dvbsub->regions[i].osd ) { this->stream->osd_renderer->hide( this->dvbsub->regions[i].osd, 0 ); - lprintf("SPUDVB: thread hiding = %d\n",i); + lprintf("thread hiding = %d\n",i); } } } @@ -676,7 +676,7 @@ static void draw_subtitles (dvb_spu_decoder_t * this) unsigned char tmp[dest_width*576]; unsigned char *reg; - if ( !dest_width ) + if ( !dest_width || !dest_height ) return; /* render all regions onto the page */ @@ -712,25 +712,25 @@ static void draw_subtitles (dvb_spu_decoder_t * this) } pthread_mutex_lock(&this->dvbsub_osd_mutex); - lprintf("SPUDVB: this->vpts=%llu\n",this->vpts); + lprintf("this->vpts=%llu\n",this->vpts); for ( r=0; r<MAX_REGIONS; r++ ) { - lprintf("SPUDVB: region=%d, visible=%d, osd=%d, empty=%d\n", r, this->dvbsub->page.regions[r].is_visible, this->dvbsub->regions[r].osd?1:0, this->dvbsub->regions[r].empty ); + lprintf("region=%d, visible=%d, osd=%d, empty=%d\n", r, this->dvbsub->page.regions[r].is_visible, this->dvbsub->regions[r].osd?1:0, this->dvbsub->regions[r].empty ); if ( this->dvbsub->page.regions[r].is_visible && this->dvbsub->regions[r].osd && !this->dvbsub->regions[r].empty ) { this->stream->osd_renderer->set_extent(this->dvbsub->regions[r].osd, SPU_MAX_WIDTH, SPU_MAX_HEIGHT); this->stream->osd_renderer->set_position( this->dvbsub->regions[r].osd, this->dvbsub->page.regions[r].x, this->dvbsub->page.regions[r].y ); this->stream->osd_renderer->show( this->dvbsub->regions[r].osd, this->vpts ); - lprintf("SPUDVB: show region = %d\n",r); + lprintf("show region = %d\n",r); } else { if ( this->dvbsub->regions[r].osd ) { this->stream->osd_renderer->hide( this->dvbsub->regions[r].osd, this->vpts ); - lprintf("SPUDVB: hide region = %d\n",r); + lprintf("hide region = %d\n",r); } } } this->dvbsub_hide_timeout.tv_nsec = 0; this->dvbsub_hide_timeout.tv_sec = time(NULL) + this->dvbsub->page.page_time_out; - lprintf("SPUDVB: page_time_out %d\n",this->dvbsub->page.page_time_out); + lprintf("page_time_out %d\n",this->dvbsub->page.page_time_out); pthread_cond_signal(&this->dvbsub_restart_timeout); pthread_mutex_unlock(&this->dvbsub_osd_mutex); } @@ -794,7 +794,7 @@ static void spudec_decode_data (spu_decoder_t * this_gen, buf_element_t * buf) metronom_clock_t *clock = this->stream->xine->clock; int64_t curvpts = clock->get_current_time( clock ); /* if buf->pts is unreliable, show page asap (better than nothing) */ - lprintf("SPUDVB: spu_vpts=%lld - current_vpts=%lld\n", vpts, curvpts); + lprintf("spu_vpts=%lld - current_vpts=%lld\n", vpts, curvpts); if ( vpts<=curvpts || (vpts-curvpts)>(5*90000) ) this->vpts = 0; else |