Changeset 27ebd5cd73694dc07c828acf195e809d3a537e63

Timestamp:

23/01/03 16:07:20 (6 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[bed89e05ecabf096af9b1e6747b3da59d8ed2c84]

git-author:

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

Message:

• asf: in fast/slow motion we don't play audio (unless there isn't any
  

video). Added some clean up.

Files:

• modules/demux/asf/asf.c (modified) (3 diffs)

modules/demux/asf/asf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-6 2003/01/20 13:04:03
+7 2003/01/23 15:07:20
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -431 +431 @@
-    }
-
+static int DemuxPacket( input_thread_t *p_input, vlc_bool_t b_play_audio )
+{
+    demux_sys_t *p_demux = p_input->p_demux_data;
+    int     i_data_packet_min = p_demux->p_fp->i_min_data_packet_size;
+    uint8_t *p_peek;
+    int     i_skip;
+
+    int     i_packet_size_left;
+    int     i_packet_flags;
+    int     i_packet_property;
+
+    int     b_packet_multiple_payload;
+    int     i_packet_length;
+    int     i_packet_sequence;
+    int     i_packet_padding_length;
+
+    uint32_t    i_packet_send_time;
+    uint16_t    i_packet_duration;
+    int         i_payload;
+    int         i_payload_count;
+    int         i_payload_length_type;
+
+
+    if( input_Peek( p_input, &p_peek, i_data_packet_min ) < i_data_packet_min )
+    {
+        // EOF ?
+        msg_Warn( p_input, "cannot peek while getting new packet, EOF ?" );
+        return( 0 );
+    }
+    i_skip = 0;
+
+    /* *** parse error correction if present *** */
+    if( p_peek[0]&0x80 )
+    {
+        int i_error_correction_length_type;
+        int i_error_correction_data_length;
+        int i_opaque_data_present;
+
+        i_error_correction_data_length = p_peek[0] & 0x0f;  // 4bits
+        i_opaque_data_present = ( p_peek[0] >> 4 )& 0x01;    // 1bit
+        i_error_correction_length_type = ( p_peek[0] >> 5 ) & 0x03; // 2bits
+        i_skip += 1; // skip error correction flags
+
+        if( i_error_correction_length_type != 0x00 ||
+            i_opaque_data_present != 0 ||
+            i_error_correction_data_length != 0x02 )
+        {
+            goto loop_error_recovery;
+        }
+
+        i_skip += i_error_correction_data_length;
+    }
+    else
+    {
+        msg_Warn( p_input, "p_peek[0]&0x80 != 0x80" );
+    }
+
+    i_packet_flags = p_peek[i_skip]; i_skip++;
+    i_packet_property = p_peek[i_skip]; i_skip++;
+
+    b_packet_multiple_payload = i_packet_flags&0x01;
+
+    /* read some value */
+    GETVALUE2b( i_packet_flags >> 5, i_packet_length, i_data_packet_min );
+    GETVALUE2b( i_packet_flags >> 1, i_packet_sequence, 0 );
+    GETVALUE2b( i_packet_flags >> 3, i_packet_padding_length, 0 );
+
+    i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
+    i_packet_duration  = GetWLE( p_peek + i_skip ); i_skip += 2;
+
+//        i_packet_size_left = i_packet_length;   // XXX donn� reellement lu
+    /* FIXME I have to do that for some file, I don't known why */
+    i_packet_size_left = i_data_packet_min;
+
+    if( b_packet_multiple_payload )
+    {
+        i_payload_count = p_peek[i_skip] & 0x3f;
+        i_payload_length_type = ( p_peek[i_skip] >> 6 )&0x03;
+        i_skip++;
+    }
+    else
+    {
+        i_payload_count = 1;
+        i_payload_length_type = 0x02; // unused
+    }
+
+    for( i_payload = 0; i_payload < i_payload_count ; i_payload++ )
+    {
+        asf_stream_t   *p_stream;
+
+        int i_stream_number;
+        int i_media_object_number;
+        int i_media_object_offset;
+        int i_replicated_data_length;
+        int i_payload_data_length;
+        int i_payload_data_pos;
+        int i_sub_payload_data_length;
+        int i_tmp;
+
+        mtime_t i_pts;
+        mtime_t i_pts_delta;
+
+        if( i_skip >= i_packet_size_left )
+        {
+            /* prevent some segfault with invalid file */
+            break;
+        }
+
+        i_stream_number = p_peek[i_skip] & 0x7f;
+        i_skip++;
+
+        GETVALUE2b( i_packet_property >> 4, i_media_object_number, 0 );
+        GETVALUE2b( i_packet_property >> 2, i_tmp, 0 );
+        GETVALUE2b( i_packet_property, i_replicated_data_length, 0 );
+
+        if( i_replicated_data_length > 1 ) // should be at least 8 bytes
+        {
+            i_pts = (mtime_t)GetDWLE( p_peek + i_skip + 4 ) * 1000;
+            i_skip += i_replicated_data_length;
+            i_pts_delta = 0;
+
+            i_media_object_offset = i_tmp;
+        }
+        else if( i_replicated_data_length == 1 )
+        {
+
+            msg_Dbg( p_input, "found compressed payload" );
+
+            i_pts = (mtime_t)i_tmp * 1000;
+            i_pts_delta = (mtime_t)p_peek[i_skip] * 1000; i_skip++;
+
+            i_media_object_offset = 0;
+        }
+        else
+        {
+            i_pts = (mtime_t)i_packet_send_time * 1000;
+            i_pts_delta = 0;
+
+            i_media_object_offset = i_tmp;
+        }
+
+        i_pts = __MAX( i_pts - p_demux->p_fp->i_preroll * 1000, 0 );
+        if( b_packet_multiple_payload )
+        {
+            GETVALUE2b( i_payload_length_type, i_payload_data_length, 0 );
+        }
+        else
+        {
+            i_payload_data_length = i_packet_length -
+                                        i_packet_padding_length - i_skip;
+        }
+
+#if 0
+         msg_Dbg( p_input,
+                  "payload(%d/%d) stream_number:%d media_object_number:%d media_object_offset:%d replicated_data_length:%d payload_data_length %d",
+                  i_payload + 1,
+                  i_payload_count,
+                  i_stream_number,
+                  i_media_object_number,
+                  i_media_object_offset,
+                  i_replicated_data_length,
+                  i_payload_data_length );
+#endif
+
+        if( !( p_stream = p_demux->stream[i_stream_number] ) )
+        {
+            msg_Warn( p_input,
+                      "undeclared stream[Id 0x%x]", i_stream_number );
+            i_skip += i_payload_data_length;
+            continue;   // over payload
+        }
+
+        if( !p_stream->p_es || !p_stream->p_es->p_decoder_fifo )
+        {
+            i_skip += i_payload_data_length;
+            continue;
+        }
+
+
+        for( i_payload_data_pos = 0;
+             i_payload_data_pos < i_payload_data_length &&
+                    i_packet_size_left > 0;
+             i_payload_data_pos += i_sub_payload_data_length )
+        {
+            data_packet_t  *p_data;
+            int i_read;
+            // read sub payload length
+            if( i_replicated_data_length == 1 )
+            {
+                i_sub_payload_data_length = p_peek[i_skip]; i_skip++;
+                i_payload_data_pos++;
+            }
+            else
+            {
+                i_sub_payload_data_length = i_payload_data_length;
+            }
+
+            /* FIXME I don't use i_media_object_number, sould I ? */
+            if( p_stream->p_pes && i_media_object_offset == 0 )                 {
+                /* send complete packet to decoder */
+                if( p_stream->p_pes->i_pes_size > 0 )
+                {
+                    if( p_stream->p_es->p_decoder_fifo &&
+                        ( b_play_audio || p_stream->i_cat != AUDIO_ES ) )
+                    {
+                        input_DecodePES( p_stream->p_es->p_decoder_fifo,
+                                         p_stream->p_pes );
+                    }
+                    else
+                    {
+                        input_DeletePES( p_input->p_method_data,
+                                         p_stream->p_pes );
+                    }
+                    p_stream->p_pes = NULL;
+                }
+            }
+
+            if( !p_stream->p_pes )  // add a new PES
+            {
+                p_stream->i_time =
+                    ( (mtime_t)i_pts + i_payload * (mtime_t)i_pts_delta );
+
+                if( p_demux->i_first_pts == -1 )
+                {
+                    p_demux->i_first_pts = p_stream->i_time;
+                }
+                p_stream->i_time -= p_demux->i_first_pts;
+
+                p_stream->p_pes = input_NewPES( p_input->p_method_data );
+                p_stream->p_pes->i_dts =
+                    p_stream->p_pes->i_pts =
+                        input_ClockGetTS( p_input,
+                                          p_input->stream.p_selected_program,
+                                          ( p_stream->i_time+DEFAULT_PTS_DELAY) * 9 /100 );
+
+                p_stream->p_pes->p_next = NULL;
+                p_stream->p_pes->i_nb_data = 0;
+                p_stream->p_pes->i_pes_size = 0;
+            }
+
+            i_read = i_sub_payload_data_length + i_skip;
+            if( input_SplitBuffer( p_input, &p_data, i_read ) < i_read )
+            {
+                msg_Warn( p_input, "cannot read data" );
+                return( 0 );
+            }
+            p_data->p_payload_start += i_skip;
+            i_packet_size_left -= i_read;
+
+
+            if( !p_stream->p_pes->p_first )
+            {
+                p_stream->p_pes->p_first = p_stream->p_pes->p_last = p_data;
+            }
+            else
+            {
+                p_stream->p_pes->p_last->p_next = p_data;
+                p_stream->p_pes->p_last = p_data;
+            }
+            p_stream->p_pes->i_pes_size += i_sub_payload_data_length;
+            p_stream->p_pes->i_nb_data++;
+
+            i_skip = 0;
+            if( i_packet_size_left > 0 )
+            {
+                if( input_Peek( p_input, &p_peek, i_packet_size_left ) < i_packet_size_left )
+                {
+                    // EOF ?
+                    msg_Warn( p_input, "cannot peek, EOF ?" );
+                    return( 0 );
+                }
+            }
+        }
+    }
+
+    if( i_packet_size_left > 0 )
+    {
+        if( !ASF_SkipBytes( p_input, i_packet_size_left ) )
+        {
+            msg_Warn( p_input, "cannot skip data, EOF ?" );
+            return( 0 );
+        }
+    }
+
+    return( 1 );
+
+loop_error_recovery:
+    msg_Warn( p_input, "unsupported packet header" );
+    if( p_demux->p_fp->i_min_data_packet_size != p_demux->p_fp->i_max_data_packet_size )
+    {
+        msg_Err( p_input, "unsupported packet header, fatal error" );
+        return( -1 );
+    }
+    ASF_SkipBytes( p_input, i_data_packet_min );
+
+    return( 1 );
+}
+
-static int Demux( input_thread_t *p_input )
-{
-    demux_sys_t *p_demux = p_input->p_demux_data;
+    vlc_bool_t b_play_audio;
-    int i;
-
@@ -465 +764 @@
-    }
-
+    vlc_mutex_lock( &p_input->stream.stream_lock );
+    if( p_input->stream.control.i_rate == DEFAULT_RATE )
+    {
+        b_play_audio = VLC_TRUE;
+    }
+    else
+    {
+        int i;
+
+        b_play_audio = VLC_TRUE;
+        for( i = 0; i < 128; i++ )
+        {
+            if( p_demux->stream[i] &&
+                p_demux->stream[i]->i_cat == VIDEO_ES &&
+                p_demux->stream[i]->p_es &&
+                p_demux->stream[i]->p_es->p_decoder_fifo )
+            {
+                /* there is at least ine video track so no need to play audio */
+                b_play_audio = VLC_FALSE;
+            }
+        }
+    }
+    vlc_mutex_unlock( &p_input->stream.stream_lock );
+
-
-    for( i = 0; i < 10; i++ ) // parse 10 packets
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    p_demux->i_time = -1;
-    for( i = 0; i < 128 ; i++ )