RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

TiVo demuxer and sub-cc/osd decoder

Browse Source 
patch by usenet@wingert.org
(http://tivo-mplayer.sourceforge.net/releases/MPlayer-20030501-tivo-patch.gz)
changes by me:
- spit demux_ty to demux_ty and demux_ty_osd (later handles mpeg user-data
  decoding, ie sub-cc and osd)
- removed some cosmetics changes
- some compile fixes (gcc3 specific variable decl etc)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10264 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-06-09 00:24:49 +00:00
parent 14328b41fe
commit 080311d08f
7 changed files with 2025 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/Makefile
View File

@ -3,7 +3,7 @@ LIBNAME = libmpdemux.a
include ../config.mak
SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c
SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c
ifeq ($(XMMS_PLUGINS),yes)
SRCS += demux_xmms.c
endif

1056
libmpdemux/demux_ty.c Normal file
View File

File diff suppressed because it is too large Load Diff

907
libmpdemux/demux_ty_osd.c Normal file
View File

@ -0,0 +1,907 @@
// Most of this was written by mbm@linux.com and released on the GPL2 License.
//
// Modifications and SEVERE cleanup of the code was done by
// Christopher Wingert
// Copyright 2003
//
// Released under GPL2 License.
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
#include <stdarg.h>
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
//#include "stream.h"
//#include "demuxer.h"
//#include "parse_es.h"
//#include "stheader.h"
//#include "mp3_hdr.h"
//#include "../subreader.h"
#include "../sub_cc.h"
#include "../libvo/sub.h"
//#include "dvdauth.h"
extern int sub_justify;
#define TY_TEXT_MODE ( 1 << 0 )
#define TY_OSD_MODE ( 1 << 1 )
static int TY_OSD_flags = TY_TEXT_MODE | TY_OSD_MODE;
static int TY_OSD_debug = 0;
// ===========================================================================
// Closed Caption Decoding and OSD Presentation
// ===========================================================================
#define TY_CCNONE ( -3 )
#define TY_CCTEXTMODE ( -2 )
#define TY_CCPOPUPNB ( -1 )
#define TY_CCPOPUP ( 0 )
#define TY_CCPAINTON ( 1 )
#define TY_CC_MAX_X ( 45 )
static int TY_CC_CUR_X;
static int TY_CC_CUR_Y;
static int TY_CC_stat = TY_CCNONE;
static char TY_CC_buf[ 255 ];
static char *TY_CC_ptr = TY_CC_buf;
static unsigned TY_CC_lastcap = 0;
static int TY_CC_TextItalic;
static int TY_CC_Y_Offset;
static subtitle ty_OSD1;
static subtitle ty_OSD2;
static subtitle *ty_pOSD1;
static subtitle *ty_pOSD2;
static int tyOSDInited = 0;
static int tyOSDUpdate = 0;
static void ty_DrawOSD()
{
// printf( "Calling ty_DrawOSD()\n" );
tyOSDUpdate = 1;
}
void ty_ClearOSD( int start )
{
int index;
// printf( "Calling ty_ClearOSD()\n" );
for ( index = start ; index < SUB_MAX_TEXT ; index++ )
{
memset( ty_OSD1.text[ index ], ' ', TY_CC_MAX_X - 1 );
ty_OSD1.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
memset( ty_OSD2.text[ index ], ' ', TY_CC_MAX_X - 1 );
ty_OSD2.text[ index ][ TY_CC_MAX_X - 1 ] = 0;
}
}
static void ty_DrawChar( int *x, int *y, char disChar, int fgColor, int bgColor )
{
int index;
int cx;
int cy;
cx = *x;
cy = *y;
if ( *x >= ( TY_CC_MAX_X - 1 ) )
{
cx = 0;
}
if ( ( *y + TY_CC_Y_Offset ) > SUB_MAX_TEXT )
{
cy = SUB_MAX_TEXT - TY_CC_Y_Offset - 1;
}
// printf( "Calling ty_DrawChar() x:%d y:%d %c fg:%d bg:%d\n",
// cx, cy, disChar, fgColor, bgColor );
ty_OSD1.text[ TY_CC_Y_Offset + cy ][ cx ] = disChar;
memset( &( ty_OSD1.text[ TY_CC_Y_Offset + cy ][ cx + 1 ] ), ' ',
TY_CC_MAX_X - cx - 2 );
( *x )++;
}
static void ty_RollupBuf( int dest, int source, int numLines )
{
int index;
// printf( "Calling ty_RollupBuf() dest:%d source %d, numLines %d\n",
// dest, source, numLines );
//
if ( ( source + TY_CC_Y_Offset + numLines ) > SUB_MAX_TEXT )
{
ty_ClearOSD( 1 );
return;
}
if ( ( source + TY_CC_Y_Offset + numLines ) < 0 )
{
ty_ClearOSD( 1 );
return;
}
if ( numLines > SUB_MAX_TEXT )
{
ty_ClearOSD( 1 );
return;
}
for ( index = 0 ; index < numLines ; index++ )
{
strcpy( ty_OSD1.text[ TY_CC_Y_Offset + dest ],
ty_OSD1.text[ TY_CC_Y_Offset + source ] );
dest++;
source++;
}
memset( ty_OSD1.text[ TY_CC_Y_Offset + source - 1 ], ' ', TY_CC_MAX_X - 1 );
ty_OSD1.text[ TY_CC_Y_Offset + source - 1 ][ TY_CC_MAX_X - 1 ] = 0;
}
static void ty_drawchar( char c )
{
if ( c < 2 ) return;
if ( TY_OSD_flags & TY_OSD_MODE && TY_CC_stat != TY_CCNONE &&
TY_CC_CUR_Y != -1 )
ty_DrawChar( &TY_CC_CUR_X, &TY_CC_CUR_Y, c, 4, 13 );
if ( TY_CC_ptr - TY_CC_buf > sizeof( TY_CC_buf ) - 1 )
{ // buffer overflow
TY_CC_ptr = TY_CC_buf;
memset( TY_CC_buf, 0, sizeof( TY_CC_buf ) );
}
*( TY_CC_ptr++ ) = ( c == 14 ) ? '/' : c; // swap a '/' for musical note
}
static void ty_draw()
{
if ( TY_CC_ptr != TY_CC_buf && TY_OSD_flags & TY_TEXT_MODE )
{
if ( *( TY_CC_ptr - 1 ) == '\n' ) *( TY_CC_ptr - 1 ) = 0;
mp_msg( MSGT_DEMUX, MSGL_V, "CC: %s\n", TY_CC_buf );
}
TY_CC_lastcap = time( NULL );
TY_CC_ptr = TY_CC_buf;
memset( TY_CC_buf, 0, sizeof( TY_CC_buf) );
if ( TY_OSD_flags & TY_OSD_MODE ) ty_DrawOSD();
if ( TY_CC_TextItalic ) TY_CC_TextItalic = 0;
}
static int CC_last = 0;
static char CC_mode = 0;
static int CC_row[] =
{
11, -1, 1, 2, 3, 4, 12, 13, 14, 15, 5, 6, 7, 8, 9, 10
};
// char specialchar[] = { '®', '°', '½', '¿', '*', '¢', '£', 14, 'à', ' ', 'è', 'â', 'ê', 'î', 'ô', 'û' };
static int ty_CCdecode( char b1, char b2 )
{
int x;
int data = ( b2 << 8 ) + b1;
if ( b1 & 0x60 ) // text
{
if ( !TY_OSD_debug && TY_CC_stat == TY_CCNONE ) return 0;
if ( TY_OSD_debug > 3 )
{
mp_msg( MSGT_DEMUX, MSGL_DBG3, "%c %c", b1, b2 );
}
ty_drawchar( b1 );
ty_drawchar( b2 );
if ( TY_CC_stat > 0 && TY_OSD_flags & TY_OSD_MODE ) ty_DrawOSD();
}
else if ( ( b1 & 0x10 ) && ( b2 > 0x1F ) && ( data != CC_last ) )
{
#define CURRENT ( ( b1 & 0x08 ) >> 3 )
if ( CC_mode != CURRENT && TY_CC_stat != TY_CCNONE )
{
if ( TY_OSD_debug && TY_CC_ptr != TY_CC_buf ) ty_draw();
TY_CC_stat = TY_CCNONE;
return 0;
}
if ( TY_CC_stat == TY_CCNONE || TY_CC_CUR_Y == -1 )
{
if ( TY_CC_ptr != TY_CC_buf )
{
if ( TY_OSD_debug )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "(TY_OSD_debug) %s\n",
TY_CC_buf );
TY_CC_ptr = TY_CC_buf;
memset(TY_CC_buf, 0, sizeof(TY_CC_buf));
}
if ( CC_mode != CURRENT ) return 0;
}
// preamble address code (row & indent)
if ( b2 & 0x40 )
{
TY_CC_CUR_Y = CC_row[ ( ( b1 << 1 ) & 14 ) | ( ( b2 >> 5 ) & 1 ) ];
// Offset into MPlayer's Buffer
if ( ( TY_CC_CUR_Y >= 1 ) && ( TY_CC_CUR_Y <= 4 ) )
{
TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 1;
}
if ( ( TY_CC_CUR_Y >= 5 ) && ( TY_CC_CUR_Y <= 10 ) )
{
TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 5;
}
if ( ( TY_CC_CUR_Y >= 12 ) && ( TY_CC_CUR_Y <= 15 ) )
{
TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 12;
}
if ( TY_OSD_debug > 3 )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "<< preamble %d >>\n", TY_CC_CUR_Y );
// we still have something in the text buffer
if (TY_CC_ptr != TY_CC_buf)
{
*(TY_CC_ptr++) = '\n';
if ( TY_CC_TextItalic )
{
TY_CC_TextItalic = 0;
}
}
TY_CC_CUR_X = 1;
// row contains indent flag
if ( b2 & 0x10 )
{
for ( x = 0 ; x < ( ( b2 & 0x0F ) << 1 ) ; x++ )
{
TY_CC_CUR_X++;
*(TY_CC_ptr++) = ' ';
}
}
}
else
// !(b2 & 0x40)
{
if ( TY_OSD_debug > 3 )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "<< %02x >>\n", b1 & 0x7 );
switch (b1 & 0x07)
{
case 0x00: // attribute
{
if ( TY_OSD_debug > 1 )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "<<A: %d>>\n", b2 );
break;
}
case 0x01: // midrow or char
{
switch (b2 & 0x70)
{
case 0x20: // midrow attribute change
{
switch (b2 & 0x0e)
{
case 0x00: // italics off
{
TY_CC_TextItalic = 0;
*(TY_CC_ptr++) = ' ';
break;
}
case 0x0e: // italics on
{
ty_drawchar(' ');
TY_CC_TextItalic = 1;
break;
}
default:
{
if ( TY_OSD_debug > 1 )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "<<D: %d>>\n",
b2 & 0x0e );
}
}
if ( b2 & 0x01 )
{
// TextUnderline = 1;
}
else
{
// TextUnderline = 0;
}
break;
}
case 0x30: // special character..
{
// transparent space
if ( ( b2 & 0x0f ) == 9 )
{
TY_CC_CUR_X++;
*(TY_CC_ptr++) = ' ';
}
else
{
// ty_drawchar(specialchar[ b2 & 0x0f ] );
ty_drawchar( ' ' );
}
break;
}
}
break;
}
case 0x04: // misc
case 0x05: // misc + F
{
if ( TY_OSD_debug > 3 )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "<< misc %02x >>\n", b2 );
switch ( b2 )
{
case 0x20: // resume caption (new caption)
{
if ( TY_OSD_flags & TY_OSD_MODE &&
TY_CC_stat != TY_CCPOPUP )
ty_ClearOSD( 1 );
TY_CC_stat = TY_CCPOPUP;
break;
}
case 0x21: // backspace
{
TY_CC_CUR_X--;
break;
}
case 0x25 ... 0x27: // 2-4 row captions
{
if ( TY_CC_stat == TY_CCPOPUP ) ty_ClearOSD( 1 );
TY_CC_stat = b2 - 0x23;
if ( TY_CC_CUR_Y < TY_CC_stat ) TY_CC_CUR_Y = TY_CC_stat;
break;
}
case 0x29: // resume direct caption
{
TY_CC_stat = TY_CCPAINTON;
break;
}
case 0x2A: // text restart
{
ty_draw();
/* FALL */
}
case 0x2B: // resume text display
{
TY_CC_stat = TY_CCTEXTMODE;
break;
}
case 0x2C: // erase displayed memory
{
TY_CC_lastcap = 0;
if ( TY_OSD_flags & TY_OSD_MODE )
{
if ( TY_CC_stat > TY_CCPOPUP || TY_CC_ptr == TY_CC_buf )
{
ty_ClearOSD( 1 );
ty_draw();
}
else
{
ty_ClearOSD( 1 );
// CRW -
// new buffer
// Used to be a buffer swap here, dunno why
}
}
break;
}
case 0x2D: // carriage return
{
ty_draw();
TY_CC_CUR_X = 1;
if ( TY_OSD_flags & TY_OSD_MODE )
{
if ( TY_CC_stat > TY_CCPAINTON )
ty_RollupBuf
(
TY_CC_CUR_Y - TY_CC_stat + 1 ,
TY_CC_CUR_Y - TY_CC_stat + 2,
TY_CC_stat - 1
);
else
TY_CC_CUR_Y++;
}
break;
}
case 0x2F: // end caption + swap memory
{
ty_draw();
/* FALL THROUGH TO 0x2E */
}
case 0x2E: // erase non-displayed memory
{
if ( TY_OSD_debug && TY_CC_ptr != TY_CC_buf )
mp_msg( MSGT_DEMUX, MSGL_DBG3, "(TY_OSD_debug) %s\n",
TY_CC_buf );
if ( TY_OSD_flags & TY_OSD_MODE ) ty_ClearOSD( 1 );
TY_CC_CUR_X = 1;
TY_CC_CUR_Y = -1;
TY_CC_ptr = TY_CC_buf;
memset( TY_CC_buf, 0, sizeof( TY_CC_buf ) );
}
}
break;
}
case 0x07: // misc (TAB)
{
for ( x = 0 ; x < ( b2 - 0x20 ) ; x++ )
TY_CC_CUR_X++;
break;
}
}
}
}
CC_last = data;
return 0;
}
// ===========================================================================
// Extended Data Service Decoding and OSD Presentation
// ===========================================================================
#define XDS_BUFFER_LENGTH ( 16 )
#define XDS_DISPLAY_FRAMES ( 120 )
static char *ty_XDS_Display[ XDS_BUFFER_LENGTH ];
static int ty_XDSAddLine = -1;
static int ty_XDSDisplayCount = -1;
static void ty_AddXDSToDisplay( char *format, ... )
{
char line[ 80 ];
int index;
va_list ap;
if ( ty_XDSAddLine == -1 )
{
for( index = 0 ; index < XDS_BUFFER_LENGTH ; index++ )
{
ty_XDS_Display[ index ] = 0;
}
ty_XDSAddLine = 0;
}
va_start( ap, format );
vsnprintf( line, 80, format, ap );
va_end( ap );
mp_msg( MSGT_DEMUX, MSGL_V, "XDS: %s\n", line );
if ( ty_XDSAddLine == XDS_BUFFER_LENGTH )
{
mp_msg( MSGT_DEMUX, MSGL_ERR, "XDS Buffer would have been blown\n" );
}
if ( ty_XDS_Display[ ty_XDSAddLine ] != 0 )
{
free( ty_XDS_Display[ ty_XDSAddLine ] );
ty_XDS_Display[ ty_XDSAddLine ] = 0;
}
ty_XDS_Display[ ty_XDSAddLine ] = malloc( strlen( line ) + 1 );
strcpy( ty_XDS_Display[ ty_XDSAddLine ], line );
ty_XDSAddLine++;
}
static void ty_DisplayXDSInfo()
{
int index;
int size;
if ( ty_XDSDisplayCount == -1 )
{
for( index = 0 ; index < XDS_BUFFER_LENGTH ; index++ )
{
if ( ty_XDS_Display[ index ] != 0 )
{
break;
}
}
if ( index != XDS_BUFFER_LENGTH )
{
size = strlen( ty_XDS_Display[ index ] );
// Right Justify the XDS Stuff
memcpy( &( ty_OSD1.text[ 0 ][ TY_CC_MAX_X - size - 1 ] ),
ty_XDS_Display[ index ], size );
free( ty_XDS_Display[ index ] );
ty_XDS_Display[ index ] = 0;
ty_XDSDisplayCount = 0;
tyOSDUpdate = 1;
}
else
{
// We cleaned out all the XDS stuff to be displayed
ty_XDSAddLine = 0;
}
}
else
{
// We displayed that piece of XDS information long enough
// Lets move on
ty_XDSDisplayCount++;
if ( ty_XDSDisplayCount >= XDS_DISPLAY_FRAMES )
{
memset( ty_OSD1.text[ 0 ], ' ', TY_CC_MAX_X - 1 );
ty_OSD1.text[ 0 ][ TY_CC_MAX_X - 1 ] = 0;
ty_XDSDisplayCount = -1;
tyOSDUpdate = 1;
}
}
}
static int TY_XDS_mode = 0;
static int TY_XDS_type = 0;
static int TY_XDS_length = 0;
static char TY_XDS_checksum = 0;
// Array of [ Mode ][ Type ][ Length ]
static char TY_XDS [ 8 ][ 25 ][ 34 ];
static char TY_XDS_new[ 8 ][ 25 ][ 34 ];
// Array of [ MPAARating|TVRating ][ NumberRatings ]
static char *TY_XDS_CHIP[ 2 ][ 8 ] =
{
{ "(NOT APPLICABLE)", "G", "PG", "PG-13", "R", "NC-17", "X", "(NOT RATED)" },
{ "(NOT RATED)", "TV-Y", "TV-Y7", "TV-G", "TV-PG", "TV-14", "TV-MA",
"(NOT RATED)" }
};
static char *TY_XDS_modes[] =
{
"CURRENT", // 01h-02h current program
"FUTURE ", // 03h-04h future program
"CHANNEL", // 05h-06h channel
"MISC. ", // 07h-08h miscellaneous
"PUBLIC ", // 09h-0Ah public service
"RESERV.", // 0Bh-0Ch reserved
"UNDEF. ",
"INVALID",
"INVALID",
"INVALID"
};
static int ty_XDSdecode( char b1, char b2 )
{
char line[ 80 ];
if ( b1 < 0x0F )
{ // start packet
TY_XDS_length = 0;
TY_XDS_mode = b1 >> 1; // every other mode is a resume
TY_XDS_type = b2;
TY_XDS_checksum = b1 + b2;
return 0;
}
TY_XDS_checksum += b1 + b2;
// eof (next byte is checksum)
if ( b1 == 0x0F )
{
// validity check
if ( !TY_XDS_length || TY_XDS_checksum & 0x7F )
{
if ( TY_OSD_debug > 3 && !TY_XDS_length )
{
mp_msg( MSGT_DEMUX, MSGL_DBG3,
"%% TY_XDS CHECKSUM ERROR (ignoring)\n" );
}
else
{
TY_XDS_mode = 0;
TY_XDS_type = 0;
return 1;
}
}
// check to see if the data has changed.
if ( strncmp( TY_XDS[ TY_XDS_mode ][ TY_XDS_type ],
TY_XDS_new[ TY_XDS_mode ][ TY_XDS_type ], TY_XDS_length - 1 ) )
{
char *TY_XDS_ptr = TY_XDS[ TY_XDS_mode ][ TY_XDS_type ];
TY_XDS_ptr[ TY_XDS_length ] = 0;
memcpy( TY_XDS[ TY_XDS_mode ][ TY_XDS_type ],
TY_XDS_new[ TY_XDS_mode ][ TY_XDS_type ], TY_XDS_length );
// nasty hack: only print time codes if seconds are 0
if ( TY_XDS_mode == 3 && TY_XDS_type == 1 &&
!( TY_XDS_new[ 3 ][ 1 ][ 3 ] & 0x20 ) )
{
return 0;
}
if ( TY_XDS_mode == 0 && TY_XDS_type == 2 &&
( TY_XDS_new[ 0 ][ 2 ][ 4 ] & 0x3f ) > 1 )
{
return 0;
}
mp_msg( MSGT_DEMUX, MSGL_DBG3, "%% %s ", TY_XDS_modes[ TY_XDS_mode ] );
line[ 0 ] = 0;
// printf( "XDS Code %x\n",
// ( TY_XDS_mode << 9 ) + TY_XDS_type + 0x100 );
switch ( ( TY_XDS_mode << 9 ) + TY_XDS_type + 0x100 )
{
// cases are specified in 2 bytes hex representing mode, type.
// TY_XDS_ptr will point to the current class buffer
case 0x0101: // current
case 0x0301: // future
{
char *mon[] =
{
"0", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
"Aug", "Sep", "Oct", "Nov", "Dec", "13", "14", "15"
};
ty_AddXDSToDisplay( "AIR DATE: %s %2d %d:%02d:00",
mon[ TY_XDS_ptr[ 3 ] & 0x0f ],
TY_XDS_ptr[ 2 ] & 0x1f,
TY_XDS_ptr[ 1 ] & 0x1f,
TY_XDS_ptr[ 0 ] & 0x3f
);
// Program is tape delayed
if ( TY_XDS_ptr[ 3 ] & 0x10 ) ty_AddXDSToDisplay( " TAPE" );
}
break;
case 0x0102: // current program length
case 0x0302: // future
{
ty_AddXDSToDisplay(
"DURATION: %d:%02d:%02d of %d:%02d:%02d",
TY_XDS_ptr[ 3 ] & 0x3f,
TY_XDS_ptr[ 2 ] & 0x3f,
TY_XDS_ptr[ 4 ] & 0x3f,
TY_XDS_ptr[ 1 ] & 0x3f,
TY_XDS_ptr[ 0 ] & 0x3f, 0);
break;
}
case 0x0103: // current program name
case 0x0303: // future
{
ty_AddXDSToDisplay( "TITLE: %s", TY_XDS_ptr );
break;
}
case 0x0104: // current program type
case 0x0304: // future
{
// for now just print out the raw data
// requires a 127 string array to parse
// properly and isn't worth it.
sprintf ( line, "%sGENRE:", line );
{
int x;
for ( x = 0 ; x < TY_XDS_length ; x++ )
sprintf( line, "%s %02x", line, TY_XDS_ptr[ x ] );
}
ty_AddXDSToDisplay( line );
break;
}
case 0x0105: // current program rating
case 0x0305: // future
{
sprintf( line, "%sRATING: %s", line,
TY_XDS_CHIP[ ( TY_XDS_ptr[ 0 ] & 0x08 ) >> 3 ]
[ TY_XDS_ptr[ 1 ] & 0x07 ] );
if ( TY_XDS_ptr[ 0 ] & 0x20 )
sprintf( line, "%s DIALOGUE", line );
if ( TY_XDS_ptr[ 1 ] & 0x08 )
sprintf( line, "%s LANGUAGE", line );
if ( TY_XDS_ptr[ 1 ] & 0x10 )
sprintf( line, "%s SEXUAL", line );
if ( TY_XDS_ptr[ 1 ] & 0x20 )
sprintf( line, "%s VIOLENCE", line );
ty_AddXDSToDisplay( line );
// raw output for verification.
if ( TY_OSD_debug > 1 )
mp_msg( MSGT_DEMUX, MSGL_DBG3, " (%02x %02x)",
TY_XDS_ptr[ 0 ], TY_XDS_ptr[ 1 ] );
break;
}
case 0x0106: // current program audio services
case 0x0306: // future
{
// requires table, never actually seen it used either
ty_AddXDSToDisplay( "AUDIO: %02x %02x", TY_XDS_ptr[ 0 ],
TY_XDS_ptr[ 1 ] );
break;
}
case 0x0109: // current program aspect ratio
case 0x0309: // future
{
// requires table, rare
ty_AddXDSToDisplay( "ASPECT: %02x %02x",
TY_XDS_ptr[ 0 ], TY_XDS_ptr[ 1 ] );
break;
}
case 0x0110 ... 0x0117: // program description
{
ty_AddXDSToDisplay( "DESCRIP: %s", TY_XDS_ptr );
break;
}
case 0x0501: // channel network name
{
ty_AddXDSToDisplay( "NETWORK: %s", TY_XDS_ptr );
break;
}
case 0x0502: // channel network call letters
{
ty_AddXDSToDisplay( "CALLSIGN: %s", TY_XDS_ptr );
break;
}
case 0x0701: // misc. time of day
{
#define TIMEZONE ( TY_XDS[ 3 ][ 4 ][ 0 ] & 0x1f )
#define DST ( ( TY_XDS[ 3 ][ 4 ][ 0 ] & 0x20 ) >> 5 )
struct tm tm =
{
0, // sec
( TY_XDS_ptr[ 0 ] & 0x3F ), // min
( TY_XDS_ptr[ 1 ] & 0x1F ), // hour
( TY_XDS_ptr[ 2 ] & 0x1F ), // day
( TY_XDS_ptr[ 3 ] & 0x1f ) - 1, // month
( TY_XDS_ptr[ 5 ] & 0x3f ) + 90, // year
0, // day of week
0, // day of year
0, // DST
};
time_t time_t = mktime( &tm );
char *timestr;
time_t -= ( ( TIMEZONE - DST ) * 60 * 60 );
timestr = ctime( &time_t );
timestr[ strlen( timestr ) - 1 ] = 0;
sprintf( line, "%sCUR.TIME: %s ", line, timestr );
if ( TY_XDS[ 3 ][ 4 ][ 0 ] )
{
sprintf( line, "%sUTC-%d", line, TIMEZONE );
if (DST) sprintf( line, "%s DST", line );
}
else
sprintf( line, "%sUTC", line );
ty_AddXDSToDisplay( line );
break;
}
case 0x0704: //misc. local time zone
{
sprintf( line, "%sTIMEZONE: UTC-%d",
line, TY_XDS_ptr[ 0 ] & 0x1f );
if ( TY_XDS_ptr[ 0 ] & 0x20 ) sprintf( line, "%s DST", line );
ty_AddXDSToDisplay( line );
break;
}
default:
{
mp_msg( MSGT_DEMUX, MSGL_DBG3, "UNKNOWN CLASS %d TYPE %d",
( TY_XDS_mode << 1 ) + 1, TY_XDS_type );
if ( TY_OSD_debug > 1 )
{
int x;
mp_msg( MSGT_DEMUX, MSGL_DBG3, "\nDUMP:\n" );
for ( x = 0 ; x < TY_XDS_length ; x++ )
mp_msg( MSGT_DEMUX, MSGL_DBG3, " %02x %c",
TY_XDS_ptr[ x ], TY_XDS_ptr[ x ] );
mp_msg( MSGT_DEMUX, MSGL_DBG3, "\n" );
}
}
}
if ( TY_OSD_debug > 1 )
mp_msg( MSGT_DEMUX, MSGL_DBG3, " (%d)", TY_XDS_length );
}
TY_XDS_mode = 0;
TY_XDS_type = 0;
}
else if ( TY_XDS_length < 34 )
{
TY_XDS_new[ TY_XDS_mode ][ TY_XDS_type ][ TY_XDS_length++ ] = b1;
TY_XDS_new[ TY_XDS_mode ][ TY_XDS_type ][ TY_XDS_length++ ] = b2;
}
return 0;
}
// 42 x 10
static char *testline = "0123456789012345678901234567890123456789012";
// ===========================================================================
// Callback from Video Display Processing to put up the OSD
// ===========================================================================
void ty_processuserdata( unsigned char* buf, int len )
{
int index;
sub_justify = 1;
if ( subcc_enabled )
{
if ( tyOSDInited == 0 )
{
for ( index = 0; index < SUB_MAX_TEXT ; index++ )
{
ty_OSD1.text[ index ] = malloc( TY_CC_MAX_X );
ty_OSD2.text[ index ] = malloc( TY_CC_MAX_X );
}
ty_ClearOSD( 0 );
ty_OSD1.lines = SUB_MAX_TEXT;
ty_OSD2.lines = SUB_MAX_TEXT;
ty_pOSD1 = &ty_OSD1;
ty_pOSD2 = &ty_OSD2;
tyOSDUpdate = 0;
tyOSDInited = 1;
}
if ( buf[ 0 ] == 0x01 )
{
ty_CCdecode( buf[ 1 ], buf[ 2 ] );
}
if ( buf[ 0 ] == 0x02 )
{
ty_XDSdecode( buf[ 1 ], buf[ 2 ] );
}
ty_DisplayXDSInfo();
if ( tyOSDUpdate )
{
// for ( index = 0; index < SUB_MAX_TEXT ; index++ )
// {
// printf( "OSD:%d:%s\n", index, ty_OSD1.text[ index ] );
// }
vo_sub = &ty_OSD1;
vo_osd_changed( OSDTYPE_SUBTITLE );
tyOSDUpdate = 0;
}
}
}

45
libmpdemux/demuxer.c
View File

@ -137,6 +137,8 @@ extern void demux_close_gif(demuxer_t* demuxer);
extern void demux_close_ts(demuxer_t* demuxer);
extern void demux_close_mkv(demuxer_t* demuxer);
extern void demux_close_ra(demuxer_t* demuxer);
extern void demux_close_ty(demuxer_t* demuxer);
#ifdef USE_TV
#include "tv.h"
@ -173,6 +175,8 @@ void free_demuxer(demuxer_t *demuxer){
demux_close_fli(demuxer); break;
case DEMUXER_TYPE_NUV:
demux_close_nuv(demuxer); break;
case DEMUXER_TYPE_MPEG_TY:
demux_close_ty(demuxer); break;
#if defined(USE_TV) && defined(HAVE_TV_V4L)
case DEMUXER_TYPE_TV:
demux_close_tv(demuxer); break;
@ -278,6 +282,7 @@ int demux_bmp_fill_buffer(demuxer_t *demux);
int demux_fli_fill_buffer(demuxer_t *demux);
int demux_mpg_es_fill_buffer(demuxer_t *demux);
int demux_mpg_fill_buffer(demuxer_t *demux);
int demux_ty_fill_buffer(demuxer_t *demux);
int demux_avi_fill_buffer(demuxer_t *demux);
int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds);
int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds);
@ -312,6 +317,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
case DEMUXER_TYPE_FILM: return demux_film_fill_buffer(demux);
case DEMUXER_TYPE_BMP: return demux_bmp_fill_buffer(demux);
case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux);
case DEMUXER_TYPE_MPEG_TY: return demux_ty_fill_buffer( demux );
case DEMUXER_TYPE_MPEG4_ES:
case DEMUXER_TYPE_H264_ES:
case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux);
@ -881,6 +887,18 @@ if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TS){
demuxer=NULL;
}
}
//=============== Try to open as MPEG-TY file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TY)
{
demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_TY,audio_id,video_id,dvdsub_id);
if(ds_fill_buffer(demuxer->video)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"TiVo (DeMuxer By WyngNut)");
file_format=DEMUXER_TYPE_MPEG_TY;
} else {
free_demuxer(demuxer);
demuxer = NULL;
}
}
//=============== Try to open as MPEG-PS file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
int pes=1;
@ -1187,6 +1205,26 @@ switch(file_format){
sh_video=d_video->sh;sh_video->ds=d_video;
break;
}
case DEMUXER_TYPE_MPEG_TY: {
sh_video=d_video->sh;sh_video->ds=d_video;
if(audio_id!=-2) {
if(!ds_fill_buffer(d_audio)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
sh_audio=NULL;
} else {
sh_audio=d_audio->sh;sh_audio->ds=d_audio;
switch(d_audio->id & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id)
case 0x00: sh_audio->format=0x50;break; // mpeg
case 0xA0: sh_audio->format=0x10001;break; // dvd pcm
case 0x80: sh_audio->format=0x2000;break; // ac3
default: sh_audio=NULL; // unknown type
}
}
}
break;
}
case DEMUXER_TYPE_MPEG_PS: {
sh_video=d_video->sh;sh_video->ds=d_video;
// if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD
@ -1303,6 +1341,7 @@ demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int
int demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_ty(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_y4m(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_film(demuxer_t *demuxer,float rel_seek_secs,int flags);
@ -1369,6 +1408,9 @@ switch(demuxer->file_format){
case DEMUXER_TYPE_ASF:
demux_seek_asf(demuxer,rel_seek_secs,flags); break;
case DEMUXER_TYPE_MPEG_TY:
demux_seek_ty(demuxer,rel_seek_secs,flags); break;
case DEMUXER_TYPE_H264_ES:
case DEMUXER_TYPE_MPEG4_ES:
@ -1475,6 +1517,7 @@ char* demux_info_get(demuxer_t *demuxer, char *opt) {
return NULL;
}
extern int demux_ty(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_mpg_control(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_asf_control(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_avi_control(demuxer_t *demuxer, int cmd, void *arg);
@ -1483,6 +1526,8 @@ extern int demux_mkv_control(demuxer_t *demuxer, int cmd, void *arg);
int demux_control(demuxer_t *demuxer, int cmd, void *arg) {
switch(demuxer->type) {
case DEMUXER_TYPE_MPEG_TY:
return demux_ty_control(demuxer,cmd,arg);
case DEMUXER_TYPE_MPEG4_ES:
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS:

3
libmpdemux/demuxer.h
View File

@ -41,11 +41,12 @@
#define DEMUXER_TYPE_H264_ES 30
#define DEMUXER_TYPE_MATROSKA 31
#define DEMUXER_TYPE_REALAUDIO 32
#define DEMUXER_TYPE_MPEG_TY 33
// This should always match the higest demuxer type number.
// Unless you want to disallow users to force the demuxer to some types
#define DEMUXER_TYPE_MIN 0
#define DEMUXER_TYPE_MAX 32
#define DEMUXER_TYPE_MAX 33
#define DEMUXER_TYPE_DEMUXERS (1<<16)
// A virtual demuxer type for the network code

12
libmpdemux/video.c
View File

@ -176,6 +176,7 @@ switch(d_video->demuxer->file_format){
case DEMUXER_TYPE_PVA:
case DEMUXER_TYPE_MPEG_TS:
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_TY:
case DEMUXER_TYPE_MPEG_PS: {
//mpeg_header_parser:
// Find sequence_header first:
@ -282,6 +283,8 @@ switch(d_video->demuxer->file_format){
return 1;
}
void ty_processuserdata( unsigned char* buf, int len );
static void process_userdata(unsigned char* buf,int len){
int i;
/* if the user data starts with "CC", assume it is a CC info packet */
@ -289,6 +292,11 @@ static void process_userdata(unsigned char* buf,int len){
// mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"video.c: process_userdata() detected Closed Captions!\n");
if(subcc_enabled) subcc_process_data(buf+2,len-2);
}
if( len > 2 && buf[ 0 ] == 'T' && buf[ 1 ] == 'Y' )
{
ty_processuserdata( buf + 2, len - 2 );
return;
}
if(verbose<2) return;
printf( "user_data: len=%3d %02X %02X %02X %02X '",
len, buf[0], buf[1], buf[2], buf[3]);
@ -312,6 +320,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS
|| demuxer->file_format==DEMUXER_TYPE_PVA || demuxer->file_format==DEMUXER_TYPE_MPEG_TS
|| demuxer->file_format==DEMUXER_TYPE_MPEG_TY
#ifdef STREAMING_LIVE_DOT_COM
|| (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer))
#endif
@ -473,7 +482,8 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS ||
demuxer->file_format==DEMUXER_TYPE_MPEG_TS ||
demuxer->file_format==DEMUXER_TYPE_MPEG_ES){
demuxer->file_format==DEMUXER_TYPE_MPEG_ES ||
demuxer->file_format==DEMUXER_TYPE_MPEG_TY){
// if(pts>0.0001) printf("\r!!! pts: %5.3f [%d] (%5.3f) \n",pts,picture_coding_type,i_pts);

3
libvo/sub.c
View File

@ -42,6 +42,7 @@ int sub_alignment=0; /* 0=top, 1=center, 2=bottom */
int sub_visibility=1;
int sub_bg_color=0; /* subtitles background color */
int sub_bg_alpha=0;
int sub_justify=0;
// return the real height of a char:
static inline int get_height(int c,int h){
@ -449,6 +450,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){
obj->bbox.y2 = obj->y + h;
// calculate bbox:
if (sub_justify) xmin = 10;
obj->bbox.x1=xmin;
obj->bbox.x2=xmax;
obj->bbox.y1=obj->y;
@ -462,6 +464,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){
i=j=0;
if ((l=obj->params.subtitle.lines)) for (;;) {
x=obj->params.subtitle.xtbl[i++];
if (sub_justify) x = 10;
prevc = -1;
while ((c=obj->params.subtitle.utbl[j++])){
x += kerning(vo_font,prevc,c);