Changeset bf48c33dbb564a5ede1581ab9bcb2db9213fba2f

Timestamp:

04/06/07 21:39:55 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[1fc3e360df0a8f4f169f2e258e52a0c98282178c]

git-author:

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

Message:

Added a b_discontinuity to aout_buffer_t for non-pcm streams.
Set aout_buffer_t.b_discontinuity in mpeg audio packetizer.
Silent first 3 frames on discontinuity in mad decoder.
(close #590)

Files:

• include/vlc_aout.h (modified) (2 diffs)
• modules/audio_filter/converter/mpgatofixed32.c (modified) (4 diffs)
• modules/codec/mpeg_audio.c (modified) (6 diffs)
• src/audio_output/aout_internal.h (modified) (1 diff)

include/vlc_aout.h

@@ -145 +145 @@
-    unsigned int            i_nb_samples;
-    mtime_t                 start_date, end_date;
+    vlc_bool_t              b_discontinuity; /* Set on discontinuity (for non pcm stream) */
-
-    struct aout_buffer_t *  p_next;
@@ -156 +157 @@
-};
-
-    
+do {
-    if( p_buffer != NULL && (p_buffer)->i_alloc_type == AOUT_ALLOC_HEAP )   \
-    {                                                                       \
-        free( p_buffer );                                                   \
-    }                                                                       \
-
+ } while(0)
-
-/* Size of a frame for S/PDIF output. */

modules/audio_filter/converter/mpgatofixed32.c

@@ -55 +55 @@
-{
-    struct mad_stream mad_stream;
-
-
+
+
+
+
-};
-
@@ -110 +112 @@
-    mad_synth_init( &p_sys->mad_synth );
-    mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC );
+    p_sys->i_reject_count = 0;
-
-    p_filter->pf_do_work = DoWork;
@@ -136 +139 @@
-        msg_Dbg( p_aout, "libmad error: %s",
-                  mad_stream_errorstr( &p_sys->mad_stream ) );
+        p_sys->i_reject_count = 3;
+    }
+    else if( p_in_buf->b_discontinuity )
+    {
+        p_sys->i_reject_count = 3;
+    }
+
+    if( p_sys->i_reject_count > 0 )
+    {
-        if( p_filter->output.i_format == VLC_FOURCC('f','l','3','2') )
-        {
@@ -149 +161 @@
-            memset( p_out_buf->p_buffer, 0, p_out_buf->i_nb_bytes );
-        }
+        p_sys->i_reject_count--;
-        return;
-    }
+
-
-    mad_synth_frame( &p_sys->mad_synth, &p_sys->mad_frame );

modules/codec/mpeg_audio.c

@@ -61 +61 @@
-    unsigned int i_rate, i_max_frame_size, i_frame_length;
-    unsigned int i_layer, i_bit_rate;
+
+    vlc_bool_t   b_discontinuity;
-};
-
@@ -153 +155 @@
-    aout_DateSet( &p_sys->end_date, 0 );
-    p_sys->bytestream = block_BytestreamInit( p_dec );
+    p_sys->b_discontinuity = VLC_FALSE;
-
-    /* Set output properties */
@@ -206 +209 @@
-//        aout_DateSet( &p_sys->end_date, 0 );
-        block_Release( *pp_block );
+        p_sys->b_discontinuity = VLC_TRUE;
-        return NULL;
-    }
@@ -282 +286 @@
-                block_SkipByte( &p_sys->bytestream );
-                p_sys->i_state = STATE_NOSYNC;
+                p_sys->b_discontinuity = VLC_TRUE;
-                break;
-            }
@@ -356 +361 @@
-                    block_SkipByte( &p_sys->bytestream );
-                    p_sys->i_state = STATE_NOSYNC;
+                    p_sys->b_discontinuity = VLC_TRUE;
-                    break;
-                }
@@ -531 +537 @@
-    p_buf->end_date =
-        aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length );
+    p_buf->b_discontinuity = p_sys->b_discontinuity;
+    p_sys->b_discontinuity = VLC_FALSE;
-
-    /* Hack for libmad filter */

src/audio_output/aout_internal.h

@@ -60 +60 @@
-            (p_new_buffer)->p_buffer = (byte_t *)(p_new_buffer)             \
-                                         + sizeof(aout_buffer_t);           \
+            (p_new_buffer)->b_discontinuity = VLC_FALSE;                    \
-            if ( (p_previous_buffer) != NULL )                              \
-            {                                                               \