X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fzvbi.c;h=4c7ecc7e2809bcd6d94c2cc48a0893a4b7c1fea8;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=83dd582f09ad2acd21c39ac9fb34e1c0e7a3161f;hpb=a46c9170586f6eea3f9f1ffc6ee3a6142b30fd60;p=vlc diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c index 83dd582f09..4c7ecc7e28 100644 --- a/modules/codec/zvbi.c +++ b/modules/codec/zvbi.c @@ -46,9 +46,8 @@ #include #include -#include #include -#include +#include /***************************************************************************** * Module descriptor. @@ -79,23 +78,23 @@ static const char *const ppsz_pos_descriptions[] = { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; -vlc_module_begin(); - set_description( N_("VBI and Teletext decoder") ); - set_shortname( N_("VBI & Teletext") ); - set_capability( "decoder", 51 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_description( N_("VBI and Teletext decoder") ) + set_shortname( N_("VBI & Teletext") ) + set_capability( "decoder", 51 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_callbacks( Open, Close ) add_integer( "vbi-page", 100, NULL, - PAGE_TEXT, PAGE_LONGTEXT, false ); + PAGE_TEXT, PAGE_LONGTEXT, false ) add_bool( "vbi-opaque", true, NULL, - OPAQUE_TEXT, OPAQUE_LONGTEXT, false ); - add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false ); + OPAQUE_TEXT, OPAQUE_LONGTEXT, false ) + add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); add_bool( "vbi-text", false, NULL, - TELX_TEXT, TELX_LONGTEXT, false ); -vlc_module_end(); + TELX_TEXT, TELX_LONGTEXT, false ) +vlc_module_end () /**************************************************************************** * Local structures @@ -125,11 +124,11 @@ static const char *const ppsz_default_triplet[] = { }; typedef enum { - ZVBI_KEY_RED = 'r' << 0x16, - ZVBI_KEY_GREEN = 'g' << 0x16, - ZVBI_KEY_YELLOW = 'y' << 0x16, - ZVBI_KEY_BLUE = 'b' << 0x16, - ZVBI_KEY_INDEX = 'i' << 0x16, + ZVBI_KEY_RED = 'r' << 16, + ZVBI_KEY_GREEN = 'g' << 16, + ZVBI_KEY_YELLOW = 'y' << 16, + ZVBI_KEY_BLUE = 'b' << 16, + ZVBI_KEY_INDEX = 'i' << 16, } ttxt_key_id; typedef enum { @@ -203,14 +202,13 @@ static int Open( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t *) p_this; decoder_sys_t *p_sys = NULL; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') ) + if( p_dec->fmt_in.i_codec != VLC_CODEC_TELETEXT ) return VLC_EGENERIC; p_dec->pf_decode_sub = Decode; - p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) ); + p_sys = p_dec->p_sys = calloc( 1, sizeof(decoder_sys_t) ); if( p_sys == NULL ) return VLC_ENOMEM; - memset( p_sys, 0, sizeof(decoder_sys_t) ); p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0'; p_sys->b_update = false; @@ -247,17 +245,14 @@ static int Open( vlc_object_t *p_this ) /* Create the var on vlc_global. */ p_sys->i_wanted_page = var_CreateGetInteger( p_dec, "vbi-page" ); - var_AddCallback( p_dec, "vbi-page", - RequestPage, p_sys ); + var_AddCallback( p_dec, "vbi-page", RequestPage, p_sys ); /* Check if the Teletext track has a known "initial page". */ - if( p_sys->i_wanted_page == 100 && p_dec->fmt_in.subs.dvb.i_id != -1 ) + if( p_sys->i_wanted_page == 100 && p_dec->fmt_in.subs.teletext.i_magazine != -1 ) { - int i_wanted_magazine = p_dec->fmt_in.subs.dvb.i_id >> 16; - if( i_wanted_magazine == 0 ) - i_wanted_magazine = 8; - p_sys->i_wanted_page = vbi_bcd2dec(p_dec->fmt_in.subs.dvb.i_id & 0xff); - p_sys->i_wanted_page += 100*i_wanted_magazine; + p_sys->i_wanted_page = 100 * p_dec->fmt_in.subs.teletext.i_magazine + + vbi_bcd2dec( p_dec->fmt_in.subs.teletext.i_page ); + var_SetInteger( p_dec, "vbi-page", p_sys->i_wanted_page ); } p_sys->i_wanted_subpage = VBI_ANY_SUBNO; @@ -271,13 +266,13 @@ static int Open( vlc_object_t *p_this ) // var_AddCallback( p_dec, "vbi-text", Text, p_sys ); /* Listen for keys */ - var_AddCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_sys ); + var_AddCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_dec ); - es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) ); + es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_CODEC_SPU ); if( p_sys->b_text ) - p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T'); + p_dec->fmt_out.video.i_chroma = VLC_CODEC_TEXT; else - p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A'); + p_dec->fmt_out.video.i_chroma = VLC_CODEC_RGBA; return VLC_SUCCESS; } @@ -292,7 +287,7 @@ static void Close( vlc_object_t *p_this ) var_DelCallback( p_dec, "vbi-position", Position, p_sys ); var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys ); var_DelCallback( p_dec, "vbi-page", RequestPage, p_sys ); - var_DelCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_sys ); + var_DelCallback( p_dec->p_libvlc, "key-pressed", EventKey, p_dec ); vlc_mutex_destroy( &p_sys->lock ); @@ -357,6 +352,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) vlc_mutex_unlock( &p_sys->lock ); /* Try to see if the page we want is in the cache yet */ + memset( &p_page, 0, sizeof(vbi_page) ); b_cached = vbi_fetch_vt_page( p_sys->p_vbi_dec, &p_page, vbi_dec2bcd( i_wanted_page ), i_wanted_subpage, VBI_WST_LEVEL_3p5, @@ -418,12 +414,12 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) } else { - picture_t *p_pic = &p_spu->p_region->picture; + picture_t *p_pic = p_spu->p_region->p_picture; /* ZVBI is stupid enough to assume pitch == width */ p_pic->p->i_pitch = 4 * fmt.i_width; vbi_draw_vt_page( &p_page, ZVBI_PIXFMT_RGBA32, - p_spu->p_region->picture.p->p_pixels, 1, 1 ); + p_spu->p_region->p_picture->p->p_pixels, 1, 1 ); vlc_mutex_lock( &p_sys->lock ); memcpy( p_sys->nav_link, &p_page.nav_link, sizeof( p_sys->nav_link )) ; @@ -441,7 +437,7 @@ error: vbi_unref_page( &p_page ); if( p_spu != NULL ) { - p_dec->pf_spu_buffer_del( p_dec, p_spu ); + decoder_DeleteSubpicture( p_dec, p_spu ); p_spu = NULL; } @@ -459,7 +455,7 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt, /* If there is a page or sub to render, then we do that here */ /* Create the subpicture unit */ - p_spu = p_dec->pf_spu_buffer_new( p_dec ); + p_spu = decoder_NewSubpicture( p_dec, NULL ); if( !p_spu ) { msg_Warn( p_dec, "can't get spu buffer" ); @@ -467,27 +463,29 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt, } memset( &fmt, 0, sizeof(video_format_t) ); - fmt.i_chroma = b_text ? VLC_FOURCC('T','E','X','T') : - VLC_FOURCC('R','G','B','A'); - fmt.i_aspect = b_text ? 0 : VOUT_ASPECT_FACTOR; + fmt.i_chroma = b_text ? VLC_CODEC_TEXT : + VLC_CODEC_RGBA; if( b_text ) { fmt.i_bits_per_pixel = 0; + fmt.i_sar_num = 0; + fmt.i_sar_den = 0; } else { - fmt.i_sar_num = fmt.i_sar_den = 1; + fmt.i_sar_num = 1; + fmt.i_sar_den = 1; fmt.i_width = fmt.i_visible_width = i_columns * 12; fmt.i_height = fmt.i_visible_height = i_rows * 10; fmt.i_bits_per_pixel = 32; } fmt.i_x_offset = fmt.i_y_offset = 0; - p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt ); + p_spu->p_region = subpicture_region_New( &fmt ); if( p_spu->p_region == NULL ) { msg_Err( p_dec, "cannot allocate SPU region" ); - p_dec->pf_spu_buffer_del( p_dec, p_spu ); + decoder_DeleteSubpicture( p_dec, p_spu ); return NULL; } @@ -495,20 +493,14 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt, p_spu->p_region->i_y = 0; p_spu->p_region->i_align = i_align; - /* Normal text subs, easy markup */ - p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM; - p_spu->i_start = i_pts; p_spu->i_stop = 0; p_spu->b_ephemer = true; p_spu->b_absolute = false; - p_spu->b_pausable = true; if( !b_text ) { - p_spu->i_width = p_spu->i_original_picture_width = fmt.i_width; - p_spu->i_height = p_spu->i_original_picture_height = fmt.i_height; } @@ -563,7 +555,7 @@ static int OpaquePage( picture_t *p_src, const vbi_page p_page, { unsigned int x, y; - assert( fmt.i_chroma == VLC_FOURCC('R','G','B','A' ) ); + assert( fmt.i_chroma == VLC_CODEC_RGBA ); /* Kludge since zvbi doesn't provide an option to specify opacity. */ for( y = 0; y < fmt.i_height; y++ ) @@ -571,26 +563,27 @@ static int OpaquePage( picture_t *p_src, const vbi_page p_page, for( x = 0; x < fmt.i_width; x++ ) { const vbi_opacity opacity = p_page.text[ y/10 * p_page.columns + x/12 ].opacity; + const int background = p_page.text[ y/10 * p_page.columns + x/12 ].background; uint32_t *p_pixel = (uint32_t*)&p_src->p->p_pixels[y * p_src->p->i_pitch + 4*x]; + switch( opacity ) { /* Show video instead of this character */ case VBI_TRANSPARENT_SPACE: *p_pixel = 0; break; + /* Display foreground and background color */ /* To make the boxed text "closed captioning" transparent * change true to false. */ case VBI_OPAQUE: + /* alpha blend video into background color */ + case VBI_SEMI_TRANSPARENT: if( b_opaque ) break; /* Full text transparency. only foreground color is show */ case VBI_TRANSPARENT_FULL: - *p_pixel = 0; - break; - /* Transparency for boxed text */ - case VBI_SEMI_TRANSPARENT: - if( (*p_pixel) == 0xff000000 && 0 ) /* Disabled until someone implement borders */ + if( (*p_pixel) == (0xff000000 | p_page.color_map[background] ) ) *p_pixel = 0; break; } @@ -649,6 +642,7 @@ static int Opaque( vlc_object_t *p_this, char const *psz_cmd, vlc_mutex_lock( &p_sys->lock ); p_sys->b_opaque = newval.b_bool; + p_sys->b_update = true; vlc_mutex_unlock( &p_sys->lock ); return VLC_SUCCESS; @@ -667,17 +661,27 @@ static int Position( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } +#include +#define OSDMessage(dec, fmt, ...) do { \ + vout_thread_t *p_vout = vlc_object_find( dec, VLC_OBJECT_VOUT, FIND_ANYWHERE ); \ + if( p_vout ) { \ + vout_OSDMessage( p_vout, fmt, __VA_ARGS__ ); \ + vlc_object_release( p_vout ); \ + } } while(0) + static int EventKey( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - decoder_sys_t *p_sys = p_data; + decoder_t *p_dec = p_data; + decoder_sys_t *p_sys = p_dec->p_sys; + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); /* FIXME: Capture + and - key for subpage browsing */ if( newval.i_int == '-' || newval.i_int == '+' ) { vlc_mutex_lock( &p_sys->lock ); - if( p_sys->i_wanted_subpage == VBI_ANY_SUBNO ) + if( p_sys->i_wanted_subpage == VBI_ANY_SUBNO && newval.i_int == '+' ) p_sys->i_wanted_subpage = vbi_dec2bcd(1); else if ( newval.i_int == '+' ) p_sys->i_wanted_subpage = vbi_add_bcd( p_sys->i_wanted_subpage, 1); @@ -687,7 +691,7 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd, if ( !vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x00 ) || vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x99 ) ) p_sys->i_wanted_subpage = VBI_ANY_SUBNO; else - vout_OSDMessage( p_this, DEFAULT_CHAN, "%s: %d", _("Subpage"), vbi_bcd2dec( p_sys->i_wanted_subpage) ); + OSDMessage( p_this, SPU_DEFAULT_CHANNEL, "%s: %d", _("Subpage"), vbi_bcd2dec( p_sys->i_wanted_subpage) ); p_sys->b_update = true; vlc_mutex_unlock( &p_sys->lock ); @@ -701,17 +705,21 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd, p_sys->i_key[0] = p_sys->i_key[1]; p_sys->i_key[1] = p_sys->i_key[2]; p_sys->i_key[2] = (int)(newval.i_int - '0'); - vout_OSDMessage( p_this, DEFAULT_CHAN, "%s: %c%c%c", _("Page"), (char)(p_sys->i_key[0]+'0'), (char)(p_sys->i_key[1]+'0'), (char)(p_sys->i_key[2]+'0') ); + OSDMessage( p_this, SPU_DEFAULT_CHANNEL, "%s: %c%c%c", _("Page"), (char)(p_sys->i_key[0]+'0'), (char)(p_sys->i_key[1]+'0'), (char)(p_sys->i_key[2]+'0') ); + + int i_new_page = 0; if( p_sys->i_key[0] > 0 && p_sys->i_key[0] <= 8 && p_sys->i_key[1] >= 0 && p_sys->i_key[1] <= 9 && p_sys->i_key[2] >= 0 && p_sys->i_key[2] <= 9 ) { - p_sys->i_wanted_page = p_sys->i_key[0]*100 + p_sys->i_key[1]*10 + p_sys->i_key[2]; - p_sys->i_wanted_subpage = VBI_ANY_SUBNO; + i_new_page = p_sys->i_key[0]*100 + p_sys->i_key[1]*10 + p_sys->i_key[2]; p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0'; } vlc_mutex_unlock( &p_sys->lock ); + if( i_new_page > 0 ) + var_SetInteger( p_dec, "vbi-page", i_new_page ); + return VLC_SUCCESS; }