Changeset 091aff73545a19bdb1c1706acecfc86e326e2734

Timestamp:

08/09/03 00:48:29 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1062974909 +0000

git-parent:

[fce2672fa627f847ba77f305b28f454a12f0daf2]

git-author:

Laurent Aimar <fenrir@videolan.org> 1062974909 +0000

Message:

• all : demuxers *have to* set pf_demux_control. (demux_vaControlDefault
  is a generic handler)
  
• avi, mp4 : begin to implement a specific pf_demux_control.
  

Files:

• modules/demux/a52sys.c (modified) (3 diffs)
• modules/demux/aac.c (modified) (3 diffs)
• modules/demux/asf/asf.c (modified) (3 diffs)
• modules/demux/asf/libasf.c (modified) (2 diffs)
• modules/demux/au.c (modified) (3 diffs)
• modules/demux/avi/avi.c (modified) (10 diffs)
• modules/demux/avi/libavi.c (modified) (2 diffs)
• modules/demux/demuxdump.c (modified) (2 diffs)
• modules/demux/flac.c (modified) (2 diffs)
• modules/demux/mkv.cpp (modified) (3 diffs)
• modules/demux/mp4/libmp4.c (modified) (52 diffs)
• modules/demux/mp4/mp4.c (modified) (17 diffs)
• modules/demux/mpeg/es.c (modified) (2 diffs)
• modules/demux/mpeg/m4v.c (modified) (2 diffs)
• modules/demux/mpeg/mpga.c (modified) (3 diffs)
• modules/demux/mpeg/ps.c (modified) (2 diffs)
• modules/demux/mpeg/ts.c (modified) (2 diffs)
• modules/demux/ogg.c (modified) (2 diffs)
• modules/demux/rawdv.c (modified) (2 diffs)
• modules/demux/wav.c (modified) (3 diffs)

modules/demux/a52sys.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2003/08/01 00:04:28
+5 2003/09/07 22:48:29
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -29 +29 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-
-#include <ninput.h>
-
-/*****************************************************************************
@@ -130 +128 @@
-
-    p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
-
-    p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );

modules/demux/aac.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2003/08/01 00:40:05
+3 2003/09/07 22:48:29
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -29 +29 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-
-#include <ninput.h>
-
-/*****************************************************************************
@@ -137 +135 @@
-
-    p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
-
-    p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );

modules/demux/asf/asf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
-6 2003/08/25 23:36:16
+7 2003/09/07 22:48:29
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -29 +29 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "ninput.h"
-
-#include "codecs.h"                        /* BITMAPINFOHEADER, WAVEFORMATEX */
@@ -118 +117 @@
-
-    /* Set p_input field */
-
+
+
-    p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
-    memset( p_sys, 0, sizeof( demux_sys_t ) );

modules/demux/asf/libasf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2003/08/24 15:05:27
+8 2003/09/07 22:48:29
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -25 +25 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "ninput.h"
-
-#include "codecs.h"                        /* BITMAPINFOHEADER, WAVEFORMATEX */

modules/demux/au.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-5 2003/08/22 20:32:27
+6 2003/09/07 22:48:29
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -31 +31 @@
-
-#include <codecs.h>
-#include <ninput.h>
-
-/*****************************************************************************
@@ -321 +320 @@
-
-        p_input->pf_demux = DemuxPCM;
+        p_input->pf_demux_control = demux_vaControlDefault;
-    }
-

modules/demux/avi/avi.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-59 2003/08/23 11:46:06
+60 2003/09/07 22:48:29
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -28 +28 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "ninput.h"
-#include "codecs.h"
-
@@ -59 +58 @@
- * Local prototypes
- *****************************************************************************/
+static int    Control         ( input_thread_t *, int, va_list );
-static int    Seek            ( input_thread_t *, mtime_t, int );
-static int    Demux_Seekable  ( input_thread_t * );
@@ -160 +160 @@
-    stream_Control( p_avi->s, STREAM_CAN_FASTSEEK, &p_avi->b_seekable );
-
+    p_input->pf_demux_control = Control;
-    p_input->pf_demux = Demux_Seekable;
-    /* For unseekable stream, automaticaly use Demux_UnSeekable */
@@ -461 +462 @@
-        msg_Warn( p_input, "broken or missing index, 'seek' will be axproximative or will have strange behavour" );
-    }
-
-    /* fix some BeOS MediaKit generated file */
-    for( i = 0 ; i < p_avi->i_streams; i++ )
@@ -657 +657 @@
-        return( 0 );
-    }
-
+
-    if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
-    {
@@ -679 +679 @@
-        }
-    }
-
+
-
-    /* wait for the good time */
@@ -1132 +1132 @@
- * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
- *****************************************************************************/
-
-
+
-{
-
@@ -1185 +1184 @@
-            }
-
-
+s
-            if( AVI_StreamChunkSet( p_input,
-                                    i_stream,
@@ -1254 +1253 @@
-}
-
+/*****************************************************************************
+ * Control:
+ *****************************************************************************
+ *
+ *****************************************************************************/
+static int    Control( input_thread_t *p_input, int i_query, va_list args )
+{
+    demux_sys_t *p_sys = p_input->p_demux_data;
+    double   f, *pf;
+    int64_t i64, *pi64;
+
+    switch( i_query )
+    {
+        case DEMUX_GET_POSITION:
+            pf = (double*)va_arg( args, double * );
+            if( p_sys->i_length > 0 )
+            {
+                *pf = (double)p_sys->i_time / (double)( p_sys->i_length * (mtime_t)1000000 );
+                return VLC_SUCCESS;
+            }
+            else if( stream_Size( p_sys->s ) > 0 )
+            {
+                unsigned int i;
+                int64_t i_tmp;
+
+                i64 = 0;
+                /* search the more advanced selected es */
+                for( i = 0; i < p_sys->i_streams; i++ )
+                {
+#define tk  p_sys->pp_info[i]
+                    if( tk->b_activated && tk->i_idxposc < tk->i_idxnb )
+                    {
+                        i_tmp = tk->p_index[tk->i_idxposc].i_pos +
+                                tk->p_index[tk->i_idxposc].i_length + 8;
+                        if( i_tmp > i64 )
+                        {
+                            i64 = i_tmp;
+                        }
+                    }
+#undef tk
+                }
+                *pf = (double)i64 / (double)stream_Size( p_sys->s );
+                return VLC_SUCCESS;
+            }
+            else
+            {
+                *pf = 0.0;
+                return VLC_SUCCESS;
+            }
+        case DEMUX_SET_POSITION:
+            if( p_sys->b_seekable )
+            {
+                int i_ret;
+
+                f = (double)va_arg( args, double );
+                i64 = (mtime_t)(1000000.0 * p_sys->i_length * f );
+                i_ret = Seek( p_input, i64, (int)(f * 100) );
+                if( p_sys->p_sub )
+                {
+                    subtitle_Seek( p_sys->p_sub, p_sys->i_time );
+                }
+                return i_ret;
+            }
+            else
+            {
+                return demux_vaControlDefault( p_input, i_query, args );
+            }
+        case DEMUX_GET_TIME:
+            pi64 = (int64_t*)va_arg( args, int64_t * );
+            *pi64 = p_sys->i_time;
+            return VLC_SUCCESS;
+
+        case DEMUX_SET_TIME:
+            msg_Err( p_input, "FIXME DEMUX_SET_TIME to be implemented" );
+            return VLC_EGENERIC;
+            /* return demux_vaControlDefault( p_input, i_query, args ); */
+
+        case DEMUX_GET_LENGTH:
+            pi64 = (int64_t*)va_arg( args, int64_t * );
+            *pi64 = p_sys->i_length * (mtime_t)1000000;
+            return VLC_SUCCESS;
+
+        default:
+            return demux_vaControlDefault( p_input, i_query, args );
+    }
+    return VLC_EGENERIC;
+}
-
-/*****************************************************************************

modules/demux/avi/libavi.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-5 2003/08/30 02:03:44
+6 2003/09/07 22:48:29
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -25 +25 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "ninput.h"
-#include "codecs.h"                                      /* BITMAPINFOHEADER */
-

modules/demux/demuxdump.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-9 2003/05/15 22:27:37 massiot
+10 2003/09/07 22:48:29 fenrir
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -85 +85 @@
-    /* Set the demux function */
-    p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
-
-    /* Initialize access plug-in structures. */

modules/demux/flac.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2003/08/17 13:56:26 gbazin
+5 2003/09/07 22:48:29 fenrir
- *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
@@ -73 +73 @@
-
-    p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
-    p_input->pf_rewind = NULL;
-

modules/demux/mkv.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-5 2003/08/26 19:43:51 hartman
+6 2003/09/07 22:48:29 fenrir
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -37 +37 @@
-#include <codecs.h>                        /* BITMAPINFOHEADER, WAVEFORMATEX */
-#include "iso_lang.h"
-#include "ninput.h"
-
-#include <iostream>
@@ -301 +300 @@
-    /* Set the demux function */
-    p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
-
-    /* peek the begining */

modules/demux/mp4/libmp4.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2003/08/17 23:02:52
+2 2003/09/07 22:48:29
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -520 +520 @@
-
-/*****************************************************************************
-MP4_
+
- *****************************************************************************
- * if p_box == NULL, go to the next box in witch we are( at the begining ).
@@ -567 +567 @@
- *       you need to call MP4_GotoBox to go where you want
- *****************************************************************************/
-
+static 
-{
-    MP4_Box_t *p_box;
@@ -608 +608 @@
-
-
-
+static 
-{
-    if( p_container->i_size <= (size_t)MP4_BOX_HEADERSIZE(p_container ) + 8 )
@@ -622 +622 @@
-}
-
-void MP4_FreeBox_Common( input_thread_t *p_input,
+static void MP4_FreeBox_Common(
-{
-    /* Up to now do nothing */
-}
-
-
+static 
-{
-    /* XXX sometime moov is hiden in a free box */
@@ -663 +663 @@
-}
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_ftyp_t );
@@ -689 +689 @@
-}
-
-void MP4_FreeBox_ftyp( input_thread_t *p_input,
+static void MP4_FreeBox_ftyp(
-{
-    FREE( p_box->data.p_ftyp->i_compatible_brands );
@@ -695 +695 @@
-
-
-
+static 
-{
-    unsigned int i;
@@ -767 +767 @@
-}
-
-
+static 
-{
-    unsigned int i;
@@ -831 +831 @@
-
-
-
+static 
-{
-    unsigned int i;
@@ -884 +884 @@
-
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_hdlr_t );
@@ -905 +905 @@
-}
-
-void MP4_FreeBox_hdlr( input_thread_t *p_input,
+static void MP4_FreeBox_hdlr(
-{
-    FREE( p_box->data.p_hdlr->psz_name );
-}
-
-
+static 
-{
-    unsigned int i;
@@ -934 +934 @@
-}
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_smhd_t );
@@ -954 +954 @@
-
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_hmhd_t );
@@ -978 +978 @@
-}
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_url_t );
@@ -994 +994 @@
-
-
-void MP4_FreeBox_url( input_thread_t *p_input,
+static void MP4_FreeBox_url(
-{
-    FREE( p_box->data.p_url->psz_location )
-}
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_urn_t );
@@ -1015 +1015 @@
-    MP4_READBOX_EXIT( 1 );
-}
-void MP4_FreeBox_urn( input_thread_t *p_input,
+static void MP4_FreeBox_urn(
-{
-    FREE( p_box->data.p_urn->psz_name );
@@ -1022 +1022 @@
-
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_dref_t );
@@ -1042 +1042 @@
-
-
-
+static 
-{
-    unsigned int i;
@@ -1069 +1069 @@
-}
-
-void MP4_FreeBox_stts( input_thread_t *p_input,
+static void MP4_FreeBox_stts(
-{
-    FREE( p_box->data.p_stts->i_sample_count );
@@ -1075 +1075 @@
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1103 +1103 @@
-}
-
-void MP4_FreeBox_ctts( input_thread_t *p_input,
+static void MP4_FreeBox_ctts(
-{
-    FREE( p_box->data.p_ctts->i_sample_count );
@@ -1124 +1124 @@
-}
-
-
+static 
-{
-#define es_descriptor p_box->data.p_esds->es_descriptor
@@ -1210 +1210 @@
-}
-
-void MP4_FreeBox_esds( input_thread_t *p_input,
+static void MP4_FreeBox_esds(
-{
-    FREE( p_box->data.p_esds->es_descriptor.psz_URL );
@@ -1220 +1220 @@
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1302 +1302 @@
-
-
-
+static 
-{
-    unsigned int i;
@@ -1368 +1368 @@
-
-
-
+static 
-{
-
@@ -1390 +1390 @@
-
-
-
+static 
-{
-    unsigned int i;
@@ -1422 +1422 @@
-}
-
-void MP4_FreeBox_stsz( input_thread_t *p_input,
+static void MP4_FreeBox_stsz(
-{
-    FREE( p_box->data.p_stsz->i_entry_size );
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1459 +1459 @@
-}
-
-void MP4_FreeBox_stsc( input_thread_t *p_input,
+static void MP4_FreeBox_stsc(
-{
-    FREE( p_box->data.p_stsc->i_first_chunk );
@@ -1466 +1466 @@
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1507 +1507 @@
-}
-
-void MP4_FreeBox_stco_co64( input_thread_t *p_input,
+static void MP4_FreeBox_stco_co64(
-{
-    FREE( p_box->data.p_co64->i_chunk_offset );
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1541 +1541 @@
-}
-
-void MP4_FreeBox_stss( input_thread_t *p_input,
+static void MP4_FreeBox_stss(
-{
-    FREE( p_box->data.p_stss->i_sample_number )
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1578 +1578 @@
-}
-
-void MP4_FreeBox_stsh( input_thread_t *p_input,
+static void MP4_FreeBox_stsh(
-{
-    FREE( p_box->data.p_stsh->i_shadowed_sample_number )
@@ -1585 +1585 @@
-
-
-
+static 
-{
-    unsigned int i;
@@ -1610 +1610 @@
-}
-
-void MP4_FreeBox_stdp( input_thread_t *p_input,
+static void MP4_FreeBox_stdp(
-{
-    FREE( p_box->data.p_stdp->i_priority )
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1654 +1654 @@
-}
-
-void MP4_FreeBox_padb( input_thread_t *p_input,
+static void MP4_FreeBox_padb(
-{
-    FREE( p_box->data.p_padb->i_reserved1 );
@@ -1662 +1662 @@
-}
-
-
+static 
-{
-    unsigned int i;
@@ -1712 +1712 @@
-}
-
-void MP4_FreeBox_elst( input_thread_t *p_input,
+static void MP4_FreeBox_elst(
-{
-    FREE( p_box->data.p_elst->i_segment_duration );
@@ -1720 +1720 @@
-}
-
-
+static 
-{
-    unsigned int i_language;
@@ -1749 +1749 @@
-}
-
-void MP4_FreeBox_cprt( input_thread_t *p_input,
+static void MP4_FreeBox_cprt(
-{
-    FREE( p_box->data.p_cprt->psz_notice );
@@ -1755 +1755 @@
-
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_dcom_t );
@@ -1768 +1768 @@
-}
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_cmvd_t );
@@ -1796 +1796 @@
-    MP4_READBOX_EXIT( 1 );
-}
-void MP4_FreeBox_cmvd( input_thread_t *p_input,
+static void MP4_FreeBox_cmvd(
-{
-    FREE( p_box->data.p_cmvd->p_data );
@@ -1802 +1802 @@
-
-
-
+static 
-{
-    MP4_Stream_t *p_stream_memory;
@@ -1938 +1938 @@
-}
-
-
+static 
-{
-    uint32_t i_len;
@@ -1970 +1970 @@
-    MP4_READBOX_EXIT( 1 );
-}
-
+
+
-{
-    FREE( p_box->data.p_rdrf->psz_ref )
@@ -1976 +1977 @@
-
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_rmdr_t );
@@ -1992 +1993 @@
-}
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_rmqu_t );
@@ -2006 +2007 @@
-}
-
-
+static 
-{
-    MP4_READBOX_ENTER( MP4_Box_data_rmvc_t );
@@ -2035 +2036 @@
-    uint32_t i_type;
-    int  (*MP4_ReadBox_function )( MP4_Stream_t *p_stream, MP4_Box_t *p_box );
-input_thread_t *p_input, 
+
-} MP4_Box_Function [] =
-{
@@ -2365 +2366 @@
-        else
-        {
-input, p_
+
-        }
-

modules/demux/mp4/mp4.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2003/07/23 01:13:47 gbazin
+5 2003/09/07 22:48:29 fenrir
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -25 +25 @@
- *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                              /* strdup() */
-#include <errno.h>
-#include <sys/types.h>
-
-#include <vlc/vlc.h>
@@ -37 +34 @@
-
-/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int  Open    ( vlc_object_t * );
+static void Close     ( vlc_object_t * );
+
+vlc_module_begin();
+    set_description( _("MP4 demuxer") );
+    set_capability( "demux", 242 );
+    set_callbacks( Open, Close );
+vlc_module_end();
+
+
+/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-
-
-
-
-
+
+
-{
-    return 0;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-/*****************************************************************************
@@ -66 +61 @@
- *****************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-#define MP4_Set4BytesLE( p, dw ) \
@@ -101 +87 @@
-
-/*****************************************************************************
-MP4Init
+Open
- *****************************************************************************/
-MP4Init
+Open
-{
-    input_thread_t  *p_input = (input_thread_t *)p_this;
@@ -120 +106 @@
-    vlc_bool_t      b_audio;
-
-    /* I need to seek */
-    if( !p_input->stream.b_seekable )
-    {
-        msg_Warn( p_input, "MP4 plugin discarded (unseekable)" );
-        return( VLC_EGENERIC );
-
-    }
-    /* Initialize access plug-in structures. */
-    if( p_input->i_mtu == 0 )
-    {
-        /* Improve speed. */
-        p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE ;
-    }
-
-    p_input->pf_demux = MP4Demux;
-
-    /* a little test to see if it could be a mp4 */
-    if( input_Peek( p_input, &p_peek, 8 ) < 8 )
-    {
-        msg_Warn( p_input, "MP4 plugin discarded (cannot peek)" );
-
-
-
-
+
+
-    switch( VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] ) )
-    {
-( FOURCC_ftyp )
-( FOURCC_moov )
-( FOURCC_foov )
-( FOURCC_moof )
-( FOURCC_mdat )
-( FOURCC_udta )
-( FOURCC_free )
-( FOURCC_skip )
-( FOURCC_wide )
+ FOURCC_ftyp
+ FOURCC_moov
+ FOURCC_foov
+ FOURCC_moof
+ FOURCC_mdat
+ FOURCC_udta
+ FOURCC_free
+ FOURCC_skip
+ FOURCC_wide
-            break;
-         default:
-            msg_Warn( p_input, "MP4 plugin discarded (not a valid file)" );
-
-
+
+
+
+
+
+
+
+