packetizer copy : use VLC_TS_INVALID

[vlc] / modules / packetizer / copy.c

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index e2379abb98e4ba20a13d675e799489c14b832f49..b6046ac21e55d211d60068aed91041324bef249c 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -87,71 +87,16 @@ 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 )
     {
-        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(*p_sys) );
@@ -195,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;
     }
@@ -234,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;
     }