From 53ba4dd6eb4ee641e2ee15507c0c1e85e0ced9bd Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 25 Nov 2006 22:06:00 +0000 Subject: Cleanup for uselessly complicated closed-caption subtitle handling git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/video.c | 2 +- sub_cc.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 9b15599a72..e1a7ae3fba 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -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' ) { diff --git a/sub_cc.c b/sub_cc.c index 28c4bdb2c3..d8b847541d 100644 --- a/sub_cc.c +++ b/sub_cc.c @@ -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); } -- cgit v1.2.3