X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fnsv.c;h=8c0714a8802d78b68ccdac5798dbd29c53c62ab7;hb=6411526fe052a033300e73045b07c0aaee089e88;hp=56a76a8807c5f294d8cd5e4ee5e90097f644e689;hpb=ba616997914720d09aeb690a74429506d68da3c2;p=vlc diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c index 56a76a8807..8c0714a880 100644 --- a/modules/demux/nsv.c +++ b/modules/demux/nsv.c @@ -1,8 +1,8 @@ /***************************************************************************** * nsv.c: NullSoft Video demuxer. ***************************************************************************** - * Copyright (C) 2004 VideoLAN - * $Id: nsv.c,v 1.4 2004/01/07 15:31:31 fenrir Exp $ + * Copyright (C) 2004-2007 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,16 +18,19 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include +#include /* TODO: * - implement NSVf parsing (to get meta data) @@ -44,6 +47,8 @@ static void Close ( vlc_object_t * ); vlc_module_begin(); set_description( _("NullSoft demuxer" ) ); set_capability( "demux2", 10 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); set_callbacks( Open, Close ); add_shortcut( "nsv" ); vlc_module_end(); @@ -60,6 +65,9 @@ struct demux_sys_t es_format_t fmt_video; es_out_id_t *p_video; + es_format_t fmt_sub; + es_out_id_t *p_sub; + int64_t i_pcr; int64_t i_time; int64_t i_pcr_inc; @@ -81,22 +89,16 @@ static int Open( vlc_object_t *p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - uint8_t *p_peek; - int i; + const uint8_t *p_peek; if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) - { - msg_Err( p_demux, "cannot peek" ); return VLC_EGENERIC; - } - if( strncmp( p_peek, "NSVf", 4 ) && strncmp( p_peek, "NSVs", 4 )) + + if( memcmp( p_peek, "NSVf", 4 ) && memcmp( p_peek, "NSVs", 4 ) ) { /* In case we had force this demuxer we try to resynch */ - if( strcmp( p_demux->psz_demux, "nsv" ) || ReSynch( p_demux ) ) - { - msg_Warn( p_demux, "NSV module discarded" ); + if( !p_demux->b_force || ReSynch( p_demux ) ) return VLC_EGENERIC; - } } /* Fill p_demux field */ @@ -110,6 +112,9 @@ static int Open( vlc_object_t *p_this ) es_format_Init( &p_sys->fmt_video, VIDEO_ES, 0 ); p_sys->p_video = NULL; + es_format_Init( &p_sys->fmt_sub, SPU_ES, 0 ); + p_sys->p_sub = NULL; + p_sys->i_pcr = 1; p_sys->i_time = 0; p_sys->i_pcr_inc = 0; @@ -137,7 +142,7 @@ static int Demux( demux_t *p_demux ) demux_sys_t *p_sys = p_demux->p_sys; uint8_t header[5]; - uint8_t *p_peek; + const uint8_t *p_peek; int i_size; block_t *p_frame; @@ -150,14 +155,14 @@ static int Demux( demux_t *p_demux ) return 0; } - if( !strncmp( p_peek, "NSVf", 4 ) ) + if( !memcmp( p_peek, "NSVf", 4 ) ) { if( ReadNSVf( p_demux ) ) { return -1; } } - else if( !strncmp( p_peek, "NSVs", 4 ) ) + else if( !memcmp( p_peek, "NSVs", 4 ) ) { if( ReadNSVs( p_demux ) ) { @@ -177,7 +182,7 @@ static int Demux( demux_t *p_demux ) } else { - msg_Err( p_demux, "invalid signature 0x%x (%4.4s)", *(uint32_t*)p_peek, (char*)p_peek ); + msg_Err( p_demux, "invalid signature 0x%x (%4.4s)", GetDWLE( p_peek ), (const char*)p_peek ); if( ReSynch( p_demux ) ) { return -1; @@ -198,8 +203,68 @@ static int Demux( demux_t *p_demux ) i_size = ( header[0] >> 4 ) | ( header[1] << 4 ) | ( header[2] << 12 ); if( i_size > 0 ) { + /* extra data ? */ + if( (header[0]&0x0f) != 0x0 ) + { + uint8_t aux[6]; + int i_aux; + vlc_fourcc_t fcc; + if( stream_Read( p_demux->s, aux, 6 ) < 6 ) + { + msg_Warn( p_demux, "cannot read" ); + return 0; + } + i_aux = GetWLE( aux ); + fcc = VLC_FOURCC( aux[2], aux[3], aux[4], aux[5] ); + + msg_Dbg( p_demux, "Belekas: %d - size=%d fcc=%4.4s", + header[0]&0xf, i_aux, (char*)&fcc ); + + if( fcc == VLC_FOURCC( 'S', 'U', 'B', 'T' ) && i_aux > 2 ) + { + if( p_sys->p_sub == NULL ) + { + p_sys->fmt_sub.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); + p_sys->p_sub = es_out_Add( p_demux->out, &p_sys->fmt_sub ); + es_out_Control( p_demux->out, ES_OUT_SET_ES, p_sys->p_sub ); + } + stream_Read( p_demux->s, NULL, 2 ); + + if( ( p_frame = stream_Block( p_demux->s, i_aux - 2 ) ) ) + { + uint8_t *p = p_frame->p_buffer; + + while( p < &p_frame->p_buffer[p_frame->i_buffer] && *p != 0 ) + { + p++; + } + if( *p == 0 && p + 1 < &p_frame->p_buffer[p_frame->i_buffer] ) + { + p_frame->i_buffer -= p + 1 - p_frame->p_buffer; + p_frame->p_buffer = p + 1; + } + + /* Skip the first part (it is the language name) */ + p_frame->i_pts = p_sys->i_pcr; + p_frame->i_dts = p_sys->i_pcr + 4000000; /* 4s */ + + es_out_Send( p_demux->out, p_sys->p_sub, p_frame ); + } + } + else + { + /* We skip this extra data */ + if( stream_Read( p_demux->s, NULL, i_aux ) < i_aux ) + { + msg_Warn( p_demux, "cannot read" ); + return 0; + } + } + i_size -= 6 + i_aux; + } + /* msg_Dbg( p_demux, "frame video size=%d", i_size ); */ - if( ( p_frame = stream_Block( p_demux->s, i_size ) ) ) + if( i_size > 0 && ( p_frame = stream_Block( p_demux->s, i_size ) ) ) { p_frame->i_dts = p_sys->i_pcr; es_out_Send( p_demux->out, p_sys->p_video, p_frame ); @@ -300,13 +365,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *pi64 = 0; return VLC_EGENERIC; - case DEMUX_SET_TIME: #endif case DEMUX_GET_FPS: pf = (double*)va_arg( args, double * ); *pf = (double)1000000.0 / (double)p_sys->i_pcr_inc; return VLC_SUCCESS; + case DEMUX_SET_TIME: default: return VLC_EGENERIC; } @@ -317,7 +382,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *****************************************************************************/ static int ReSynch( demux_t *p_demux ) { - uint8_t *p_peek; + const uint8_t *p_peek; int i_skip; int i_peek; @@ -331,7 +396,8 @@ static int ReSynch( demux_t *p_demux ) while( i_skip < i_peek - 4 ) { - if( !strncmp( p_peek, "NSVf", 4 ) || !strncmp( p_peek, "NSVs", 4 ) ) + if( !memcmp( p_peek, "NSVf", 4 ) + || !memcmp( p_peek, "NSVs", 4 ) ) { if( i_skip > 0 ) { @@ -353,11 +419,11 @@ static int ReSynch( demux_t *p_demux ) *****************************************************************************/ static int ReadNSVf( demux_t *p_demux ) { - demux_sys_t *p_sys = p_demux->p_sys; - uint8_t *p; + /* demux_sys_t *p_sys = p_demux->p_sys; */ + const uint8_t *p; int i_size; - msg_Dbg( p_demux, "New NSVf chunk" ); + msg_Dbg( p_demux, "new NSVf chunk" ); if( stream_Peek( p_demux->s, &p, 8 ) < 8 ) { return VLC_EGENERIC; @@ -383,7 +449,6 @@ static int ReadNSVs( demux_t *p_demux ) return VLC_EGENERIC; } - msg_Dbg( p_demux, "New NSVs chunk" ); /* Video */ switch( ( fcc = VLC_FOURCC( header[4], header[5], header[6], header[7] ) ) ) { @@ -391,10 +456,14 @@ static int ReadNSVs( demux_t *p_demux ) case VLC_FOURCC( 'V', 'P', '3', '1' ): fcc = VLC_FOURCC( 'V', 'P', '3', '1' ); break; + case VLC_FOURCC( 'V', 'P', '6', '0' ): + case VLC_FOURCC( 'V', 'P', '6', '1' ): + case VLC_FOURCC( 'V', 'P', '6', '2' ): + case VLC_FOURCC( 'H', '2', '6', '4' ): case VLC_FOURCC( 'N', 'O', 'N', 'E' ): break; default: - msg_Warn( p_demux, "unknow codec" ); + msg_Warn( p_demux, "unknown codec %4.4s", (char *)&fcc ); break; } if( fcc != VLC_FOURCC( 'N', 'O', 'N', 'E' ) && fcc != p_sys->fmt_video.i_codec ) @@ -423,10 +492,14 @@ static int ReadNSVs( demux_t *p_demux ) case VLC_FOURCC( 'P', 'C', 'M', ' ' ): fcc = VLC_FOURCC( 'a', 'r', 'a', 'w' ); break; + case VLC_FOURCC( 'A', 'A', 'C', ' ' ): + case VLC_FOURCC( 'A', 'A', 'C', 'P' ): + fcc = VLC_FOURCC( 'm', 'p', '4', 'a' ); + break; case VLC_FOURCC( 'N', 'O', 'N', 'E' ): break; default: - msg_Warn( p_demux, "unknow codec" ); + msg_Warn( p_demux, "unknown codec %4.4s", (char *)&fcc ); break; } @@ -444,25 +517,31 @@ static int ReadNSVs( demux_t *p_demux ) if( header[16]&0x80 ) { - switch( header[16]&0x7f ) + /* Fractional frame rate */ + switch( header[16]&0x03 ) { - case 1: /* 29.97 fps */ - p_sys->i_pcr_inc = 33367; + case 0: /* 30 fps */ + p_sys->i_pcr_inc = 33333; /* 300000/9 */ break; - case 3: /* 23.976 fps */ - p_sys->i_pcr_inc = 41708; + case 1: /* 29.97 fps */ + p_sys->i_pcr_inc = 33367; /* 300300/9 */ break; - case 5: /* 14.98 fps */ - p_sys->i_pcr_inc = 66755; + case 2: /* 25 fps */ + p_sys->i_pcr_inc = 40000; /* 360000/9 */ break; - default: - msg_Dbg( p_demux, "unknow fps (0x%x)", header[16] ); - p_sys->i_pcr_inc = 40000; + case 3: /* 23.98 fps */ + p_sys->i_pcr_inc = 41700; /* 375300/9 */ break; } + + if( header[16] < 0xc0 ) + p_sys->i_pcr_inc = p_sys->i_pcr_inc * (((header[16] ^ 0x80) >> 2 ) +1 ); + else + p_sys->i_pcr_inc = p_sys->i_pcr_inc / (((header[16] ^ 0xc0) >> 2 ) +1 ); } else if( header[16] != 0 ) { + /* Integer frame rate */ p_sys->i_pcr_inc = 1000000 / header[16]; } else @@ -470,7 +549,7 @@ static int ReadNSVs( demux_t *p_demux ) msg_Dbg( p_demux, "invalid fps (0x00)" ); p_sys->i_pcr_inc = 40000; } - msg_Dbg( p_demux, " - fps=%.3f", 1000000.0 / (double)p_sys->i_pcr_inc ); + //msg_Dbg( p_demux, " - fps=%.3f", 1000000.0 / (double)p_sys->i_pcr_inc ); return VLC_SUCCESS; }