playlist, Qt: playlist browsing support

[vlc] / modules / packetizer / copy.c

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index 11461d5d36e2292e02fcfec7dabcdd4c4e1a1d0c..b6046ac21e55d211d60068aed91041324bef249c 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -87,149 +87,19 @@ static int Open( vlc_object_t *p_this )
     /* Create the output format */
     es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
 
-    /* Fix the value of the fourcc */
-    switch( p_dec->fmt_in.i_codec )
+    /* Fix the value of the fourcc for audio */
+    if( p_dec->fmt_in.i_cat == AUDIO_ES )
     {
-        /* video */
-        case VLC_FOURCC( 'm', '4', 's', '2'):
-        case VLC_FOURCC( 'M', '4', 'S', '2'):
-        case VLC_FOURCC( 'm', 'p', '4', 's'):
-        case VLC_FOURCC( 'M', 'P', '4', 'S'):
-        case VLC_FOURCC( 'D', 'I', 'V', 'X'):
-        case VLC_FOURCC( 'd', 'i', 'v', 'x'):
-        case VLC_FOURCC( 'X', 'V', 'I', 'D'):
-        case VLC_FOURCC( 'X', 'v', 'i', 'D'):
-        case VLC_FOURCC( 'x', 'v', 'i', 'd'):
-        case VLC_FOURCC( 'D', 'X', '5', '0'):
-        case VLC_FOURCC( 0x04, 0,   0,   0):
-        case VLC_FOURCC( '3', 'I', 'V', '2'):
-            p_dec->fmt_out.i_codec = VLC_CODEC_MP4V;
-            break;
-
-        case VLC_FOURCC( 'm', 'p', 'g', '1' ):
-        case VLC_FOURCC( 'm', 'p', 'g', '2' ):
-        case VLC_CODEC_MP1V:
-        case VLC_CODEC_MP2V:
-            p_dec->fmt_out.i_codec = VLC_CODEC_MPGV;
-            break;
-
-        case VLC_FOURCC( 'd', 'i', 'v', '1' ):
-        case VLC_FOURCC( 'M', 'P', 'G', '4' ):
-        case VLC_FOURCC( 'm', 'p', 'g', '4' ):
-            p_dec->fmt_out.i_codec = VLC_CODEC_DIV1;
-            break;
-
-        case VLC_FOURCC( 'd', 'i', 'v', '2' ):
-        case VLC_FOURCC( 'M', 'P', '4', '2' ):
-        case VLC_FOURCC( 'm', 'p', '4', '2' ):
-            p_dec->fmt_out.i_codec = VLC_CODEC_DIV2;
-            break;
-
-        case VLC_FOURCC( 'd', 'i', 'v', '3' ):
-        case VLC_FOURCC( 'd', 'i', 'v', '4' ):
-        case VLC_FOURCC( 'D', 'I', 'V', '4' ):
-        case VLC_FOURCC( 'd', 'i', 'v', '5' ):
-        case VLC_FOURCC( 'D', 'I', 'V', '5' ):
-        case VLC_FOURCC( 'd', 'i', 'v', '6' ):
-        case VLC_FOURCC( 'D', 'I', 'V', '6' ):
-        case VLC_FOURCC( 'M', 'P', '4', '3' ):
-        case VLC_FOURCC( 'm', 'p', '4', '3' ):
-        case VLC_FOURCC( 'm', 'p', 'g', '3' ):
-        case VLC_FOURCC( 'M', 'P', 'G', '3' ):
-        case VLC_FOURCC( 'A', 'P', '4', '1' ):
-            p_dec->fmt_out.i_codec = VLC_CODEC_DIV3;
-            break;
-
-        case VLC_CODEC_H263:
-        case VLC_FOURCC( 'U', '2', '6', '3' ):
-        case VLC_FOURCC( 'u', '2', '6', '3' ):
-            p_dec->fmt_out.i_codec = VLC_FOURCC( 'H', '2', '6', '3' );
-            break;
-
-        case VLC_FOURCC( 'i', '2', '6', '3' ):
-            p_dec->fmt_out.i_codec = VLC_CODEC_H263I;
-            break;
-
-        case VLC_FOURCC( 'm', 'j', 'p', 'g' ):
-        case VLC_FOURCC( 'm', 'j', 'p', 'a' ):
-        case VLC_CODEC_JPEG:
-        case VLC_FOURCC( 'J', 'P', 'E', 'G' ):
-        case VLC_FOURCC( 'J', 'F', 'I', 'F' ):
-            p_dec->fmt_out.i_codec = VLC_CODEC_MJPG;
-            break;
-
-        case VLC_FOURCC( 'd', 'v', 's', 'd' ):
-        case VLC_FOURCC( 'D', 'V', 'S', 'D' ):
-        case VLC_FOURCC( 'd', 'v', 'h', 'd' ):
-            p_dec->fmt_out.i_codec = VLC_FOURCC( 'd', 'v', 's', 'l' );
-            break;
-
-        /* audio */
-        case VLC_FOURCC( 'a', 'r', 'a', 'w' ):
-            switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 )
-            {
-                case 1:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_U8;
-                    break;
-                case 2:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S16L;
-                    break;
-                case 3:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S24L;
-                    break;
-                case 4:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S32L;
-                    break;
-                default:
-                    msg_Err( p_dec, "unknown raw audio sample size" );
-                    return VLC_EGENERIC;
-            }
-            break;
-
-        case VLC_FOURCC( 't', 'w', 'o', 's' ):
-            switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 )
-            {
-                case 1:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S8;
-                    break;
-                case 2:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S16B;
-                    break;
-                case 3:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S24B;
-                    break;
-                case 4:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S32B;
-                    break;
-                default:
-                    msg_Err( p_dec, "unknown raw audio sample size" );
-                    return VLC_EGENERIC;
-            }
-            break;
-
-        case VLC_FOURCC( 's', 'o', 'w', 't' ):
-            switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 )
-            {
-                case 1:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S8;
-                    break;
-                case 2:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S16L;
-                    break;
-                case 3:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S24L;
-                    break;
-                case 4:
-                    p_dec->fmt_out.i_codec = VLC_CODEC_S32L;
-                    break;
-                default:
-                    msg_Err( p_dec, "unknown raw audio sample size" );
-                    return VLC_EGENERIC;
-            }
-            break;
+        p_dec->fmt_out.i_codec = vlc_fourcc_GetCodecAudio( p_dec->fmt_in.i_codec,
+                                                           p_dec->fmt_in.audio.i_bitspersample );
+        if( !p_dec->fmt_out.i_codec )
+        {
+            msg_Err( p_dec, "unknown raw audio sample size" );
+            return VLC_EGENERIC;
+        }
     }
 
-    p_dec->p_sys = p_sys = malloc( sizeof( block_t ) );
+    p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) );
     p_sys->p_block    = NULL;
 
     return VLC_SUCCESS;
@@ -270,14 +140,14 @@ static block_t *Packetize ( decoder_t *p_dec, block_t **pp_block )
     p_block = *pp_block;
     *pp_block = NULL;
 
-    if( p_block->i_dts <= 0 )
+    if( p_block->i_dts <= VLC_TS_INVALID )
     {
         p_block->i_dts = p_block->i_pts;
     }
 
-    if( p_block->i_dts <= 0 )
+    if( p_block->i_dts <= VLC_TS_INVALID )
     {
-        msg_Dbg( p_dec, "need dts > 0" );
+        msg_Dbg( p_dec, "need valid dts" );
         block_Release( p_block );
         return NULL;
     }
@@ -309,14 +179,14 @@ static block_t *PacketizeSub( decoder_t *p_dec, block_t **pp_block )
     p_block = *pp_block;
     *pp_block = NULL;
 
-    if( p_block->i_dts <= 0 )
+    if( p_block->i_dts <= VLC_TS_INVALID )
     {
         p_block->i_dts = p_block->i_pts;
     }
 
-    if( p_block->i_dts <= 0 )
+    if( p_block->i_dts <= VLC_TS_INVALID )
     {
-        msg_Dbg( p_dec, "need dts > 0" );
+        msg_Dbg( p_dec, "need valid dts" );
         block_Release( p_block );
         return NULL;
     }