[MPlayer-dev-eng] [PATCH] fix -subcc for TiVo/tystreams

[Diego Biurrun]

On Wed, Sep 27, 2006 at 10:17:47AM -0500, Doug Swarin wrote:
> Some time ago I wrote a patch that fixed -subcc to work for TiVo
> streams, so that closed captions would display properly.
> 
> I sent the patch in to the list, but other than some comments about
> the patch itself (which I attempted to rectify) I received no mail
> about the actual fixes.
> 
> If possible, I would like to have this patch integrated into the main
> trunk. Without it, closed caption display simply does not work on
> streams extracted from a TiVo.
> 
> The patch does change -subcc to take an argument (specifying which
> caption streams to display). I have updated the documentation to the
> best of my ability.

> --- DOCS/man/zh/mplayer.1	(revision 19993)
> +++ DOCS/man/zh/mplayer.1	(working copy)
> @@ -854,7 +854,7 @@
>  ??????????OSD????????????. ????????????????????????????????????????????.
>  255????????0????????.
>  .TP
> -.B \-subcc \
> +.B \-subcc 1 \

This (and the change to the other translations) looks bogus, leave it
out.

> --- DOCS/man/en/mplayer.1	(revision 19993)
> +++ DOCS/man/en/mplayer.1	(working copy)
> @@ -2145,13 +2145,16 @@
>  .PD 1
>  .
>  .TP
> -.B "\-subcc \ "
> -Display DVD Closed Caption (CC) subtitles.
> +.B "\-subcc <0\-3> \ "
> +Display Closed Caption (CC) or Extended Data Service (XDS) subtitles.
>  These are
>  .B not
>  the VOB subtitles, these are special ASCII subtitles for the
>  hearing impaired encoded in the VOB userdata stream on most region 1 DVDs.
>  CC subtitles have not been spotted on DVDs from other regions so far.
> +.
> +Passing -subcc 1 will show Closed Caption subtitles. Passing -subcc 2 will
> +show XDS subtitles. Passing -subcc 3 will show both types.

And what does 0 do?

The formatting could be improved.  Look at some of the other option
descriptions where individual values are documented and copy + paste
from there.

> --- cfg-common.h	(revision 19993)
> +++ cfg-common.h	(working copy)
> @@ -281,8 +281,7 @@
>  	// specify IFO file for VOBSUB subtitle
>  	{"ifo", &spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  	// enable Closed Captioning display
> -	{"subcc", &subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL},
> -	{"nosubcc", &subcc_enabled, CONF_TYPE_FLAG, 0, 1, 0, NULL},
> +	{"subcc", &subcc_enabled, CONF_TYPE_INT, 0, 0, 1, NULL},

If it's no longer a flag option, then the variable name should be
changed to reflect this IMO.  Possibly in a separate patch, though.

Diego