Changeset 21196f47028a9b59d9f882b6abc8f05bb79a34df

Timestamp:

23/01/03 14:44:21 (6 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[e8ce66c232c2cd62cd8d9535200033a0c210f3e9]

git-author:

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

Message:

• don't send audio in fast/slow playing speed unless there isn't any video
  

stream.

Files:

• modules/demux/avi/avi.c (modified) (8 diffs)

modules/demux/avi/avi.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2003/01/20 13:01:53
+8 2003/01/23 13:44:21
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -684 +684 @@
-                                           demux_sys_t *p_avi )
-{
-
+unsigned 
-    int b_end;
-
@@ -1690 +1690 @@
-    unsigned int i_stream;
-    vlc_bool_t b_stream;
-
+
+
-    // cannot be more than 100 stream (dcXX or wbXX)
-    avi_stream_toread_t toread[100];
@@ -1697 +1698 @@
-
-    /* detect new selected/unselected streams */
-
+, b_video = VLC_FALSE
-            i_stream < p_avi->i_streams; i_stream++ )
-    {
@@ -1718 +1719 @@
-        {
-            i_stream_count++;
+            if( p_stream->i_cat == VIDEO_ES )
+            {
+                b_video = VLC_TRUE;
+            }
-        }
-#undef  p_stream
@@ -1771 +1776 @@
-    }
-#endif
+
+    /* *** send audio data to decoder if rate == DEFAULT_RATE or no video *** */
+    vlc_mutex_lock( &p_input->stream.stream_lock );
+    if( p_input->stream.control.i_rate == DEFAULT_RATE || !b_video )
+    {
+        b_play_audio = VLC_TRUE;
+    }
+    else
+    {
+        b_play_audio = VLC_FALSE;
+    }
+    vlc_mutex_unlock( &p_input->stream.stream_lock );
+
-    /* init toread */
-    for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ )
@@ -1778 +1796 @@
-
-        toread[i_stream].b_ok = p_stream->b_activated;
-
-        if( p_stream->i_idxposc < p_stream->i_idxnb )
-        {
@@ -2029 +2046 @@
-        b_stream = VLC_TRUE; // at least one read succeed
-
-
+
+
-        {
-            p_pes->i_dts =