Changeset eb6c45093a933c68bcedfb4e75a7185ccf1dded9

Timestamp:

26/08/04 21:19:08 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1093547948 +0000

git-parent:

[548753b8d4ff0587b8d9256c4a28be46b0edc0bb]

git-author:

Gildas Bazin <gbazin@videolan.org> 1093547948 +0000

Message:

* src/input/decoder.c: forward the p_block->i_rate info when required (fixes libmpeg2 decoding in the display stream output module).

Files:

• src/input/decoder.c (modified) (6 diffs)

src/input/decoder.c

@@ -6 +6 @@
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
-netcourrier.com
+videolan.org
- *          Laurent Aimar <fenrir@via.ecp.fr>
- *
@@ -504 +504 @@
-static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
-{
+    int i_rate = p_block->i_rate;
+
-    if( p_block->i_buffer <= 0 )
-    {
@@ -520 +522 @@
-                es_format_Copy( &p_dec->p_owner->sout, &p_dec->fmt_out );
-
-
+ 
-                p_dec->p_owner->sout.i_id = p_dec->fmt_in.i_id;
-                if( p_dec->fmt_in.psz_language )
@@ -549 +551 @@
-            while( p_sout_block )
-            {
-      
+
-
-                p_sout_block->p_next = NULL;
+                p_sout_block->i_rate = i_rate;
-
-                sout_InputSendBuffer( p_dec->p_owner->p_sout_input,
@@ -590 +593 @@
-                    block_t *p_next = p_packetized_block->p_next;
-                    p_packetized_block->p_next = NULL;
+                    p_packetized_block->i_rate = i_rate;
-
-                    while( (p_aout_buf = p_dec->pf_decode_audio( p_dec,
@@ -625 +629 @@
-                    block_t *p_next = p_packetized_block->p_next;
-                    p_packetized_block->p_next = NULL;
+                    p_packetized_block->i_rate = i_rate;
-
-                    while( (p_pic = p_dec->pf_decode_video( p_dec,