X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fmuxcommon.c;h=b6b5a2a579145bbd4cd525e12a34a32c46795b4c;hb=9972486f44c586225d98967441dcd3f3fd920636;hp=b64ebff857acf642bb43ccb1ca9483e97027a959;hpb=9da25f6c44cde68e69b0d721908593e3d988ec13;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c
index b64ebff8..b6b5a2a5 100644
--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
@@ -21,7 +21,6 @@ typedef struct
 
 typedef struct
 {
-    hb_fifo_t     * fifo;
     hb_mux_data_t * mux_data;
     uint64_t        frames;
     uint64_t        bytes;
@@ -30,21 +29,31 @@ typedef struct
 
 typedef struct
 {
-    hb_job_t    *job;
-    double      pts;        // end time of next muxing chunk
-    double      interleave; // size (in 90KHz ticks) of media chunks we mux
-    uint32_t    ntracks;    // total number of tracks we're muxing
-    uint32_t    eof;        // bitmask of track with eof
-    uint32_t    rdy;        // bitmask of tracks ready to output
-    uint32_t    allEof;     // valid bits in eof (all tracks)
-    uint32_t    allRdy;     // valid bits in rdy (audio & video tracks)
-    hb_track_t  *track[32]; // array of tracks to mux ('ntrack' elements)
-                            // NOTE- this array could be dynamically allocated
-                            // but the eof & rdy logic has to be changed to
-                            // handle more than 32 tracks anyway so we keep
-                            // it simple and fast.
+    hb_lock_t       * mutex;
+    int               ref;
+    int               done;
+    hb_mux_object_t * m;
+    double            pts;        // end time of next muxing chunk
+    double            interleave; // size in 90KHz ticks of media chunks we mux
+    uint32_t          ntracks;    // total number of tracks we're muxing
+    uint32_t          eof;        // bitmask of track with eof
+    uint32_t          rdy;        // bitmask of tracks ready to output
+    uint32_t          allEof;     // valid bits in eof (all tracks)
+    uint32_t          allRdy;     // valid bits in rdy (audio & video tracks)
+    hb_track_t      * track[32];  // array of tracks to mux ('ntrack' elements)
+                                  // NOTE- this array could be dynamically 
+                                  // allocated but the eof & rdy logic has to 
+                                  // be changed to handle more than 32 tracks 
+                                  // anyway so we keep it simple and fast.
 } hb_mux_t;
 
+struct hb_work_private_s
+{
+    hb_job_t * job;
+    int        track;
+    hb_mux_t * mux;
+};
+
 // The muxer handles two different kinds of media: Video and audio tracks
 // are continuous: once they start they generate continuous, consecutive
 // sequence of bufs until they end. The muxer will time align all continuous
@@ -73,7 +82,7 @@ typedef struct
 // routine OutputTrackChunk). 'is_continuous' must be 1 for an audio or video
 // track and 0 otherwise (see above).
 
-static void add_mux_track( hb_mux_t *mux, hb_fifo_t *fifo, hb_mux_data_t *mux_data,
+static void add_mux_track( hb_mux_t *mux, hb_mux_data_t *mux_data,
                            int is_continuous )
 {
     int max_tracks = sizeof(mux->track) / sizeof(*(mux->track));
@@ -84,7 +93,6 @@ static void add_mux_track( hb_mux_t *mux, hb_fifo_t *fifo, hb_mux_data_t *mux_da
     }
 
     hb_track_t *track = calloc( sizeof( hb_track_t ), 1 );
-    track->fifo = fifo;
     track->mux_data = mux_data;
     track->mf.flen = 8;
     track->mf.fifo = calloc( sizeof(track->mf.fifo[0]), track->mf.flen );
@@ -95,10 +103,19 @@ static void add_mux_track( hb_mux_t *mux, hb_fifo_t *fifo, hb_mux_data_t *mux_da
     mux->allRdy |= is_continuous << t;
 }
 
-static void mf_push( hb_track_t *track, hb_buffer_t *buf )
+static void mf_push( hb_mux_t * mux, int tk, hb_buffer_t *buf )
 {
+    hb_track_t * track = mux->track[tk];
     uint32_t mask = track->mf.flen - 1;
     uint32_t in = track->mf.in;
+
+    if ( ( ( in + 2 ) & mask ) == ( track->mf.out & mask ) )
+    {
+        if ( track->mf.flen >= 256 )
+        {
+            mux->rdy = mux->allRdy;
+        }
+    }
     if ( ( ( in + 1 ) & mask ) == ( track->mf.out & mask ) )
     {
         // fifo is full - expand it to double the current size.
@@ -141,76 +158,256 @@ static hb_buffer_t *mf_pull( hb_track_t *track )
     return b;
 }
 
-static void MoveToInternalFifos( hb_mux_t *mux )
+static hb_buffer_t *mf_peek( hb_track_t *track )
 {
-    int i;
-    int discard = mux->job->pass != 0 && mux->job->pass != 2;
+    return track->mf.out == track->mf.in ?
+                NULL : track->mf.fifo[track->mf.out & (track->mf.flen - 1)];
+}
+
+static void MoveToInternalFifos( int tk, hb_mux_t *mux, hb_buffer_t * buf )
+{
+    // move all the buffers on the track's fifo to our internal
+    // fifo so that (a) we don't deadlock in the reader and
+    // (b) we can control how data from multiple tracks is
+    // interleaved in the output file.
+    mf_push( mux, tk, buf );
+    if ( buf->stop >= mux->pts )
+    {
+        // buffer is past our next interleave point so
+        // note that this track is ready to be output.
+        mux->rdy |= ( 1 << tk );
+    }
+}
+
+static void OutputTrackChunk( hb_mux_t *mux, hb_track_t *track, hb_mux_object_t *m )
+{
+    hb_buffer_t *buf;
+
+    while ( ( buf = mf_peek( track ) ) != NULL && buf->start < mux->pts )
+    {
+        buf = mf_pull( track );
+        track->frames += 1;
+        track->bytes  += buf->size;
+        m->mux( m, track->mux_data, buf );
+    }
+}
+
+static int muxWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
+                     hb_buffer_t ** buf_out )
+{
+    hb_work_private_t * pv = w->private_data;
+    hb_job_t    * job = pv->job;
+    hb_mux_t    * mux = pv->mux;
+    hb_track_t  * track;
+    int           i;
+    hb_buffer_t * buf = *buf_in;
+
+    hb_lock( mux->mutex );
+    if ( mux->done )
+    {
+        hb_unlock( mux->mutex );
+        return HB_WORK_DONE;
+    }
+
+    if ( buf->size <= 0 )
+    {
+        // EOF - mark this track as done
+        hb_buffer_close( &buf );
+        mux->eof |= ( 1 << pv->track );
+        mux->rdy |= ( 1 << pv->track );
+    }
+    else if ( ( job->pass != 0 && job->pass != 2 ) ||
+              ( mux->eof & (1 << pv->track) ) )
+    {
+        hb_buffer_close( &buf );
+    }
+    else
+    {
+        MoveToInternalFifos( pv->track, mux, buf );
+    }
+    *buf_in = NULL;
+
+    if ( ( mux->rdy & mux->allRdy ) != mux->allRdy )
+    {
+        hb_unlock( mux->mutex );
+        return HB_WORK_OK;
+    }
 
-    for( i = 0; i < mux->ntracks; ++i )
+    // all tracks have at least 'interleave' ticks of data. Output
+    // all that we can in 'interleave' size chunks.
+    while ( ( mux->rdy & mux->allRdy ) == mux->allRdy )
     {
-        if ( ( mux->eof & (1 << i) ) == 0 )
+        for ( i = 0; i < mux->ntracks; ++i )
         {
-            hb_track_t *track = mux->track[i];
-            hb_buffer_t *buf;
-            
-            // move all the buffers on the track's fifo to our internal
-            // fifo so that (a) we don't deadlock in the reader and
-            // (b) we can control how data from multiple tracks is
-            // interleaved in the output file.
-            while ( ( buf = hb_fifo_get( track->fifo ) ) )
+            track = mux->track[i];
+            OutputTrackChunk( mux, track, mux->m );
+
+            // if the track is at eof or still has data that's past
+            // our next interleave point then leave it marked as rdy.
+            // Otherwise clear rdy.
+            if ( ( mux->eof & (1 << i) ) == 0 &&
+                 ( track->mf.out == track->mf.in ||
+                   track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->stop
+                     < mux->pts + mux->interleave ) )
             {
-                if ( buf->size <= 0 )
+                mux->rdy &=~ ( 1 << i );
+            }
+        }
+
+        // if all the tracks are at eof we're just purging their
+        // remaining data -- keep going until all internal fifos are empty.
+        if ( mux->eof == mux->allEof )
+        {
+            for ( i = 0; i < mux->ntracks; ++i )
+            {
+                if ( mux->track[i]->mf.out != mux->track[i]->mf.in )
                 {
-                    // EOF - mark this track as done
-                    hb_buffer_close( &buf );
-                    mux->eof |= ( 1 << i );
-                    mux->rdy |= ( 1 << i );
-                    continue;
+                    break;
                 }
-                if ( discard )
+            }
+            if ( i >= mux->ntracks )
+            {
+                mux->done = 1;
+                hb_unlock( mux->mutex );
+                return HB_WORK_DONE;
+            }
+        }
+        mux->pts += mux->interleave;
+    }
+    hb_unlock( mux->mutex );
+    return HB_WORK_OK;
+}
+
+void muxClose( hb_work_object_t * w )
+{
+    hb_work_private_t * pv = w->private_data;
+    hb_mux_t    * mux = pv->mux;
+    hb_job_t    * job = pv->job;
+    hb_track_t  * track;
+    int           i;
+
+    hb_lock( mux->mutex );
+    if ( --mux->ref == 0 )
+    {
+        // Update state before closing muxer.  Closing the muxer
+        // may initiate optimization which can take a while and
+        // we want the muxing state to be visible while this is
+        // happening.
+        if( job->pass == 0 || job->pass == 2 )
+        {
+            /* Update the UI */
+            hb_state_t state;
+            state.state = HB_STATE_MUXING;
+            state.param.muxing.progress = 0;
+            hb_set_state( job->h, &state );
+        }
+
+        if( mux->m )
+        {
+            mux->m->end( mux->m );
+            free( mux->m );
+        }
+
+        // we're all done muxing -- print final stats and cleanup.
+        if( job->pass == 0 || job->pass == 2 )
+        {
+            struct stat sb;
+            uint64_t bytes_total, frames_total;
+
+            if( !stat( job->file, &sb ) )
+            {
+                hb_deep_log( 2, "mux: file size, %"PRId64" bytes", (uint64_t) sb.st_size );
+
+                bytes_total  = 0;
+                frames_total = 0;
+                for( i = 0; i < mux->ntracks; ++i )
                 {
-                    hb_buffer_close( &buf );
-                    continue;
+                    track = mux->track[i];
+                    hb_log( "mux: track %d, %"PRId64" frames, %"PRId64" bytes, %.2f kbps, fifo %d",
+                            i, track->frames, track->bytes,
+                            90000.0 * track->bytes / mux->pts / 125,
+                            track->mf.flen );
+                    if( !i && ( job->vquality < 0.0 || job->vquality > 1.0 ) )
+                    {
+                        /* Video */
+                        hb_deep_log( 2, "mux: video bitrate error, %+"PRId64" bytes",
+                                (int64_t)(track->bytes - mux->pts * job->vbitrate * 125 / 90000) );
+                    }
+                    bytes_total  += track->bytes;
+                    frames_total += track->frames;
                 }
-                mf_push( track, buf );
-                if ( buf->stop >= mux->pts )
+
+                if( bytes_total && frames_total )
                 {
-                    // buffer is past our next interleave point so
-                    // note that this track is ready to be output.
-                    mux->rdy |= ( 1 << i );
+                    hb_deep_log( 2, "mux: overhead, %.2f bytes per frame",
+                            (float) ( sb.st_size - bytes_total ) /
+                            frames_total );
                 }
             }
         }
+    
+        for( i = 0; i < mux->ntracks; ++i )
+        {
+            track = mux->track[i];
+            if( track->mux_data )
+            {
+                free( track->mux_data );
+                free( track->mf.fifo );
+            }
+            free( track );
+        }
+        hb_unlock( mux->mutex );
+        hb_lock_close( &mux->mutex );
+        free( mux );
+    }
+    else
+    {
+        hb_unlock( mux->mutex );
     }
+    free( pv );
+    w->private_data = NULL;
 }
 
-static void OutputTrackChunk( hb_mux_t *mux, hb_track_t *track, hb_mux_object_t *m )
+static void mux_loop( void * _w )
 {
-    hb_buffer_t *buf;
+    hb_work_object_t  * w = _w;
+    hb_work_private_t * pv = w->private_data;
+    hb_job_t          * job = pv->job;
+    hb_buffer_t       * buf_in;
 
-    while ( ( buf = mf_pull( track ) ) != NULL )
+    while ( !*job->die && w->status != HB_WORK_DONE )
     {
-        m->mux( m, track->mux_data, buf );
-        track->frames += 1;
-        track->bytes  += buf->size;
-
-        uint64_t pts = buf->stop;
-        hb_buffer_close( &buf );
-        if ( pts >= mux->pts )
+        buf_in = hb_fifo_get_wait( w->fifo_in );
+        if ( pv->mux->done )
+            break;
+        if ( buf_in == NULL )
+            continue;
+        if ( *job->die )
         {
+            if( buf_in )
+            {
+                hb_buffer_close( &buf_in );
+            }
             break;
         }
+
+        w->status = w->work( w, &buf_in, NULL );
+        if( buf_in )
+        {
+            hb_buffer_close( &buf_in );
+        }
     }
 }
 
-static void MuxerFunc( void * _mux )
+hb_work_object_t * hb_muxer_init( hb_job_t * job )
 {
-    hb_mux_t    * mux = _mux;
-    hb_job_t    * job = mux->job;
     hb_title_t  * title = job->title;
-    hb_track_t  * track;
     int           i;
-    hb_mux_object_t * m = NULL;
+    hb_mux_t    * mux = calloc( sizeof( hb_mux_t ), 1 );
+    hb_work_object_t  * w;
+    hb_work_object_t  * muxer;
+
+    mux->mutex = hb_lock_init();
 
     // set up to interleave track data in blocks of 1 video frame time.
     // (the best case for buffering and playout latency). The container-
@@ -226,167 +423,93 @@ static void MuxerFunc( void * _mux )
         case HB_MUX_MP4:
         case HB_MUX_PSP:
         case HB_MUX_IPOD:
-            m = hb_mux_mp4_init( job );
+            mux->m = hb_mux_mp4_init( job );
             break;
         case HB_MUX_AVI:
-            m = hb_mux_avi_init( job );
+            mux->m = hb_mux_avi_init( job );
             break;
         case HB_MUX_OGM:
-            m = hb_mux_ogm_init( job );
+            mux->m = hb_mux_ogm_init( job );
             break;
         case HB_MUX_MKV:
-            m = hb_mux_mkv_init( job );
+            mux->m = hb_mux_mkv_init( job );
             break;
         default:
             hb_error( "No muxer selected, exiting" );
             *job->die = 1;
+            return NULL;
         }
         /* Create file, write headers */
-        if( m )
+        if( mux->m )
         {
-            m->init( m );
+            mux->m->init( mux->m );
         }
     }
 
-    /* Build list of fifos we're interested in */
+    /* Initialize the work objects that will receive fifo data */
 
-    add_mux_track( mux, job->fifo_mpeg4, job->mux_data, 1 );
+    muxer = hb_get_work( WORK_MUX );
+    muxer->private_data = calloc( sizeof( hb_work_private_t ), 1 );
+    muxer->private_data->job = job;
+    muxer->private_data->mux = mux;
+    mux->ref++;
+    muxer->private_data->track = mux->ntracks;
+    muxer->fifo_in = job->fifo_mpeg4;
+    add_mux_track( mux, job->mux_data, 1 );
+    muxer->done = &muxer->private_data->mux->done;
 
     for( i = 0; i < hb_list_count( title->list_audio ); i++ )
     {
         hb_audio_t  *audio = hb_list_item( title->list_audio, i );
-        add_mux_track( mux, audio->priv.fifo_out, audio->priv.mux_data, 1 );
-    }
-
-
-    // The following 'while' is the main muxing loop.
-
-    int thread_sleep_interval = 50;
-    while( !*job->die )
-    {
-        MoveToInternalFifos( mux );
-        if (  mux->rdy != mux->allRdy )
-        {
-            hb_snooze( thread_sleep_interval );
-            continue;
-        }
 
-        // all tracks have at least 'interleave' ticks of data. Output
-        // all that we can in 'interleave' size chunks.
-        while ( mux->rdy == mux->allRdy )
-        {
-            for ( i = 0; i < mux->ntracks; ++i )
-            {
-                track = mux->track[i];
-                OutputTrackChunk( mux, track, m );
-
-                // if the track is at eof or still has data that's past
-                // our next interleave point then leave it marked as rdy.
-                // Otherwise clear rdy.
-                if ( ( mux->eof & (1 << i) ) == 0 &&
-                     ( track->mf.out == track->mf.in ||
-                       track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->stop
-                         < mux->pts + mux->interleave ) )
-                {
-                    mux->rdy &=~ ( 1 << i );
-                }
-            }
-
-            // if all the tracks are at eof we're just purging their
-            // remaining data -- keep going until all internal fifos are empty.
-            if ( mux->eof == mux->allEof )
-            {
-                for ( i = 0; i < mux->ntracks; ++i )
-                {
-                    if ( mux->track[i]->mf.out != mux->track[i]->mf.in )
-                    {
-                        break;
-                    }
-                }
-                if ( i >= mux->ntracks )
-                {
-                    goto finished;
-                }
-            }
-            mux->pts += mux->interleave;
-        }
+        w = hb_get_work( WORK_MUX );
+        w->private_data = calloc( sizeof( hb_work_private_t ), 1 );
+        w->private_data->job = job;
+        w->private_data->mux = mux;
+        mux->ref++;
+        w->private_data->track = mux->ntracks;
+        w->fifo_in = audio->priv.fifo_out;
+        add_mux_track( mux, audio->priv.mux_data, 1 );
+        w->done = &job->done;
+        hb_list_add( job->list_work, w );
+        w->thread = hb_thread_init( w->name, mux_loop, w, HB_NORMAL_PRIORITY );
     }
 
-    // we're all done muxing -- print final stats and cleanup.
-finished:
-    if( job->pass == 0 || job->pass == 2 )
+    for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
     {
-        struct stat sb;
-        uint64_t bytes_total, frames_total;
-
-#define p state.param.muxing
-        /* Update the UI */
-        hb_state_t state;
-        state.state   = HB_STATE_MUXING;
-        p.progress = 0;
-        hb_set_state( job->h, &state );
-#undef p
-        if( m )
-        {
-            m->end( m );
-        }
-
-        if( !stat( job->file, &sb ) )
-        {
-            hb_deep_log( 2, "mux: file size, %lld bytes", (uint64_t) sb.st_size );
-
-            bytes_total  = 0;
-            frames_total = 0;
-            for( i = 0; i < mux->ntracks; ++i )
-            {
-                track = mux->track[i];
-                hb_log( "mux: track %d, %lld frames, %lld bytes, %.2f kbps, fifo %d",
-                        i, track->frames, track->bytes,
-                        90000.0 * track->bytes / mux->pts / 125,
-                        track->mf.flen );
-                if( !i && ( job->vquality < 0.0 || job->vquality > 1.0 ) )
-                {
-                    /* Video */
-                    hb_deep_log( 2, "mux: video bitrate error, %+lld bytes",
-                            track->bytes - mux->pts * job->vbitrate *
-                            125 / 90000 );
-                }
-                bytes_total  += track->bytes;
-                frames_total += track->frames;
-            }
+        hb_subtitle_t  *subtitle = hb_list_item( title->list_subtitle, i );
 
-            if( bytes_total && frames_total )
-            {
-                hb_deep_log( 2, "mux: overhead, %.2f bytes per frame",
-                        (float) ( sb.st_size - bytes_total ) /
-                        frames_total );
-            }
-        }
-    }
-    
-    if( m )
-    {
-        free( m );
-    }
+        if (subtitle->config.dest != PASSTHRUSUB)
+            continue;
 
-    for( i = 0; i < mux->ntracks; ++i )
-    {
-        track = mux->track[i];
-        if( track->mux_data )
-        {
-            free( track->mux_data );
-            free( track->mf.fifo );
-        }
-        free( track );
+        w = hb_get_work( WORK_MUX );
+        w->private_data = calloc( sizeof( hb_work_private_t ), 1 );
+        w->private_data->job = job;
+        w->private_data->mux = mux;
+        mux->ref++;
+        w->private_data->track = mux->ntracks;
+        w->fifo_in = subtitle->fifo_out;
+        add_mux_track( mux, subtitle->mux_data, 0 );
+        w->done = &job->done;
+        hb_list_add( job->list_work, w );
+        w->thread = hb_thread_init( w->name, mux_loop, w, HB_NORMAL_PRIORITY );
     }
-
-    free( mux );
+    return muxer;
 }
 
-hb_thread_t * hb_muxer_init( hb_job_t * job )
+// muxInit does nothing because the muxer has a special initializer
+// that takes care of initializing all muxer work objects
+static int muxInit( hb_work_object_t * w, hb_job_t * job )
 {
-    hb_mux_t * mux = calloc( sizeof( hb_mux_t ), 1 );
-    mux->job = job;
-    return hb_thread_init( "muxer", MuxerFunc, mux,
-                           HB_NORMAL_PRIORITY );
+    return 0;
 }
+
+hb_work_object_t hb_muxer =
+{
+    WORK_MUX,
+    "Muxer",
+    muxInit,
+    muxWork,
+    muxClose
+};
+