RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Cleanup for uselessly complicated closed-caption subtitle handling 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-25 22:06:00 +00:00
parent 33d70768f9
commit 53ba4dd6eb
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/video.c
View File

@ -366,7 +366,7 @@ static void process_userdata(unsigned char* buf,int len){
/* if the user data starts with "CC", assume it is a CC info packet */
if(len>2 && buf[0]=='C' && buf[1]=='C'){
// mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"video.c: process_userdata() detected Closed Captions!\n");
if(subcc_enabled) subcc_process_data(buf+2,len-2);
subcc_process_data(buf+2,len-2);
}
if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' )
{

12
sub_cc.c
View File

@ -26,8 +26,6 @@
#include "libvo/sub.h"
#define CC_INPUTBUFFER_SIZE 256
#define CC_MAX_LINE_LENGTH 64
static char chartbl[128];
@ -38,8 +36,6 @@ static subtitle *fb,*bb;
static unsigned int cursor_pos=0;
static int inited=0;
static unsigned char inputbuffer[CC_INPUTBUFFER_SIZE];
static unsigned int inputlength;
static void build_char_table(void)
{
@ -186,7 +182,7 @@ static void cc_decode_EIA608(unsigned short int data)
lastcode=data;
}
static void subcc_decode(void)
static void subcc_decode(unsigned char *inputbuffer, unsigned int inputlength)
{
/* The first number may denote a channel number. I don't have the
* EIA-708 standard, so it is hard to say.
@ -284,13 +280,9 @@ static void subcc_decode(void)
void subcc_process_data(unsigned char *inputdata,unsigned int len)
{
if (len > CC_INPUTBUFFER_SIZE)
return;
if(!subcc_enabled) return;
if(!inited) subcc_init();
memcpy(inputbuffer,inputdata,len);
inputlength=len;
subcc_decode();
subcc_decode(inputdata, len);
}