* modules/access/dvdread.c: titles and chapters start from 1.

[vlc] / modules / packetizer / mpeg4video.c

diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index 9473cc3183e1cb50aa3f8dc15b689aab93662da8..a400910d98f66fc29ff06ce872cde37a7ed238d1 100644 (file)
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -66,6 +66,8 @@ struct decoder_sys_t
     int         i_buffer_size;
     uint8_t     *p_buffer;
     unsigned int i_flags;
+
+    vlc_bool_t  b_frame;
 };
 
 static int m4v_FindStartCode( uint8_t **pp_start, uint8_t *p_end );
@@ -115,6 +117,8 @@ static int Open( vlc_object_t *p_this )
         case VLC_FOURCC( 'd', 'x', '5', '0'):
         case VLC_FOURCC( 0x04, 0,   0,   0):
         case VLC_FOURCC( '3', 'I', 'V', '2'):
+        case VLC_FOURCC( 'm', '4', 'c', 'c'):
+        case VLC_FOURCC( 'M', '4', 'C', 'C'):
             break;
 
         default:
@@ -128,14 +132,16 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     p_sys->i_pts = 0;
+    p_sys->i_dts = 0;
     p_sys->b_vop = VLC_FALSE;
     p_sys->i_buffer = 0;
     p_sys->i_buffer_size = 0;
     p_sys->p_buffer = 0;
     p_sys->i_flags = 0;
+    p_sys->b_frame = VLC_FALSE;
 
     /* Setup properties */
-    p_dec->fmt_out = p_dec->fmt_in;
+    es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
     p_dec->fmt_out.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
 
     if( p_dec->fmt_in.i_extra )
@@ -295,7 +301,8 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
                     p_sys->i_flags = BLOCK_FLAG_TYPE_P;
                     break;
                 case 2:
-                    p_sys->i_flags = BLOCK_FLAG_TYPE_P;
+                    p_sys->i_flags = BLOCK_FLAG_TYPE_B;
+                    p_sys->b_frame = VLC_TRUE;
                     break;
                 case 3: /* gni ? */
                     p_sys->i_flags = BLOCK_FLAG_TYPE_PB;
@@ -308,14 +315,23 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
             {
                 p_sys->i_pts = p_block->i_pts;
             }
-            else
+            else if( (p_sys->i_flags&BLOCK_FLAG_TYPE_B) || !p_sys->b_frame )
             {
                 p_sys->i_pts = p_block->i_dts;
             }
+            else
+            {
+                p_sys->i_pts = 0;
+            }
             if( p_block->i_dts > 0 )
             {
                 p_sys->i_dts = p_block->i_dts;
             }
+            else if( p_sys->i_dts > 0 )
+            {
+                /* XXX KLUDGE immonde, else transcode won't work */
+                p_sys->i_dts += 1000;
+            }
         }
         p_start += 4; /* Next */
     }