From 29cb63a51474e10dd8ad264b50b20e79022cc14b Mon Sep 17 00:00:00 2001 From: jbrjake Date: Tue, 14 Aug 2007 16:15:30 +0000 Subject: Moves the filters' logging info to work.c, adds parameter info. I also changed the deinterlace filter name to include its default method (ffmpeg) and removed the logging line from work.c that said if job->deinterlace was true or not, as it's now superfluous. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@812 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/deinterlace.c | 2 +- libhb/hb.c | 1 - libhb/work.c | 15 ++++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c index 1da50d097..9d9337541 100644 --- a/libhb/deinterlace.c +++ b/libhb/deinterlace.c @@ -77,7 +77,7 @@ void hb_deinterlace_close( hb_filter_private_t * pv ); hb_filter_object_t hb_filter_deinterlace = { FILTER_DEINTERLACE, - "Deinterlace (yadif/mcdeint)", + "Deinterlace (ffmpeg or yadif/mcdeint)", NULL, hb_deinterlace_init, hb_deinterlace_work, diff --git a/libhb/hb.c b/libhb/hb.c index 2b8748e7e..861da0702 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -731,7 +731,6 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) for( i = 0; i < filter_count; i++ ) { hb_filter_object_t * filter = hb_list_item( job->filters, i ); - hb_log("Adding filter: %s", filter->name); hb_list_add( job_copy->filters, filter ); } } diff --git a/libhb/work.c b/libhb/work.c index 49ac70c1a..20347f884 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -140,8 +140,21 @@ static void do_job( hb_job_t * job, int cpu_count ) hb_log( " + %dx%d -> %dx%d, crop %d/%d/%d/%d", title->width, title->height, job->width, job->height, job->crop[0], job->crop[1], job->crop[2], job->crop[3] ); - hb_log( " + deinterlace %s", job->deinterlace ? "on" : "off" ); hb_log( " + grayscale %s", job->grayscale ? "on" : "off" ); + + if( job->filters ) + { + for( i = 0; i < hb_list_count( job->filters ); i++ ) + { + hb_filter_object_t * filter = hb_list_item( job->filters, i ); + hb_log(" + filter: %s", filter->name); + if (filter->settings) + hb_log(" + settings: %s", filter->settings); + else + hb_log(" + settings: default"); + } + } + if( job->vquality >= 0.0 && job->vquality <= 1.0 ) { hb_log( " + %.3f fps, video quality %.2f", (float) job->vrate / -- cgit v1.2.3