OSDN Git Service

Fix a hang in sync
[handbrake-jp/handbrake-jp-git.git] / libhb / decmpeg2.c
index 03f6656..1d2d059 100644 (file)
@@ -1,11 +1,11 @@
 /* $Id: decmpeg2.c,v 1.12 2005/03/03 16:30:42 titer Exp $
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
-
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 
 /* Cadence tracking */
 #define BTB_PROG 64
 #define TB_PROG 128
 #define TBT_PROG 256
-int cadence[12];
-int flag = 0;
+
+#define NTAGS 8
 
 /**********************************************************************
  * hb_libmpeg2_t
- **********************************************************************
- * A convenient libmpeg wrapper, used both here and in scan.c
  *********************************************************************/
-struct hb_libmpeg2_s
+typedef struct hb_libmpeg2_s
 {
     mpeg2dec_t         * libmpeg2;
     const mpeg2_info_t * info;
     hb_job_t           * job;
+    hb_title_t         * title;
     int                  width;
     int                  height;
     int                  rate;
-    int                  aspect_ratio;
+    double               aspect_ratio;
+    enum PixelFormat     pixfmt;
     int                  got_iframe;        /* set when we get our first iframe */
     int                  look_for_iframe;   /* need an iframe to add chap break */
     int                  look_for_break;    /* need gop start to add chap break */
+    int                  cur_tag;           /* index of current tag */
     uint32_t             nframes;           /* number of frames we've decoded */
     int64_t              last_pts;
-};
+    int64_t              first_pts;
+    int cadence[12];
+    int flag;
+    hb_list_t          * list_subtitle;
+    hb_buffer_t        * last_cc1_buf;
+    struct {
+        int64_t          start;             // start time of this frame
+        hb_buffer_t    * cc_buf;            // captions for this frame
+    } tags[NTAGS];
+} hb_libmpeg2_t;
 
 /**********************************************************************
  * hb_libmpeg2_init
  **********************************************************************
  *
  *********************************************************************/
-hb_libmpeg2_t * hb_libmpeg2_init()
+static hb_libmpeg2_t * hb_libmpeg2_init()
 {
     hb_libmpeg2_t * m = calloc( sizeof( hb_libmpeg2_t ), 1 );
 
     m->libmpeg2 = mpeg2_init();
     m->info     = mpeg2_info( m->libmpeg2 );
     m->last_pts = -1;
+    m->first_pts = -1;
+
+    int i;
+    for ( i = 0; i < NTAGS; ++i )
+    {
+        m->tags[i].start = -1;
+    }
 
     return m;
 }
 
+// send cc_buf to the CC decoder(s)
+static void cc_send_to_decoder( hb_libmpeg2_t *m, hb_buffer_t *cc_buf )
+{
+    hb_subtitle_t *subtitle;
+
+    // if there's more than one decoder for the captions send a copy
+    // of the buffer to all but the last. Then send the buffer to
+    // the last one (usually there's just one decoder so the 'while' is skipped).
+    int i = 0, n = hb_list_count( m->list_subtitle );
+    while ( --n > 0 )
+    {
+        // make a copy of the buf then forward it to the decoder
+        hb_buffer_t *cpy = hb_buffer_init( cc_buf->size );
+        hb_buffer_copy_settings( cpy, cc_buf );
+        memcpy( cpy->data, cc_buf->data, cc_buf->size );
+
+        subtitle = hb_list_item( m->list_subtitle, i++ );
+        hb_fifo_push( subtitle->fifo_in, cpy );
+    }
+    subtitle = hb_list_item( m->list_subtitle, i );
+    hb_fifo_push( subtitle->fifo_in, cc_buf );
+}
+
+static void hb_mpeg2_cc( hb_libmpeg2_t *m, const uint8_t *cc_block )
+{
+    uint8_t cc_hdr = *cc_block;
+    
+    if ( ( cc_hdr & 0x4 ) == 0 )
+        // not valid - ignore
+        return;
+
+    switch (cc_hdr & 3)
+    {
+        case 0:
+            // CC1 stream
+            if ( ( cc_block[1] & 0x7f ) == 0 && ( cc_block[2] & 0x7f ) == 0 )
+                // just padding - ignore
+                return;
+
+            if ( m->last_cc1_buf )
+            {
+                // new data from the same time as last call - add to buffer
+                int len = m->last_cc1_buf->size;
+                hb_buffer_realloc( m->last_cc1_buf, len + 2 );
+                memcpy( m->last_cc1_buf->data + len, cc_block+1, 2 );
+                m->last_cc1_buf->size = len + 2;
+                return;
+            }
+
+            // allocate a new buffer and copy the caption data into it.
+            // (we don't send it yet because we don't know what timestamp to use).
+            hb_buffer_t *cc_buf = hb_buffer_init( 2 );
+            if( !cc_buf )
+                return;
+
+            memcpy( cc_buf->data, cc_block+1, 2 );
+            m->last_cc1_buf = cc_buf;
+            break;
+#ifdef notyet
+        case 1:
+            // CC2 stream
+            //process608( cc_block+1, 2, &m->cc608 );
+            break;
+        case 2: //EIA-708
+            // DTVCC packet data
+            // Fall through
+        case 3: //EIA-708
+            {
+                uint8_t temp[4];
+                temp[0]=cc_valid;
+                temp[1]=cc_type;
+                temp[2]=cc_block[1];
+                temp[3]=cc_block[2];
+                do_708 ((const unsigned char *) temp, 4);
+            }
+            break;
+#endif
+        default:
+            break;
+    } 
+} 
+
+static inline int have_captions( const uint8_t *user_data, uint32_t len )
+{
+    return len >= 6 && 
+           ( ( user_data[0] == 0x43 && user_data[1] == 0x43 ) ||
+             ( user_data[0] == 0x47 && user_data[1] == 0x41 &&
+               user_data[2] == 0x39 && user_data[3] == 0x34 &&
+               user_data[4] == 3 && (user_data[5] & 0x40) ) );
+}
+
+static void do_one_dvd_cc( hb_libmpeg2_t *m, const uint8_t *header, int field1 )
+{
+    uint8_t data[3];
+
+    data[0] = ( header[0] == 0xff && 0 == field1 )? 0x04 : 0x05;
+    data[1] = header[1];
+    data[2] = header[2];
+    hb_mpeg2_cc( m, data );
+
+    data[0] = ( header[3] == 0xff && 1 == field1 )? 0x04 : 0x05;
+    data[1] = header[4];
+    data[2] = header[5];
+    hb_mpeg2_cc( m, data );
+}
+
+// extract all the captions in the current frame and send them downstream
+// to the decoder.
+//
+// (this routine should only be called if there are captions in the current
+// frame. I.e., only if a call to 'have_captions' returns true.)
+static void extract_mpeg2_captions( hb_libmpeg2_t *m )
+{
+    const uint8_t *user_data = m->info->user_data;
+    int dvd_captions = user_data[0] == 0x43;
+    int capcount, field1packet = 0;
+    const uint8_t *header = &user_data[4];
+    if ( !dvd_captions )
+    {
+        // ATSC encapsulated captions - header starts one byte later
+        // and has an extra unused byte following it.
+        capcount = header[1] & 0x1f;
+        header += 3;
+    }
+    else
+    {
+        // DVD captions
+        if ( ( header[0] & 0x80 ) == 0x00 ) 
+            field1packet=1; /* expect Field 1 second */
+        capcount=(header[0] & 0x1e) / 2;
+        header++;
+    }
+
+    int i;
+    for( i=0; i<capcount; i++ )
+    {
+        if ( !dvd_captions )
+        {
+            hb_mpeg2_cc( m, header );
+            header += 3;
+        }
+        else
+        {
+            do_one_dvd_cc( m, header, field1packet );
+            header += 6;
+        }
+    }
+    if ( dvd_captions )
+    {
+        // Deal with extra closed captions some DVDs have.
+        while( header[0]==0xfe || header[0]==0xff )
+        {
+            do_one_dvd_cc( m, header, field1packet );
+            header += 6;
+        }   
+    }   
+}
+
+static void next_tag( hb_libmpeg2_t *m, hb_buffer_t *buf_es )
+{
+    m->cur_tag = ( m->cur_tag + 1 ) & (NTAGS-1);
+    if ( m->tags[m->cur_tag].start >= 0 || m->tags[m->cur_tag].cc_buf )
+    {
+        if ( m->tags[m->cur_tag].start < 0 ||
+             ( m->got_iframe && m->tags[m->cur_tag].start >= m->first_pts ) )
+            hb_log("mpeg2 tag botch: pts %"PRId64", tag pts %"PRId64" buf 0x%p",
+                   buf_es->start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
+        if ( m->tags[m->cur_tag].cc_buf )
+            hb_buffer_close( &m->tags[m->cur_tag].cc_buf );
+    }
+    m->tags[m->cur_tag].start = buf_es->start;
+    mpeg2_tag_picture( m->libmpeg2, m->cur_tag, 0 );
+}
+
+static hb_buffer_t *hb_copy_frame( hb_job_t *job, int width, int height,
+                                   enum PixelFormat pixfmt,
+                                   uint8_t* y, uint8_t *u, uint8_t *v )
+{
+    int dst_w = width, dst_h = height;
+    if ( job )
+    {
+        dst_w = job->title->width;
+        dst_h = job->title->height;
+    }
+    int dst_wh = dst_w * dst_h;
+    hb_buffer_t *buf  = hb_video_buffer_init( dst_w, dst_h );
+    buf->start = -1;
+
+    if ( dst_w != width || dst_h != height || pixfmt == PIX_FMT_YUV422P )
+    {
+        // we're encoding and the frame dimensions don't match the title dimensions -
+        // rescale & matte Y, U, V into our output buf.
+        AVPicture in, out;
+        avpicture_alloc(&in,  pixfmt, width, height );
+        avpicture_alloc(&out, PIX_FMT_YUV420P, dst_w, dst_h );
+
+        int src_wh = width * height;
+        if ( pixfmt == PIX_FMT_YUV422P )
+        {
+            memcpy( in.data[0], y, src_wh );
+            memcpy( in.data[1], u, src_wh >> 1 );
+            memcpy( in.data[2], v, src_wh >> 1 );
+        }
+        else
+        {
+            memcpy( in.data[0], y, src_wh );
+            memcpy( in.data[1], u, src_wh >> 2 );
+            memcpy( in.data[2], v, src_wh >> 2 );
+        }
+        struct SwsContext *context = hb_sws_get_context( width, height, pixfmt,
+                                                     dst_w, dst_h, PIX_FMT_YUV420P,
+                                                     SWS_LANCZOS|SWS_ACCURATE_RND);
+        sws_scale( context, in.data, in.linesize, 0, height, out.data, out.linesize );
+        sws_freeContext( context );
+
+        uint8_t *data = buf->data;
+        memcpy( data, out.data[0], dst_wh );
+        data += dst_wh;
+        // U & V planes are 1/4 the size of Y plane.
+        dst_wh >>= 2;
+        memcpy( data, out.data[1], dst_wh );
+        data += dst_wh;
+        memcpy( data, out.data[2], dst_wh );
+
+        avpicture_free( &out );
+        avpicture_free( &in );
+    }
+    else
+    {
+        // we're scanning or the frame dimensions match the title's dimensions
+        // so we can do a straight copy.
+        uint8_t *data = buf->data;
+        memcpy( data, y, dst_wh );
+        data += dst_wh;
+        // U & V planes are 1/4 the size of Y plane.
+        dst_wh >>= 2;
+        memcpy( data, u, dst_wh );
+        data += dst_wh;
+        memcpy( data, v, dst_wh );
+    }
+    return buf;
+}
+
 /**********************************************************************
  * hb_libmpeg2_decode
  **********************************************************************
  *
  *********************************************************************/
-int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
-                        hb_list_t * list_raw )
+static int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
+                               hb_list_t * list_raw )
 {
-    mpeg2_state_t   state;
-    hb_buffer_t   * buf;
-    uint8_t       * data;
+    mpeg2_state_t    state;
+    hb_buffer_t    * buf;
 
     if ( buf_es->size )
     {
         /* Feed libmpeg2 */
-        if( buf_es->start > -1 )
+        if( buf_es->start >= 0 )
         {
-            mpeg2_tag_picture( m->libmpeg2, buf_es->start >> 32,
-                               buf_es->start & 0xFFFFFFFF );
+            next_tag( m, buf_es );
         }
-        mpeg2_buffer( m->libmpeg2, buf_es->data,
-                      buf_es->data + buf_es->size );
+        mpeg2_buffer( m->libmpeg2, buf_es->data, buf_es->data + buf_es->size );
     }
 
     for( ;; )
@@ -97,7 +354,32 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
             /* Require some more data */
             break;
         }
-        else if( state == STATE_SEQUENCE )
+
+        // if the user requested captions, process
+        // any captions found in the current frame.
+        if ( m->list_subtitle && m->last_pts >= 0 &&
+             have_captions( m->info->user_data, m->info->user_data_len ) )
+        {
+            extract_mpeg2_captions( m );
+            // if we don't have a tag for the captions, make one
+            if ( m->last_cc1_buf && m->tags[m->cur_tag].cc_buf != m->last_cc1_buf )
+            {
+                if (m->tags[m->cur_tag].cc_buf)
+                {
+                    hb_log("mpeg2 tag botch2: pts %"PRId64", tag pts %"PRId64" buf 0x%p",
+                           buf_es->start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
+                    hb_buffer_close( &m->tags[m->cur_tag].cc_buf );
+                }
+                // see if we already made a tag for the timestamp. If so we
+                // can just use it, otherwise make a new tag.
+                if (m->tags[m->cur_tag].start < 0)
+                {
+                    next_tag( m, buf_es );
+                }
+                m->tags[m->cur_tag].cc_buf = m->last_cc1_buf;
+            }
+        }
+        if( state == STATE_SEQUENCE )
         {
             if( !( m->width && m->height && m->rate ) )
             {
@@ -111,15 +393,21 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
                      * it keeps the pixel width & height that would cause
                      * the storage width & height to come out in the correct
                      * aspect ratio. Convert these back to aspect ratio.
-                     * We do the calc in floating point to get the rounding right.
-                     * We round in the second decimal digit because we scale
-                     * the (integer) aspect by 9 to preserve the 1st digit.
                      */
                     double ar_numer = m->width * m->info->sequence->pixel_width;
                     double ar_denom = m->height * m->info->sequence->pixel_height;
-                    m->aspect_ratio = ( ar_numer / ar_denom + .05 ) * HB_ASPECT_BASE;
+                    m->aspect_ratio = ar_numer / ar_denom;
                 }
             }
+            if ( m->info->sequence->width >> 1 == m->info->sequence->chroma_width &&
+                 m->info->sequence->height >> 1 == m->info->sequence->chroma_height )
+            {
+                m->pixfmt = PIX_FMT_YUV420P;
+            }
+            else
+            {
+                m->pixfmt = PIX_FMT_YUV422P;
+            }
         }
         else if( state == STATE_GOP && m->look_for_break)
         {
@@ -131,7 +419,9 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
         else if( ( state == STATE_SLICE || state == STATE_END ) &&
                  m->info->display_fbuf )
         {
-            if( ( m->info->display_picture->flags &
+            m->last_cc1_buf = NULL;
+
+            if( !m->got_iframe && ( m->info->display_picture->flags &
                   PIC_MASK_CODING_TYPE ) == PIC_FLAG_CODING_TYPE_I )
             {
                 // we got an iframe so we can start decoding video now
@@ -140,31 +430,24 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
 
             if( m->got_iframe )
             {
-                buf  = hb_buffer_init( m->width * m->height * 3 / 2 );
-                data = buf->data;
-
+                buf  = hb_copy_frame( m->job, m->info->sequence->width,
+                                      m->info->sequence->height,
+                                      m->pixfmt,
+                                      m->info->display_fbuf->buf[0],
+                                      m->info->display_fbuf->buf[1],
+                                      m->info->display_fbuf->buf[2] );
                 buf->sequence = buf_es->sequence;
 
-                memcpy( data, m->info->display_fbuf->buf[0],
-                        m->width * m->height );
-                data += m->width * m->height;
-                memcpy( data, m->info->display_fbuf->buf[1],
-                        m->width * m->height / 4 );
-                data += m->width * m->height / 4;
-                memcpy( data, m->info->display_fbuf->buf[2],
-                        m->width * m->height / 4 );
-
+                hb_buffer_t *cc_buf = NULL;
                 if( m->info->display_picture->flags & PIC_FLAG_TAGS )
                 {
-                    buf->start =
-                        ( (uint64_t) m->info->display_picture->tag << 32 ) |
-                        ( (uint64_t) m->info->display_picture->tag2 );
-                   /*
-                     * Add back in again to track PTS of MPEG2 frames
-                     * hb_log("MPEG2: Normal buf->start = %lld", buf->start);
-                   */
+                    int t = m->info->display_picture->tag;
+                    buf->start = m->tags[t].start;
+                    cc_buf = m->tags[t].cc_buf;
+                    m->tags[t].start = -1;
+                    m->tags[t].cc_buf = NULL;
                 }
-                else if( m->last_pts > -1 )
+                if( buf->start < 0 && m->last_pts >= 0 )
                 {
                     /* For some reason nb_fields is sometimes 1 while it
                        should be 2 */
@@ -172,11 +455,18 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
                         MAX( 2, m->info->display_picture->nb_fields ) *
                         m->info->sequence->frame_period / 600;
                 }
-                else
+                if ( buf->start >= 0 )
                 {
-                    buf->start = -1;
+                    m->last_pts = buf->start;
+                }
+
+                // if we were accumulating captions we now know the timestamp
+                // so ship them to the decoder.
+                if ( cc_buf )
+                {
+                    cc_buf->start = m->last_pts;
+                    cc_send_to_decoder( m, cc_buf );
                 }
-                m->last_pts = buf->start;
 
                 if( m->look_for_iframe && ( m->info->display_picture->flags &
                       PIC_MASK_CODING_TYPE ) == PIC_FLAG_CODING_TYPE_I )
@@ -194,28 +484,41 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
                                                          buf->new_chap - 1 );
                         chap_name = c->title;
                     }
-                    hb_log( "mpeg2: \"%s\" (%d) at frame %u time %lld",
+                    hb_log( "mpeg2: \"%s\" (%d) at frame %u time %"PRId64,
                             chap_name, buf->new_chap, m->nframes, buf->start );
                 }
+                else if ( m->nframes == 0 )
+                {
+                    // this is the first frame returned by the decoder
+                    m->first_pts = buf->start;
+                    if ( m->job && hb_list_item( m->job->title->list_chapter,
+                                                 m->job->chapter_start - 1 ) )
+                    {
+                        hb_chapter_t * c = hb_list_item( m->job->title->list_chapter,
+                                                         m->job->chapter_start - 1 );
+                        hb_log( "mpeg2: \"%s\" (%d) at frame %u time %"PRId64,
+                                c->title, m->job->chapter_start, m->nframes, buf->start );
+                    }
+                }
                 ++m->nframes;
 
-                flag = m->info->display_picture->flags;
+                m->flag = m->info->display_picture->flags;
 
 /*  Uncomment this block to see frame-by-frame picture flags, as the video encodes.
-               hb_log("***** MPEG 2 Picture Info for PTS %lld *****", buf->start);
-                if( flag & TOP_FIRST )
+               hb_log("***** MPEG 2 Picture Info for PTS %"PRId64" *****", buf->start);
+                if( m->flag & TOP_FIRST )
                     hb_log("MPEG2 Flag: Top field first");
-                if( flag & PROGRESSIVE )
+                if( m->flag & PROGRESSIVE )
                     hb_log("MPEG2 Flag: Progressive");
-                if( flag & COMPOSITE )
+                if( m->flag & COMPOSITE )
                     hb_log("MPEG2 Flag: Composite");
-                if( flag & SKIP )
+                if( m->flag & SKIP )
                     hb_log("MPEG2 Flag: Skip!");
-                if( flag & TAGS )
+                if( m->flag & TAGS )
                     hb_log("MPEG2 Flag: TAGS");
-                if(flag & REPEAT_FIRST )
+                if(fm->lag & REPEAT_FIRST )
                     hb_log("MPEG2 Flag: Repeat first field");
-                if( flag & COMPOSITE_MASK )
+                if( m->flag & COMPOSITE_MASK )
                     hb_log("MPEG2 Flag: Composite mask");
                 hb_log("fields: %d", m->info->display_picture->nb_fields);
 */
@@ -223,66 +526,66 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
                 int i = 0;
                 for(i=11; i > 0; i--)
                 {
-                    cadence[i] = cadence[i-1];
+                    m->cadence[i] = m->cadence[i-1];
                 }
 
-                if ( !(flag & PROGRESSIVE) && !(flag & TOP_FIRST) )
+                if ( !(m->flag & PROGRESSIVE) && !(m->flag & TOP_FIRST) )
                 {
                     /* Not progressive, not top first...
                        That means it's probably bottom
                        first, 2 fields displayed.
                     */
                     //hb_log("MPEG2 Flag: Bottom field first, 2 fields displayed.");
-                    cadence[0] = BT;
+                    m->cadence[0] = BT;
                 }
-                else if ( !(flag & PROGRESSIVE) && (flag & TOP_FIRST) )
+                else if ( !(m->flag & PROGRESSIVE) && (m->flag & TOP_FIRST) )
                 {
                     /* Not progressive, top is first,
                        Two fields displayed.
                     */
                     //hb_log("MPEG2 Flag: Top field first, 2 fields displayed.");
-                    cadence[0] = TB;
+                    m->cadence[0] = TB;
                 }
-                else if ( (flag & PROGRESSIVE) && !(flag & TOP_FIRST) && !( flag & REPEAT_FIRST )  )
+                else if ( (m->flag & PROGRESSIVE) && !(m->flag & TOP_FIRST) && !( m->flag & REPEAT_FIRST )  )
                 {
                     /* Progressive, but noting else.
                        That means Bottom first,
                        2 fields displayed.
                     */
                     //hb_log("MPEG2 Flag: Progressive. Bottom field first, 2 fields displayed.");
-                    cadence[0] = BT_PROG;
+                    m->cadence[0] = BT_PROG;
                 }
-                else if ( (flag & PROGRESSIVE) && !(flag & TOP_FIRST) && ( flag & REPEAT_FIRST )  )
+                else if ( (m->flag & PROGRESSIVE) && !(m->flag & TOP_FIRST) && ( m->flag & REPEAT_FIRST )  )
                 {
                     /* Progressive, and repeat. .
                        That means Bottom first,
                        3 fields displayed.
                     */
                     //hb_log("MPEG2 Flag: Progressive repeat. Bottom field first, 3 fields displayed.");
-                    cadence[0] = BTB_PROG;
+                    m->cadence[0] = BTB_PROG;
                 }
-                else if ( (flag & PROGRESSIVE) && (flag & TOP_FIRST) && !( flag & REPEAT_FIRST )  )
+                else if ( (m->flag & PROGRESSIVE) && (m->flag & TOP_FIRST) && !( m->flag & REPEAT_FIRST )  )
                 {
                     /* Progressive, top first.
                        That means top first,
                        2 fields displayed.
                     */
                     //hb_log("MPEG2 Flag: Progressive. Top field first, 2 fields displayed.");
-                    cadence[0] = TB_PROG;
+                    m->cadence[0] = TB_PROG;
                 }
-                else if ( (flag & PROGRESSIVE) && (flag & TOP_FIRST) && ( flag & REPEAT_FIRST )  )
+                else if ( (m->flag & PROGRESSIVE) && (m->flag & TOP_FIRST) && ( m->flag & REPEAT_FIRST )  )
                 {
                     /* Progressive, top, repeat.
                        That means top first,
                        3 fields displayed.
                     */
                     //hb_log("MPEG2 Flag: Progressive repeat. Top field first, 3 fields displayed.");
-                    cadence[0] = TBT_PROG;
+                    m->cadence[0] = TBT_PROG;
                 }
 
-                if ( (cadence[2] <= TB) && (cadence[1] <= TB) && (cadence[0] > TB) && (cadence[11]) )
+                if ( (m->cadence[2] <= TB) && (m->cadence[1] <= TB) && (m->cadence[0] > TB) && (m->cadence[11]) )
                     hb_log("%fs: Video -> Film", (float)buf->start / 90000);
-                if ( (cadence[2] > TB) && (cadence[1] <= TB) && (cadence[0] <= TB) && (cadence[11]) )
+                if ( (m->cadence[2] > TB) && (m->cadence[1] <= TB) && (m->cadence[0] <= TB) && (m->cadence[11]) )
                     hb_log("%fs: Film -> Video", (float)buf->start / 90000);
 
                 /* Store picture flags for later use by filters */
@@ -295,42 +598,62 @@ int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
         {
             mpeg2_reset( m->libmpeg2, 0 );
         }
-    }
-    return 1;
-}
 
-/**********************************************************************
- * hb_libmpeg2_info
- **********************************************************************
- *
- *********************************************************************/
-void hb_libmpeg2_info( hb_libmpeg2_t * m, int * width, int * height,
-                        int * rate, int *aspect_ratio )
-{
-    *width  = m->width;
-    *height = m->height;
-    if (m->info->display_fbuf)
-    {
-        if( (m->info->display_picture->flags & PROGRESSIVE) && (m->height == 480) )
+        /*
+         * Add closed captions to the title if we are scanning (no job).
+         *
+         * Just because we don't add this doesn't mean that there aren't any when 
+         * we scan, just that noone said anything. So you should be able to add
+         * closed captions some other way (See decmpeg2Init() for alternative
+         * approach of assuming that there are always CC, which is probably
+         * safer - however I want to leave the autodetect in here for now to
+         * see how it goes).
+         */
+        if( !m->job && m->title &&
+            have_captions( m->info->user_data, m->info->user_data_len ) )
         {
-            /* The frame is progressive and it's NTSC DVD height, so change its FPS to 23.976.
-               This might not be correct for the title. It's really just for scan.c's benefit.
-               Scan.c will reset the fps to 29.97, until a simple majority of the preview
-               frames report at 23.976.
-            */
-            //hb_log("Detecting NTSC Progressive Frame");
-            m->rate = 1126125;
+            hb_subtitle_t *subtitle;
+            int i = 0;
+            
+            while ( ( subtitle = hb_list_item( m->title->list_subtitle, i++ ) ) )
+            {
+                /*
+                 * Let's call them 608 subs for now even if they aren't,
+                 * since they are the only types we grok.
+                 */
+                if( subtitle->source == CC608SUB ) 
+                {
+                    break;
+                }
+            }
+            
+            if( ! subtitle )
+            {
+                subtitle = calloc( sizeof( hb_subtitle_t ), 1 );
+                subtitle->track = 0;
+                subtitle->id = 0;
+                subtitle->format = TEXTSUB;
+                subtitle->source = CC608SUB;
+                subtitle->config.dest = PASSTHRUSUB;
+                subtitle->type = 5; 
+                snprintf( subtitle->lang, sizeof( subtitle->lang ), "Closed Captions");
+                /*
+                 * The language of the subtitles will be the same as the first audio
+                 * track, i.e. the same as the video.
+                 */
+                hb_audio_t *audio = hb_list_item( m->title->list_audio, 0 );
+                if( audio )
+                {
+                    snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), 
+                              audio->config.lang.iso639_2);
+                } else {
+                    snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "und");
+                }
+                hb_list_add( m->title->list_subtitle, subtitle );
+            }
         }
     }
-    *rate   = m->rate;
-    *aspect_ratio = m->aspect_ratio;
-}
-
-int hb_libmpeg2_clear_aspect_ratio( hb_libmpeg2_t * m )
-{
-    int ar = m->aspect_ratio;
-    m->aspect_ratio = 0;
-    return ar;
+    return 1;
 }
 
 /**********************************************************************
@@ -338,12 +661,27 @@ int hb_libmpeg2_clear_aspect_ratio( hb_libmpeg2_t * m )
  **********************************************************************
  *
  *********************************************************************/
-void hb_libmpeg2_close( hb_libmpeg2_t ** _m )
+static void hb_libmpeg2_close( hb_libmpeg2_t ** _m )
 {
     hb_libmpeg2_t * m = *_m;
 
     mpeg2_close( m->libmpeg2 );
 
+    int i;
+    for ( i = 0; i < NTAGS; ++i )
+    {
+        if ( m->tags[i].cc_buf )
+        {
+            if ( m->tags[i].cc_buf == m->last_cc1_buf )
+                m->last_cc1_buf = NULL;
+            hb_buffer_close( &m->tags[i].cc_buf );
+        }
+    }
+    if ( m->last_cc1_buf )
+    {
+        hb_buffer_close( &m->last_cc1_buf );
+    }
+
     free( m );
     *_m = NULL;
 }
@@ -364,7 +702,7 @@ struct hb_work_private_s
  **********************************************************************
  *
  *********************************************************************/
-int decmpeg2Init( hb_work_object_t * w, hb_job_t * job )
+static int decmpeg2Init( hb_work_object_t * w, hb_job_t * job )
 {
     hb_work_private_t * pv;
 
@@ -376,6 +714,33 @@ int decmpeg2Init( hb_work_object_t * w, hb_job_t * job )
 
     pv->libmpeg2->job = job;
 
+    if( job && job->title ) {
+        pv->libmpeg2->title = job->title;
+    }
+
+    /*
+     * If not scanning, then are we supposed to extract Closed Captions
+     * and send them to the decoder? 
+     */
+    if( job && hb_list_count( job->list_subtitle ) > 0 )
+    {
+        hb_subtitle_t *subtitle;
+        int i = 0;
+        
+        for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+        while ( ( subtitle = hb_list_item( job->list_subtitle, i++ ) ) != NULL )
+        {
+            if( subtitle->source == CC608SUB ) 
+            {
+                if ( ! pv->libmpeg2->list_subtitle )
+                {
+                    pv->libmpeg2->list_subtitle = hb_list_init();
+                }
+                hb_list_add(pv->libmpeg2->list_subtitle, subtitle);
+            }
+        }
+    }
+
     return 0;
 }
 
@@ -384,17 +749,26 @@ int decmpeg2Init( hb_work_object_t * w, hb_job_t * job )
  **********************************************************************
  *
  *********************************************************************/
-int decmpeg2Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
-                   hb_buffer_t ** buf_out )
+static int decmpeg2Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
+                         hb_buffer_t ** buf_out )
 {
     hb_work_private_t * pv = w->private_data;
     hb_buffer_t * buf, * last = NULL;
+    int status = HB_WORK_OK;
+
+    if( w->title && pv && pv->libmpeg2 && !pv->libmpeg2->title ) {
+        pv->libmpeg2->title = w->title;
+    }
 
-    // The reader found a chapter break, consume it completely, and remove it from the
-    // stream. We need to shift it.
+    // The reader found a chapter break. Remove it from the input 
+    // stream. If we're reading (as opposed to scanning) start looking
+    // for the next GOP start since that's where the chapter begins.
     if( (*buf_in)->new_chap )
     {
-        pv->libmpeg2->look_for_break = (*buf_in)->new_chap;
+        if ( pv->libmpeg2->job )
+        {
+            pv->libmpeg2->look_for_break = (*buf_in)->new_chap;
+        }
         (*buf_in)->new_chap = 0;
     }
 
@@ -405,6 +779,26 @@ int decmpeg2Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
     {
         hb_list_add( pv->list, *buf_in );
         *buf_in = NULL;
+        status = HB_WORK_DONE;
+
+        /*
+         * Purge any pending caption buffer then let the Closed Captions decoder
+         * know that it is the end of the data.
+         */
+        if ( pv->libmpeg2->list_subtitle )
+        {
+            if ( pv->libmpeg2->last_cc1_buf )
+            {
+                cc_send_to_decoder( pv->libmpeg2, pv->libmpeg2->last_cc1_buf );
+                if ( pv->libmpeg2->tags[pv->libmpeg2->cur_tag].cc_buf == 
+                     pv->libmpeg2->last_cc1_buf )
+                {
+                    pv->libmpeg2->tags[pv->libmpeg2->cur_tag].cc_buf = NULL;
+                }
+                pv->libmpeg2->last_cc1_buf = NULL;
+            }
+            cc_send_to_decoder( pv->libmpeg2, hb_buffer_init( 0 ) );
+        }
     }
 
     *buf_out = NULL;
@@ -423,7 +817,7 @@ int decmpeg2Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
         }
     }
 
-    return HB_WORK_OK;
+    return status;
 }
 
 /**********************************************************************
@@ -431,21 +825,63 @@ int decmpeg2Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
  **********************************************************************
  *
  *********************************************************************/
-void decmpeg2Close( hb_work_object_t * w )
+static void decmpeg2Close( hb_work_object_t * w )
 {
     hb_work_private_t * pv = w->private_data;
-    hb_log( "mpeg2 done: %d frames", pv->libmpeg2->nframes );
+
+    // don't log during scan
+    if ( pv->libmpeg2->job )
+    {
+        hb_log( "mpeg2 done: %d frames", pv->libmpeg2->nframes );
+    }
     hb_list_close( &pv->list );
+    if ( pv->libmpeg2->list_subtitle )
+    {
+        hb_list_close( &pv->libmpeg2->list_subtitle );
+    }
     hb_libmpeg2_close( &pv->libmpeg2 );
     free( pv );
 }
 
+static int decmpeg2Info( hb_work_object_t *w, hb_work_info_t *info )
+{
+    hb_work_private_t *pv = w->private_data;
+
+    memset( info, 0, sizeof(*info) );
+
+    if ( pv && pv->libmpeg2 && pv->libmpeg2->info && pv->libmpeg2->info->sequence )
+    {
+        hb_libmpeg2_t *m = pv->libmpeg2;
+
+        info->width = m->width;
+        info->height = m->height;
+        info->pixel_aspect_width = m->info->sequence->pixel_width;
+        info->pixel_aspect_height = m->info->sequence->pixel_height;
+        info->aspect = m->aspect_ratio;
+
+        // if the frame is progressive & NTSC DVD height report it as 23.976 FPS
+        // so that scan can autodetect NTSC film
+        info->rate = 27000000;
+        info->rate_base = ( m->info->display_fbuf && m->info->display_picture &&
+                            (m->info->display_picture->flags & PROGRESSIVE) &&
+                            (m->height == 480 ) ) ?  1126125 : m->rate;
+
+        info->bitrate = m->info->sequence->byte_rate * 8;
+        info->profile = m->info->sequence->profile_level_id >> 4;
+        info->level = m->info->sequence->profile_level_id & 0xf;
+        info->name = "mpeg2";
+        return 1;
+    }
+    return 0;
+}
+
 hb_work_object_t hb_decmpeg2 =
 {
     WORK_DECMPEG2,
     "MPEG-2 decoder (libmpeg2)",
     decmpeg2Init,
     decmpeg2Work,
-    decmpeg2Close
+    decmpeg2Close,
+    decmpeg2Info
 };