summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorjohnallen <[email protected]>2007-01-06 20:00:53 +0000
committerjohnallen <[email protected]>2007-01-06 20:00:53 +0000
commitc353aa54214353ed641b1f4fb00c96b6886b4ade (patch)
tree0c84ad257ac0905aefb8f3adead12d4b87302c33 /libhb
parent22be1c5718977a0da3ff709199f45d6e684af224 (diff)
added Doxyfile, config file for doxygen
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@93 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/hb.c2
-rw-r--r--libhb/muxcommon.c6
-rw-r--r--libhb/muxmp4.c5
-rw-r--r--libhb/work.c15
4 files changed, 27 insertions, 1 deletions
diff --git a/libhb/hb.c b/libhb/hb.c
index d44c05de6..0e7fa3462 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 HB_VERSION;
+ return "0.7.1a2";//HB_VERSION;
}
int hb_get_build( hb_handle_t * h )
diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c
index 93fa773e3..17628df11 100644
--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
@@ -46,6 +46,7 @@ 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;
@@ -119,12 +120,14 @@ 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 );
@@ -133,6 +136,7 @@ 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 )
{
@@ -152,6 +156,7 @@ static void MuxerFunc( void * _mux )
}
hb_buffer_close( &buf );
}
+ hb_log( "mux: 3");
if( job->pass != 1 )
{
@@ -159,6 +164,7 @@ 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 971c4bfbb..ed8df364f 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -179,10 +179,15 @@ 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 349a630e3..b4b3afefe 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -238,12 +238,14 @@ 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 );
@@ -260,29 +262,42 @@ 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 )