diff options
| -rw-r--r-- | libhb/hb.c | 2 | ||||
| -rw-r--r-- | libhb/muxcommon.c | 6 | ||||
| -rw-r--r-- | libhb/muxmp4.c | 5 | ||||
| -rw-r--r-- | libhb/work.c | 15 | ||||
| -rw-r--r-- | macosx/ExpressController.m | 3 |
5 files changed, 2 insertions, 29 deletions
diff --git a/libhb/hb.c b/libhb/hb.c index 0e7fa3462..d44c05de6 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -121,7 +121,7 @@ hb_handle_t * hb_init_real( int verbose, int update_check ) char * hb_get_version( hb_handle_t * h ) { - return "0.7.1a2";//HB_VERSION; + return HB_VERSION; } int hb_get_build( hb_handle_t * h ) diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c index 17628df11..93fa773e3 100644 --- a/libhb/muxcommon.c +++ b/libhb/muxcommon.c @@ -46,7 +46,6 @@ static hb_track_t * GetTrack( hb_list_t * list ) { track = track2; pts = buf->start; - //hb_log("track: #%d, frame count %ld, fifo size %d", i, track->frames, hb_fifo_size( track->fifo)); } } return track; @@ -120,14 +119,12 @@ static void MuxerFunc( void * _mux ) /* Build list of fifos we're interested in */ list = hb_list_init(); - hb_log( "mux: audio list count %d", hb_list_count( title->list_audio )); track = calloc( sizeof( hb_track_t ), 1 ); track->fifo = job->fifo_mpeg4; track->mux_data = job->mux_data; hb_list_add( list, track ); - hb_log( "mux: 1"); for( i = 0; i < hb_list_count( title->list_audio ); i++ ) { audio = hb_list_item( title->list_audio, i ); @@ -136,7 +133,6 @@ static void MuxerFunc( void * _mux ) track->mux_data = audio->mux_data; hb_list_add( list, track ); } - hb_log( "mux: 2"); while( !*job->die && !job->done ) { @@ -156,7 +152,6 @@ static void MuxerFunc( void * _mux ) } hb_buffer_close( &buf ); } - hb_log( "mux: 3"); if( job->pass != 1 ) { @@ -164,7 +159,6 @@ static void MuxerFunc( void * _mux ) uint64_t bytes_total, frames_total; m->end( m ); - hb_log( "mux: 4"); if( !stat( job->file, &sb ) ) { diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c index ed8df364f..971c4bfbb 100644 --- a/libhb/muxmp4.c +++ b/libhb/muxmp4.c @@ -179,15 +179,10 @@ static int MP4Mux( hb_mux_object_t * m, hb_mux_data_t * mux_data, static int MP4End( hb_mux_object_t * m ) { - hb_log("MP4End: enter"); av_write_trailer( m->format ); - hb_log("av_write_trailer: complete"); - url_fclose( &m->format->pb ); - hb_log("url_fclose: complete"); av_free( m->format ); - hb_log("MP4End: exit"); return 0; } diff --git a/libhb/work.c b/libhb/work.c index b4b3afefe..349a630e3 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -238,14 +238,12 @@ static void do_job( hb_job_t * job, int cpu_count ) if( w->work( w, NULL, NULL ) == HB_WORK_DONE ) { done = 1; - hb_log("Work is done."); } if( done && !hb_fifo_size( job->fifo_sync ) && !hb_fifo_size( job->fifo_render ) && hb_fifo_size( job->fifo_mpeg4 ) < 2 ) { - hb_log("Work is done and fifos are done."); break; } hb_snooze( 50 ); @@ -262,42 +260,29 @@ static void do_job( hb_job_t * job, int cpu_count ) w->close( w ); } - hb_log("Closing threads."); /* Stop read & write threads */ hb_thread_close( &job->reader ); hb_thread_close( &job->muxer ); /* Close fifos */ hb_fifo_close( &job->fifo_mpeg2 ); - hb_log("fifo_mpeg2 closed."); hb_fifo_close( &job->fifo_raw ); - hb_log("fifo_raw closed."); hb_fifo_close( &job->fifo_sync ); - hb_log("fifo_sync closed."); hb_fifo_close( &job->fifo_render ); - hb_log("fifo_render closed."); hb_fifo_close( &job->fifo_mpeg4 ); - hb_log("fifo_mpeg4 closed."); if( subtitle ) { hb_fifo_close( &subtitle->fifo_in ); - hb_log("fifo_in closed."); hb_fifo_close( &subtitle->fifo_raw ); - hb_log("fifo_raw closed."); } for( i = 0; i < hb_list_count( title->list_audio ); i++ ) { audio = hb_list_item( title->list_audio, i ); hb_fifo_close( &audio->fifo_in ); - hb_log("fifo_in closed."); hb_fifo_close( &audio->fifo_raw ); - hb_log("fifo_raw closed."); hb_fifo_close( &audio->fifo_sync ); - hb_log("fifo_sync closed."); hb_fifo_close( &audio->fifo_out ); - hb_log("fifo_out closed."); } - hb_log("do_job complete."); } static void work_loop( void * _w ) diff --git a/macosx/ExpressController.m b/macosx/ExpressController.m index b029c99fb..ec2ce5d7d 100644 --- a/macosx/ExpressController.m +++ b/macosx/ExpressController.m @@ -57,7 +57,7 @@ - (void) applicationWillFinishLaunching: (NSNotification *) n { - fHandle = hb_init_express( HB_DEBUG_ALL, 0);//HB_DEBUG_NONE, 0 ); + fHandle = hb_init_express( HB_DEBUG_NONE, 0 ); fList = hb_get_titles( fHandle ); } @@ -534,7 +534,6 @@ NSMutableString * string = [NSMutableString stringWithFormat: @"Converting: %.1f %%", 100.0 * progress_total]; - hb_log("Progress %.1f", progress_total * 100.0); if( p.seconds > -1 ) { [string appendFormat: @" (%.1f fps, ", p.rate_avg]; |