Changeset 85b124f08d43c01f060abfb4d30ee24246ac4b97

Timestamp:

10/17/07 21:56:26 (11 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[f75f9b5b367bf1b491f49e52b57d54a529e78839]

git-author:

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

Message:

Added cc data extraction support for mpeg 1/2 when the mpeg packetizer

is used. (Only dvb/atsc CC support is working)

Files:

• modules/packetizer/mpegvideo.c (modified) (8 diffs)

modules/packetizer/mpegvideo.c

@@ -47 +47 @@
-#include <vlc_codec.h>
-#include <vlc_block_helper.h>
+#include "../codec/cc.h"
-
-#define SYNC_INTRAFRAME_TEXT N_("Sync on Intra Frame")
@@ -75 +76 @@
-static block_t *Packetize( decoder_t *, block_t ** );
-static block_t *ParseMPEGBlock( decoder_t *, block_t * );
+static block_t *GetCc( decoder_t *p_dec, vlc_bool_t pb_present[4] );
-
-struct decoder_sys_t
@@ -124 +126 @@
-    vlc_bool_t  b_sync_on_intra_frame;
-    vlc_bool_t  b_discontinuity;
+
+    /* */
+    vlc_bool_t b_cc_reset;
+    uint32_t i_cc_flags;
+    mtime_t i_cc_pts;
+    cc_data_t cc;
-};
-
@@ -148 +156 @@
-    es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_FOURCC('m','p','g','v') );
-    p_dec->pf_packetize = Packetize;
+    p_dec->pf_get_cc = GetCc;
-
-    p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
@@ -189 +198 @@
-    if( p_sys->b_sync_on_intra_frame )
-        msg_Dbg( p_dec, "syncing on intra frame now" );
+
+    p_sys->b_cc_reset = VLC_FALSE;
+    p_sys->i_cc_pts = 0;
+    p_sys->i_cc_flags = 0;
+    cc_Init( &p_sys->cc );
-
-    return VLC_SUCCESS;
@@ -369 +383 @@
-
-/*****************************************************************************
+ * GetCc:
+ *****************************************************************************/
+static block_t *GetCc( decoder_t *p_dec, vlc_bool_t pb_present[4] )
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    block_t *p_cc;
+    int i;
+
+    for( i = 0; i < 4; i++ )
+        pb_present[i] = p_sys->cc.pb_present[i];
+
+    if( p_sys->cc.i_data <= 0 )
+        return NULL;
+
+    p_cc = block_New( p_dec, p_sys->cc.i_data);
+    if( p_cc )
+    {
+        memcpy( p_cc->p_buffer, p_sys->cc.p_data, p_sys->cc.i_data );
+        p_cc->i_dts = 
+        p_cc->i_pts = p_sys->i_cc_pts;
+        p_cc->i_flags = p_sys->i_cc_flags & ( BLOCK_FLAG_TYPE_I|BLOCK_FLAG_TYPE_P|BLOCK_FLAG_TYPE_B);
+    }
+    cc_Flush( &p_sys->cc );
+    return p_cc;
+}
+
+/*****************************************************************************
- * ParseMPEGBlock: Re-assemble fragments into a block containing a picture
- *****************************************************************************/
@@ -499 +540 @@
-            p_sys->b_second_field = 0;
-        }
+
+        /* CC */
+        p_sys->b_cc_reset = VLC_TRUE;
+        p_sys->i_cc_pts = p_pic->i_pts;
+        p_sys->i_cc_flags = p_pic->i_flags;
+    }
+
+    if( !p_pic && p_sys->b_cc_reset )
+    {
+        p_sys->b_cc_reset = VLC_FALSE;
+        cc_Flush( &p_sys->cc );
-    }
-
@@ -619 +671 @@
-        }
-    }
+    else if( p_frag->p_buffer[3] == 0xb2 && p_frag->i_buffer > 4 )
+    {
+        cc_Extract( &p_sys->cc, &p_frag->p_buffer[4], p_frag->i_buffer - 4 );
+    }
-    else if( p_frag->p_buffer[3] == 0x00 )
-    {