X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=11b80357e26c9ff777c6fabdc818c2b150b83c3f;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=bdd2353d94267b08acbf839442571840adc0f068;hpb=25cdc7534f4c28481dc3f4f0c77022a457cdede3;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/libhb/hb.c b/libhb/hb.c
index bdd2353d..11b80357 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -1,18 +1,23 @@
-/* $Id: hb.c,v 1.43 2005/04/27 21:05:24 titer Exp $
-
- This file is part of the HandBrake source code.
- Homepage: .
- It may be used under the terms of the GNU General Public License. */
-
#include "hb.h"
-
-#include "ffmpeg/avcodec.h"
+#include "hbffmpeg.h"
+#include
+#include
+#include
+
+#if defined( SYS_MINGW )
+#include
+#if defined( PTW32_STATIC_LIB )
+#include
+#endif
+#endif
struct hb_handle_s
{
+ int id;
+
/* The "Check for update" thread */
int build;
- char version[16];
+ char version[32];
hb_thread_t * update_thread;
/* This thread's only purpose is to check other threads'
@@ -28,7 +33,9 @@ struct hb_handle_s
/* The thread which processes the jobs. Others threads are launched
from this one (see work.c) */
hb_list_t * jobs;
+ hb_job_t * current_job;
int job_count;
+ int job_count_permanent;
volatile int work_die;
int work_error;
hb_thread_t * work_thread;
@@ -40,11 +47,142 @@ struct hb_handle_s
int paused;
hb_lock_t * pause_lock;
+ /* For MacGui active queue
+ increments each time the scan thread completes*/
+ int scanCount;
+ volatile int scan_die;
+
+ /* Stash of persistent data between jobs, for stuff
+ like correcting frame count and framerate estimates
+ on multi-pass encodes where frames get dropped. */
+ hb_interjob_t * interjob;
+
};
+hb_lock_t *hb_avcodec_lock;
hb_work_object_t * hb_objects = NULL;
+int hb_instance_counter = 0;
+int hb_process_initialized = 0;
static void thread_func( void * );
+hb_title_t * hb_get_title_by_index( hb_handle_t *, int );
+
+void hb_avcodec_init()
+{
+ hb_avcodec_lock = hb_lock_init();
+ av_register_all();
+}
+
+int hb_avcodec_open(AVCodecContext *avctx, AVCodec *codec)
+{
+ int ret;
+ hb_lock( hb_avcodec_lock );
+ ret = avcodec_open(avctx, codec);
+ hb_unlock( hb_avcodec_lock );
+ return ret;
+}
+
+int hb_avcodec_close(AVCodecContext *avctx)
+{
+ int ret;
+ hb_lock( hb_avcodec_lock );
+ ret = avcodec_close(avctx);
+ hb_unlock( hb_avcodec_lock );
+ return ret;
+}
+
+int hb_ff_layout_xlat(int64_t ff_channel_layout, int channels)
+{
+ int hb_layout;
+
+ switch (ff_channel_layout)
+ {
+ case CH_LAYOUT_MONO:
+ hb_layout = HB_INPUT_CH_LAYOUT_MONO;
+ break;
+ case CH_LAYOUT_STEREO:
+ hb_layout = HB_INPUT_CH_LAYOUT_STEREO;
+ break;
+ case CH_LAYOUT_SURROUND:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F;
+ break;
+ case CH_LAYOUT_4POINT0:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F1R;
+ break;
+ case CH_LAYOUT_2_2:
+ hb_layout = HB_INPUT_CH_LAYOUT_2F2R;
+ break;
+ case CH_LAYOUT_QUAD:
+ hb_layout = HB_INPUT_CH_LAYOUT_2F2R;
+ break;
+ case CH_LAYOUT_5POINT0:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F2R;
+ break;
+ case CH_LAYOUT_5POINT1:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE;
+ break;
+ case CH_LAYOUT_5POINT0_BACK:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F2R;
+ break;
+ case CH_LAYOUT_5POINT1_BACK:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE;
+ break;
+ case CH_LAYOUT_7POINT0:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F4R;
+ break;
+ case CH_LAYOUT_7POINT1:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE;
+ break;
+ case CH_LAYOUT_STEREO_DOWNMIX:
+ hb_layout = HB_INPUT_CH_LAYOUT_STEREO;
+ break;
+ default:
+ hb_layout = HB_INPUT_CH_LAYOUT_STEREO;
+ break;
+ }
+ // Now make sure the chosen layout agrees with the number of channels
+ // ffmpeg tells us there are. It seems ffmpeg is sometimes confused
+ // about this. So we will make a best guess based on the number
+ // of channels.
+ int chans = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( hb_layout );
+ if ( chans == channels )
+ {
+ return hb_layout;
+ }
+ hb_log( "Channels reported by ffmpeg (%d) != computed layout channels (%d).", channels, chans );
+ switch (channels)
+ {
+ case 1:
+ hb_layout = HB_INPUT_CH_LAYOUT_MONO;
+ break;
+ case 2:
+ hb_layout = HB_INPUT_CH_LAYOUT_STEREO;
+ break;
+ case 3:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F;
+ break;
+ case 4:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F1R;
+ break;
+ case 5:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F2R;
+ break;
+ case 6:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE;
+ break;
+ case 7:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F4R;
+ break;
+ case 8:
+ hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE;
+ break;
+ default:
+ hb_log("Unsupported number of audio channels (%d).\n", channels);
+ hb_layout = 0;
+ break;
+ }
+ return hb_layout;
+}
/**
* Registers work objects, by adding the work object to a liked list.
@@ -57,12 +195,160 @@ void hb_register( hb_work_object_t * w )
}
/**
+ * Ensures that the process has been initialized.
+ */
+static void process_init()
+{
+ if (!hb_process_initialized)
+ {
+#if defined( SYS_MINGW ) && defined( PTW32_STATIC_LIB )
+ pthread_win32_process_attach_np();
+#endif
+
+#if defined( _WIN32 ) || defined( __MINGW32__ )
+ setvbuf( stdout, NULL, _IONBF, 0 );
+ setvbuf( stderr, NULL, _IONBF, 0 );
+#endif
+ hb_process_initialized = 1;
+ }
+
+}
+
+void (*hb_log_callback)(const char* message);
+static void redirect_thread_func(void *);
+
+#if defined( SYS_MINGW )
+#define pipe(phandles) _pipe (phandles, 4096, _O_BINARY)
+#endif
+
+/**
+ * Registers the given function as a logger. All logs will be passed to it.
+ * @param log_cb The function to register as a logger.
+ */
+void hb_register_logger( void (*log_cb)(const char* message) )
+{
+ process_init();
+
+ hb_log_callback = log_cb;
+ hb_thread_init("ioredirect", redirect_thread_func, NULL, HB_NORMAL_PRIORITY);
+}
+
+/**
* libhb initialization routine.
* @param verbose HB_DEBUG_NONE or HB_DEBUG_ALL.
* @param update_check signals libhb to check for updated version from HandBrake website.
* @return Handle to hb_handle_t for use on all subsequent calls to libhb.
*/
-hb_handle_t * hb_init_real( int verbose, int update_check )
+hb_handle_t * hb_init( int verbose, int update_check )
+{
+ process_init();
+
+ hb_handle_t * h = calloc( sizeof( hb_handle_t ), 1 );
+ uint64_t date;
+
+ /* See hb_deep_log() and hb_log() in common.c */
+ global_verbosity_level = verbose;
+ if( verbose )
+ putenv( "HB_DEBUG=1" );
+
+ h->id = hb_instance_counter++;
+
+ /* Check for an update on the website if asked to */
+ h->build = -1;
+
+ if( update_check )
+ {
+ hb_log( "hb_init: checking for updates" );
+ date = hb_get_date();
+ h->update_thread = hb_update_init( &h->build, h->version );
+
+ for( ;; )
+ {
+ if( hb_thread_has_exited( h->update_thread ) )
+ {
+ /* Immediate success or failure */
+ hb_thread_close( &h->update_thread );
+ break;
+ }
+ if( hb_get_date() > date + 1000 )
+ {
+ /* Still nothing after one second. Connection problem,
+ let the thread die */
+ hb_log( "hb_init: connection problem, not waiting for "
+ "update_thread" );
+ break;
+ }
+ hb_snooze( 500 );
+ }
+ }
+
+ /*
+ * Initialise buffer pool
+ */
+ hb_buffer_pool_init();
+
+ /* CPU count detection */
+ hb_log( "hb_init: checking cpu count" );
+ h->cpu_count = hb_get_cpu_count();
+
+ h->list_title = hb_list_init();
+ h->jobs = hb_list_init();
+
+ h->state_lock = hb_lock_init();
+ h->state.state = HB_STATE_IDLE;
+
+ h->pause_lock = hb_lock_init();
+
+ h->interjob = calloc( sizeof( hb_interjob_t ), 1 );
+
+ /* libavcodec */
+ hb_avcodec_init();
+
+ /* Start library thread */
+ hb_log( "hb_init: starting libhb thread" );
+ h->die = 0;
+ h->main_thread = hb_thread_init( "libhb", thread_func, h,
+ HB_NORMAL_PRIORITY );
+ hb_register( &hb_sync_video );
+ hb_register( &hb_sync_audio );
+ hb_register( &hb_decmpeg2 );
+ hb_register( &hb_decvobsub );
+ hb_register( &hb_encvobsub );
+ hb_register( &hb_deccc608 );
+ hb_register( &hb_decsrtsub );
+ hb_register( &hb_decutf8sub );
+ hb_register( &hb_dectx3gsub );
+ hb_register( &hb_decssasub );
+ hb_register( &hb_render );
+ hb_register( &hb_encavcodec );
+ hb_register( &hb_encx264 );
+ hb_register( &hb_enctheora );
+ hb_register( &hb_deca52 );
+ hb_register( &hb_decdca );
+ hb_register( &hb_decavcodec );
+ hb_register( &hb_decavcodecv );
+ hb_register( &hb_decavcodecvi );
+ hb_register( &hb_decavcodecai );
+ hb_register( &hb_declpcm );
+ hb_register( &hb_encfaac );
+ hb_register( &hb_enclame );
+ hb_register( &hb_encvorbis );
+ hb_register( &hb_muxer );
+#ifdef __APPLE__
+ hb_register( &hb_encca_aac );
+#endif
+
+ return h;
+}
+
+/**
+ * libhb initialization routine.
+ * This version is to use when calling the dylib, the macro hb_init isn't available from a dylib call!
+ * @param verbose HB_DEBUG_NONE or HB_DEBUG_ALL.
+ * @param update_check signals libhb to check for updated version from HandBrake website.
+ * @return Handle to hb_handle_t for use on all subsequent calls to libhb.
+ */
+hb_handle_t * hb_init_dl( int verbose, int update_check )
{
hb_handle_t * h = calloc( sizeof( hb_handle_t ), 1 );
uint64_t date;
@@ -73,6 +359,8 @@ hb_handle_t * hb_init_real( int verbose, int update_check )
putenv( "HB_DEBUG=1" );
}
+ h->id = hb_instance_counter++;
+
/* Check for an update on the website if asked to */
h->build = -1;
@@ -108,6 +396,7 @@ hb_handle_t * hb_init_real( int verbose, int update_check )
h->list_title = hb_list_init();
h->jobs = hb_list_init();
+ h->current_job = NULL;
h->state_lock = hb_lock_init();
h->state.state = HB_STATE_IDLE;
@@ -116,9 +405,7 @@ hb_handle_t * hb_init_real( int verbose, int update_check )
/* libavcodec */
avcodec_init();
- register_avcodec( &mpeg4_encoder );
- register_avcodec( &mp2_decoder );
- register_avcodec( &ac3_encoder );
+ avcodec_register_all();
/* Start library thread */
hb_log( "hb_init: starting libhb thread" );
@@ -126,9 +413,39 @@ hb_handle_t * hb_init_real( int verbose, int update_check )
h->main_thread = hb_thread_init( "libhb", thread_func, h,
HB_NORMAL_PRIORITY );
- return h;
+ hb_register( &hb_sync_video );
+ hb_register( &hb_sync_audio );
+ hb_register( &hb_decmpeg2 );
+ hb_register( &hb_decvobsub );
+ hb_register( &hb_encvobsub );
+ hb_register( &hb_deccc608 );
+ hb_register( &hb_decsrtsub );
+ hb_register( &hb_decutf8sub );
+ hb_register( &hb_dectx3gsub );
+ hb_register( &hb_decssasub );
+ hb_register( &hb_render );
+ hb_register( &hb_encavcodec );
+ hb_register( &hb_encx264 );
+ hb_register( &hb_enctheora );
+ hb_register( &hb_deca52 );
+ hb_register( &hb_decdca );
+ hb_register( &hb_decavcodec );
+ hb_register( &hb_decavcodecv );
+ hb_register( &hb_decavcodecvi );
+ hb_register( &hb_decavcodecai );
+ hb_register( &hb_declpcm );
+ hb_register( &hb_encfaac );
+ hb_register( &hb_enclame );
+ hb_register( &hb_encvorbis );
+ hb_register( &hb_muxer );
+#ifdef __APPLE__
+ hb_register( &hb_encca_aac );
+#endif
+
+ return h;
}
+
/**
* Returns current version of libhb.
* @param h Handle to hb_handle_t.
@@ -136,7 +453,7 @@ hb_handle_t * hb_init_real( int verbose, int update_check )
*/
char * hb_get_version( hb_handle_t * h )
{
- return HB_VERSION;
+ return HB_PROJECT_VERSION;
}
/**
@@ -146,7 +463,7 @@ char * hb_get_version( hb_handle_t * h )
*/
int hb_get_build( hb_handle_t * h )
{
- return HB_BUILD;
+ return HB_PROJECT_BUILD;
}
/**
@@ -174,24 +491,72 @@ void hb_set_cpu_count( hb_handle_t * h, int cpu_count )
}
/**
+ * Deletes current previews associated with titles
+ * @param h Handle to hb_handle_t
+ */
+void hb_remove_previews( hb_handle_t * h )
+{
+ char filename[1024];
+ char dirname[1024];
+ hb_title_t * title;
+ int i, count, len;
+ DIR * dir;
+ struct dirent * entry;
+
+ memset( dirname, 0, 1024 );
+ hb_get_temporary_directory( dirname );
+ dir = opendir( dirname );
+ if (dir == NULL) return;
+
+ count = hb_list_count( h->list_title );
+ while( ( entry = readdir( dir ) ) )
+ {
+ if( entry->d_name[0] == '.' )
+ {
+ continue;
+ }
+ for( i = 0; i < count; i++ )
+ {
+ title = hb_list_item( h->list_title, i );
+ len = snprintf( filename, 1024, "%d_%d", h->id, title->index );
+ if (strncmp(entry->d_name, filename, len) == 0)
+ {
+ snprintf( filename, 1024, "%s/%s", dirname, entry->d_name );
+ unlink( filename );
+ break;
+ }
+ }
+ }
+ closedir( dir );
+}
+
+/**
* Initializes a scan of the by calling hb_scan_init
* @param h Handle to hb_handle_t
* @param path location of VIDEO_TS folder.
* @param title_index Desired title to scan. 0 for all titles.
+ * @param preview_count Number of preview images to generate.
+ * @param store_previews Whether or not to write previews to disk.
*/
-void hb_scan( hb_handle_t * h, const char * path, int title_index )
+void hb_scan( hb_handle_t * h, const char * path, int title_index,
+ int preview_count, int store_previews, uint64_t min_duration )
{
hb_title_t * title;
+ h->scan_die = 0;
+
/* Clean up from previous scan */
+ hb_remove_previews( h );
while( ( title = hb_list_item( h->list_title, 0 ) ) )
{
hb_list_rem( h->list_title, title );
hb_title_close( &title );
}
-
+
hb_log( "hb_scan: path=%s, title_index=%d", path, title_index );
- h->scan_thread = hb_scan_init( h, path, title_index, h->list_title );
+ h->scan_thread = hb_scan_init( h, &h->scan_die, path, title_index,
+ h->list_title, preview_count,
+ store_previews, min_duration );
}
/**
@@ -207,9 +572,27 @@ hb_list_t * hb_get_titles( hb_handle_t * h )
/**
* Create preview image of desired title a index of picture.
* @param h Handle to hb_handle_t.
+ * @param title_index Index of the title to get the preview for (1-based).
+ * @param picture Index in title.
+ * @param buffer Handle to buffer were image will be drawn.
+ */
+void hb_get_preview_by_index( hb_handle_t * h, int title_index, int picture, uint8_t * buffer )
+{
+ hb_title_t * title;
+
+ title = hb_get_title_by_index( h, title_index );
+ if ( title != NULL )
+ {
+ hb_get_preview( h, title, picture, buffer );
+ }
+}
+
+/**
+ * Create preview image of desired title a index of picture.
+ * @param h Handle to hb_handle_t.
* @param title Handle to hb_title_t of desired title.
* @param picture Index in title.
- * @param buffer Handle to buufer were inage will be drawn.
+ * @param buffer Handle to buffer were image will be drawn.
*/
void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
uint8_t * buffer )
@@ -218,86 +601,454 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
char filename[1024];
FILE * file;
uint8_t * buf1, * buf2, * buf3, * buf4, * pen;
- uint32_t * p32;
- AVPicture pic1, pic2, pic3, pic4;
- ImgReSampleContext * context;
+ uint32_t swsflags;
+ AVPicture pic_in, pic_preview, pic_deint, pic_crop, pic_scale;
+ struct SwsContext * context;
int i;
+ int rgb_width = ((job->width + 7) >> 3) << 3;
+ int preview_size;
- buf1 = malloc( title->width * title->height * 3 / 2 );
- buf2 = malloc( title->width * title->height * 3 / 2 );
- buf3 = malloc( title->width * title->height * 3 / 2 );
- buf4 = malloc( title->width * title->height * 4 );
- avpicture_fill( &pic1, buf1, PIX_FMT_YUV420P,
+ swsflags = SWS_LANCZOS | SWS_ACCURATE_RND;
+
+ buf1 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, title->width, title->height ) );
+ buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, title->width, title->height ) );
+ buf3 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, rgb_width, job->height ) );
+ buf4 = av_malloc( avpicture_get_size( PIX_FMT_RGB32, rgb_width, job->height ) );
+ avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
title->width, title->height );
- avpicture_fill( &pic2, buf2, PIX_FMT_YUV420P,
+ avpicture_fill( &pic_deint, buf2, PIX_FMT_YUV420P,
title->width, title->height );
- avpicture_fill( &pic3, buf3, PIX_FMT_YUV420P,
- job->width, job->height );
- avpicture_fill( &pic4, buf4, PIX_FMT_RGBA32,
- job->width, job->height );
-
+ avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P,
+ rgb_width, job->height );
+ avpicture_fill( &pic_preview, buf4, PIX_FMT_RGB32,
+ rgb_width, job->height );
+
+ // Allocate the AVPicture frames and fill in
+
memset( filename, 0, 1024 );
- hb_get_tempory_filename( h, filename, "%x%d",
- (int) title, picture );
+ hb_get_tempory_filename( h, filename, "%d_%d_%d",
+ h->id, title->index, picture );
- file = fopen( filename, "r" );
+ file = fopen( filename, "rb" );
if( !file )
{
hb_log( "hb_get_preview: fopen failed" );
return;
}
- fread( buf1, title->width * title->height * 3 / 2, 1, file );
+ fread( buf1, avpicture_get_size( PIX_FMT_YUV420P, title->width, title->height), 1, file );
fclose( file );
- context = img_resample_full_init(
- job->width, job->height, title->width, title->height,
- job->crop[0], job->crop[1], job->crop[2], job->crop[3],
- 0, 0, 0, 0 );
-
if( job->deinterlace )
{
- avpicture_deinterlace( &pic2, &pic1, PIX_FMT_YUV420P,
- title->width, title->height );
- img_resample( context, &pic3, &pic2 );
+ // Deinterlace and crop
+ avpicture_deinterlace( &pic_deint, &pic_in, PIX_FMT_YUV420P, title->width, title->height );
+ av_picture_crop( &pic_crop, &pic_deint, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
}
else
{
- img_resample( context, &pic3, &pic1 );
+ // Crop
+ av_picture_crop( &pic_crop, &pic_in, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
}
- img_convert( &pic4, PIX_FMT_RGBA32, &pic3, PIX_FMT_YUV420P,
- job->width, job->height );
- /* Gray background */
- p32 = (uint32_t *) buffer;
- for( i = 0; i < ( title->width + 2 ) * ( title->height + 2 ); i++ )
+ // Get scaling context
+ context = sws_getContext(title->width - (job->crop[2] + job->crop[3]),
+ title->height - (job->crop[0] + job->crop[1]),
+ PIX_FMT_YUV420P,
+ job->width, job->height, PIX_FMT_YUV420P,
+ swsflags, NULL, NULL, NULL);
+
+ // Scale
+ sws_scale(context,
+ pic_crop.data, pic_crop.linesize,
+ 0, title->height - (job->crop[0] + job->crop[1]),
+ pic_scale.data, pic_scale.linesize);
+
+ // Free context
+ sws_freeContext( context );
+
+ // Get preview context
+ context = sws_getContext(rgb_width, job->height, PIX_FMT_YUV420P,
+ rgb_width, job->height, PIX_FMT_RGB32,
+ swsflags, NULL, NULL, NULL);
+
+ // Create preview
+ sws_scale(context,
+ pic_scale.data, pic_scale.linesize,
+ 0, job->height,
+ pic_preview.data, pic_preview.linesize);
+
+ // Free context
+ sws_freeContext( context );
+
+ preview_size = pic_preview.linesize[0];
+ pen = buffer;
+ for( i = 0; i < job->height; i++ )
{
- p32[i] = 0xFF808080;
+ memcpy( pen, buf4 + preview_size * i, 4 * job->width );
+ pen += 4 * job->width;
}
- /* Draw the picture, centered, and draw the cropping zone */
- pen = buffer + ( title->height - job->height ) *
- ( title->width + 2 ) * 2 + ( title->width - job->width ) * 2;
- memset( pen, 0xFF, 4 * ( job->width + 2 ) );
- pen += 4 * ( title->width + 2 );
- for( i = 0; i < job->height; i++ )
+ // Clean up
+ avpicture_free( &pic_preview );
+ avpicture_free( &pic_scale );
+ avpicture_free( &pic_deint );
+ avpicture_free( &pic_in );
+}
+
+ /**
+ * Analyzes a frame to detect interlacing artifacts
+ * and returns true if interlacing (combing) is found.
+ *
+ * Code taken from Thomas Oestreich's 32detect filter
+ * in the Transcode project, with minor formatting changes.
+ *
+ * @param buf An hb_buffer structure holding valid frame data
+ * @param width The frame's width in pixels
+ * @param height The frame's height in pixels
+ * @param color_equal Sensitivity for detecting similar colors
+ * @param color_diff Sensitivity for detecting different colors
+ * @param threshold Sensitivity for flagging planes as combed
+ * @param prog_equal Sensitivity for detecting similar colors on progressive frames
+ * @param prog_diff Sensitivity for detecting different colors on progressive frames
+ * @param prog_threshold Sensitivity for flagging progressive frames as combed
+ */
+int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold )
+{
+ int j, k, n, off, cc_1, cc_2, cc[3];
+ // int flag[3] ; // debugging flag
+ uint16_t s1, s2, s3, s4;
+ cc_1 = 0; cc_2 = 0;
+
+ int offset = 0;
+
+ if ( buf->flags & 16 )
{
- uint8_t * nextLine;
- nextLine = pen + 4 * ( title->width + 2 );
- memset( pen, 0xFF, 4 );
- pen += 4;
- memcpy( pen, buf4 + 4 * job->width * i, 4 * job->width );
- pen += 4 * job->width;
- memset( pen, 0xFF, 4 );
- pen = nextLine;
+ /* Frame is progressive, be more discerning. */
+ color_diff = prog_diff;
+ color_equal = prog_equal;
+ threshold = prog_threshold;
+ }
+
+ /* One pas for Y, one pass for Cb, one pass for Cr */
+ for( k = 0; k < 3; k++ )
+ {
+ if( k == 1 )
+ {
+ /* Y has already been checked, now offset by Y's dimensions
+ and divide all the other values by 2, since Cr and Cb
+ are half-size compared to Y. */
+ offset = width * height;
+ width >>= 1;
+ height >>= 1;
+ }
+ else if ( k == 2 )
+ {
+ /* Y and Cb are done, so the offset needs to be bumped
+ so it's width*height + (width / 2) * (height / 2) */
+ offset *= 5/4;
+ }
+
+ for( j = 0; j < width; ++j )
+ {
+ off = 0;
+
+ for( n = 0; n < ( height - 4 ); n = n + 2 )
+ {
+ /* Look at groups of 4 sequential horizontal lines */
+ s1 = ( ( buf->data + offset )[ off + j ] & 0xff );
+ s2 = ( ( buf->data + offset )[ off + j + width ] & 0xff );
+ s3 = ( ( buf->data + offset )[ off + j + 2 * width ] & 0xff );
+ s4 = ( ( buf->data + offset )[ off + j + 3 * width ] & 0xff );
+
+ /* Note if the 1st and 2nd lines are more different in
+ color than the 1st and 3rd lines are similar in color.*/
+ if ( ( abs( s1 - s3 ) < color_equal ) &&
+ ( abs( s1 - s2 ) > color_diff ) )
+ ++cc_1;
+
+ /* Note if the 2nd and 3rd lines are more different in
+ color than the 2nd and 4th lines are similar in color.*/
+ if ( ( abs( s2 - s4 ) < color_equal ) &&
+ ( abs( s2 - s3 ) > color_diff) )
+ ++cc_2;
+
+ /* Now move down 2 horizontal lines before starting over.*/
+ off += 2 * width;
+ }
+ }
+
+ // compare results
+ /* The final cc score for a plane is the percentage of combed pixels it contains.
+ Because sensitivity goes down to hundreths of a percent, multiply by 1000
+ so it will be easy to compare against the threhold value which is an integer. */
+ cc[k] = (int)( ( cc_1 + cc_2 ) * 1000.0 / ( width * height ) );
+ }
+
+
+ /* HandBrake is all yuv420, so weight the average percentage of all 3 planes accordingly.*/
+ int average_cc = ( 2 * cc[0] + ( cc[1] / 2 ) + ( cc[2] / 2 ) ) / 3;
+
+ /* Now see if that average percentage of combed pixels surpasses the threshold percentage given by the user.*/
+ if( average_cc > threshold )
+ {
+#if 0
+ hb_log("Average %i combed (Threshold %i) %i/%i/%i | PTS: %"PRId64" (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" );
+#endif
+ return 1;
+ }
+
+#if 0
+ hb_log("SKIPPED Average %i combed (Threshold %i) %i/%i/%i | PTS: %"PRId64" (%fs) %s", average_cc, threshold, cc[0], cc[1], cc[2], buf->start, (float)buf->start / 90000, (buf->flags & 16) ? "Film" : "Video" );
+#endif
+
+ /* Reaching this point means no combing detected. */
+ return 0;
+
+}
+
+/**
+ * Calculates job width and height for anamorphic content,
+ *
+ * @param h Instance handle
+ * @param title_index Index of the title/job to inspect (1-based).
+ * @param output_width Pointer to returned storage width
+ * @param output_height Pointer to returned storage height
+ * @param output_par_width Pointer to returned pixel width
+ * @param output_par_height Pointer to returned pixel height
+ */
+void hb_set_anamorphic_size_by_index( hb_handle_t * h, int title_index,
+ int *output_width, int *output_height,
+ int *output_par_width, int *output_par_height )
+{
+ hb_title_t * title;
+ title = hb_get_title_by_index( h, title_index );
+
+ hb_set_anamorphic_size( title->job, output_width, output_height, output_par_width, output_par_height );
+}
+
+/**
+ * Calculates job width and height for anamorphic content,
+ *
+ * @param job Handle to hb_job_t
+ * @param output_width Pointer to returned storage width
+ * @param output_height Pointer to returned storage height
+ * @param output_par_width Pointer to returned pixel width
+ * @param output_par_height Pointer to returned pixel height
+ */
+void hb_set_anamorphic_size( hb_job_t * job,
+ int *output_width, int *output_height,
+ int *output_par_width, int *output_par_height )
+{
+ /* Set up some variables to make the math easier to follow. */
+ hb_title_t * title = job->title;
+ int cropped_width = title->width - job->crop[2] - job->crop[3] ;
+ int cropped_height = title->height - job->crop[0] - job->crop[1] ;
+ double storage_aspect = (double)cropped_width / (double)cropped_height;
+ int mod = job->modulus ? job->modulus : 16;
+ double aspect = title->aspect;
+
+ int pixel_aspect_width = job->anamorphic.par_width;
+ int pixel_aspect_height = job->anamorphic.par_height;
+
+ /* If a source was really NTSC or PAL and the user specified ITU PAR
+ values, replace the standard PAR values with the ITU broadcast ones. */
+ if( title->width == 720 && job->anamorphic.itu_par )
+ {
+ // convert aspect to a scaled integer so we can test for 16:9 & 4:3
+ // aspect ratios ignoring insignificant differences in the LSBs of
+ // the floating point representation.
+ int iaspect = aspect * 9.;
+
+ /* Handle ITU PARs */
+ if (title->height == 480)
+ {
+ /* It's NTSC */
+ if (iaspect == 16)
+ {
+ /* It's widescreen */
+ pixel_aspect_width = 40;
+ pixel_aspect_height = 33;
+ }
+ else if (iaspect == 12)
+ {
+ /* It's 4:3 */
+ pixel_aspect_width = 10;
+ pixel_aspect_height = 11;
+ }
+ }
+ else if (title->height == 576)
+ {
+ /* It's PAL */
+ if(iaspect == 16)
+ {
+ /* It's widescreen */
+ pixel_aspect_width = 16;
+ pixel_aspect_height = 11;
+ }
+ else if (iaspect == 12)
+ {
+ /* It's 4:3 */
+ pixel_aspect_width = 12;
+ pixel_aspect_height = 11;
+ }
+ }
}
- memset( pen, 0xFF, 4 * ( job->width + 2 ) );
- free( buf1 );
- free( buf2 );
- free( buf3 );
- free( buf4 );
+ /* Figure out what width the source would display at. */
+ int source_display_width = cropped_width * (double)pixel_aspect_width /
+ (double)pixel_aspect_height ;
+
+ /*
+ 3 different ways of deciding output dimensions:
+ - 1: Strict anamorphic, preserve source dimensions
+ - 2: Loose anamorphic, round to mod16 and preserve storage aspect ratio
+ - 3: Power user anamorphic, specify everything
+ */
+ int width, height;
+ int maxWidth, maxHeight;
+
+ maxWidth = MULTIPLE_MOD_DOWN( job->maxWidth, mod );
+ maxHeight = MULTIPLE_MOD_DOWN( job->maxHeight, mod );
+
+ switch( job->anamorphic.mode )
+ {
+ case 1:
+ /* Strict anamorphic */
+ *output_width = cropped_width;
+ *output_height = cropped_height;
+ *output_par_width = title->pixel_aspect_width;
+ *output_par_height = title->pixel_aspect_height;
+ break;
+
+ case 2:
+ /* "Loose" anamorphic.
+ - Uses mod16-compliant dimensions,
+ - Allows users to set the width
+ */
+ width = job->width;
+ // height: Gets set later, ignore user job->height value
+
+ /* Gotta handle bounding dimensions.
+ If the width is too big, just reset it with no rescaling.
+ Instead of using the aspect-scaled job height,
+ we need to see if the job width divided by the storage aspect
+ is bigger than the max. If so, set it to the max (this is sloppy).
+ If not, set job height to job width divided by storage aspect.
+ */
+
+ /* Time to get picture width that divide cleanly.*/
+ width = MULTIPLE_MOD( width, mod);
+
+ if ( maxWidth && (maxWidth < job->width) )
+ width = maxWidth;
+
+ /* Verify these new dimensions don't violate max height and width settings */
+ height = ((double)width / storage_aspect) + 0.5;
+
+ /* Time to get picture height that divide cleanly.*/
+ height = MULTIPLE_MOD( height, mod);
+
+ if ( maxHeight && (maxHeight < height) )
+ {
+ height = maxHeight;
+ width = ((double)height * storage_aspect) + 0.5;
+ width = MULTIPLE_MOD( width, mod);
+ }
+
+ /* The film AR is the source's display width / cropped source height.
+ The output display width is the output height * film AR.
+ The output PAR is the output display width / output storage width. */
+ pixel_aspect_width = height * source_display_width / cropped_height;
+ pixel_aspect_height = width;
+
+ /* Pass the results back to the caller */
+ *output_width = width;
+ *output_height = height;
+ break;
+
+ case 3:
+ /* Anamorphic 3: Power User Jamboree
+ - Set everything based on specified values */
+
+ /* Use specified storage dimensions */
+ storage_aspect = (double)job->width / (double)job->height;
+ width = job->width;
+ height = job->height;
+
+ /* Time to get picture dimensions that divide cleanly.*/
+ width = MULTIPLE_MOD( width, mod);
+ height = MULTIPLE_MOD( height, mod);
+
+ /* Bind to max dimensions */
+ if( maxWidth && width > maxWidth )
+ {
+ width = maxWidth;
+ // If we are keeping the display aspect, then we are going
+ // to be modifying the PAR anyway. So it's preferred
+ // to let the width/height stray some from the original
+ // requested storage aspect.
+ //
+ // But otherwise, PAR and DAR will change the least
+ // if we stay as close as possible to the requested
+ // storage aspect.
+ if ( !job->anamorphic.keep_display_aspect )
+ {
+ height = ((double)width / storage_aspect) + 0.5;
+ height = MULTIPLE_MOD( height, mod);
+ }
+ }
+ if( maxHeight && height > maxHeight )
+ {
+ height = maxHeight;
+ // Ditto, see comment above
+ if ( !job->anamorphic.keep_display_aspect )
+ {
+ width = ((double)height * storage_aspect) + 0.5;
+ width = MULTIPLE_MOD( width, mod);
+ }
+ }
+
+ /* That finishes the storage dimensions. On to display. */
+ if( job->anamorphic.dar_width && job->anamorphic.dar_height )
+ {
+ /* We need to adjust the PAR to produce this aspect. */
+ pixel_aspect_width = height * job->anamorphic.dar_width / job->anamorphic.dar_height;
+ pixel_aspect_height = width;
+ }
+ else
+ {
+ /* If we're doing ana 3 and not specifying a DAR, care needs to be taken.
+ This indicates a PAR is potentially being set by the interface. But
+ this is an output PAR, to correct a source, and it should not be assumed
+ that it properly creates a display aspect ratio when applied to the source,
+ which could easily be stored in a different resolution. */
+ if( job->anamorphic.keep_display_aspect )
+ {
+ /* We can ignore the possibility of a PAR change */
+ pixel_aspect_width = height * ( (double)source_display_width / (double)cropped_height );
+ pixel_aspect_height = width;
+ }
+ else
+ {
+ int output_display_width = width * (double)pixel_aspect_width /
+ (double)pixel_aspect_height;
+ pixel_aspect_width = output_display_width;
+ pixel_aspect_height = width;
+ }
+ }
+
+ /* Back to caller */
+ *output_width = width;
+ *output_height = height;
+ break;
+ }
+
+ /* While x264 is smart enough to reduce fractions on its own, libavcodec
+ needs some help with the math, so lose superfluous factors. */
+ hb_reduce( output_par_width, output_par_height,
+ pixel_aspect_width, pixel_aspect_height );
}
/**
@@ -306,14 +1057,14 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
* @param aspect Desired aspect ratio. Value of -1 uses title aspect.
* @param pixels Maximum desired pixel count.
*/
-void hb_set_size( hb_job_t * job, int aspect, int pixels )
+void hb_set_size( hb_job_t * job, double aspect, int pixels )
{
hb_title_t * title = job->title;
int croppedWidth = title->width - title->crop[2] - title->crop[3];
int croppedHeight = title->height - title->crop[0] - title->crop[1];
- int croppedAspect = title->aspect * title->height * croppedWidth /
- croppedHeight / title->width;
+ double croppedAspect = title->aspect * title->height * croppedWidth /
+ croppedHeight / title->width;
int addCrop;
int i, w, h;
@@ -378,7 +1129,7 @@ void hb_set_size( hb_job_t * job, int aspect, int pixels )
for( i = 0;; i++ )
{
w = 16 * i;
- h = MULTIPLE_16( w * HB_ASPECT_BASE / aspect );
+ h = MULTIPLE_16( (int)( (double)w / aspect ) );
if( w * h > pixels )
{
break;
@@ -386,7 +1137,7 @@ void hb_set_size( hb_job_t * job, int aspect, int pixels )
}
i--;
job->width = 16 * i;
- job->height = MULTIPLE_16( 16 * i * HB_ASPECT_BASE / aspect );
+ job->height = MULTIPLE_16( (int)( (double)job->width / aspect ) );
}
/**
@@ -410,6 +1161,58 @@ hb_job_t * hb_job( hb_handle_t * h, int i )
return hb_list_item( h->jobs, i );
}
+hb_job_t * hb_current_job( hb_handle_t * h )
+{
+ return( h->current_job );
+}
+
+/**
+ * Applies information from the given job to the official job instance.
+ * @param h Handle to hb_handle_t.
+ * @param title_index Index of the title to apply the chapter name to (1-based).
+ * @param chapter The chapter to apply the name to (1-based).
+ * @param job Job information to apply.
+ */
+void hb_set_chapter_name( hb_handle_t * h, int title_index, int chapter_index, const char * chapter_name )
+{
+ hb_title_t * title;
+ title = hb_get_title_by_index( h, title_index );
+
+ hb_chapter_t * chapter = hb_list_item( title->list_chapter, chapter_index - 1 );
+
+ strncpy(chapter->title, chapter_name, 1023);
+ chapter->title[1023] = '\0';
+}
+
+/**
+ * Applies information from the given job to the official job instance.
+ * Currently only applies information needed for anamorphic size calculation and previews.
+ * @param h Handle to hb_handle_t.
+ * @param title_index Index of the title to apply the job information to (1-based).
+ * @param job Job information to apply.
+ */
+void hb_set_job( hb_handle_t * h, int title_index, hb_job_t * job )
+{
+ int i;
+
+ hb_title_t * title;
+ title = hb_get_title_by_index( h, title_index );
+
+ hb_job_t * job_target = title->job;
+
+ job_target->deinterlace = job->deinterlace;
+ job_target->width = job->width;
+ job_target->height = job->height;
+ job_target->maxWidth = job->maxWidth;
+ job_target->maxHeight = job->maxHeight;
+ for (i = 0; i < 4; i++)
+ {
+ job_target->crop[i] = job->crop[i];
+ }
+
+ job_target->anamorphic = job->anamorphic;
+}
+
/**
* Adds a job to the job list.
* @param h Handle to hb_handle_t.
@@ -420,9 +1223,10 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
hb_job_t * job_copy;
hb_title_t * title, * title_copy;
hb_chapter_t * chapter, * chapter_copy;
- hb_audio_t * audio, * audio_copy;
+ hb_audio_t * audio;
hb_subtitle_t * subtitle, * subtitle_copy;
int i;
+ char audio_lang[4];
/* Copy the title */
title = job->title;
@@ -438,46 +1242,164 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
hb_list_add( title_copy->list_chapter, chapter_copy );
}
+ /*
+ * Copy the metadata
+ */
+ if( title->metadata )
+ {
+ title_copy->metadata = malloc( sizeof( hb_metadata_t ) );
+
+ if( title_copy->metadata )
+ {
+ memcpy( title_copy->metadata, title->metadata, sizeof( hb_metadata_t ) );
+
+ /*
+ * Need to copy the artwork seperatly (TODO).
+ */
+ if( title->metadata->coverart )
+ {
+ title_copy->metadata->coverart = malloc( title->metadata->coverart_size );
+ if( title_copy->metadata->coverart )
+ {
+ memcpy( title_copy->metadata->coverart, title->metadata->coverart,
+ title->metadata->coverart_size );
+ } else {
+ title_copy->metadata->coverart_size = 0;
+ }
+ }
+ }
+ }
+
/* Copy the audio track(s) we want */
title_copy->list_audio = hb_list_init();
- /* Do nothing about audio during first pass */
- if( job->pass != 1 )
+ for( i = 0; i < hb_list_count(job->list_audio); i++ )
{
- for( i = 0; i < 8; i++ )
+ if( ( audio = hb_list_item( job->list_audio, i ) ) )
{
- if( job->audios[i] < 0 )
+ hb_list_add( title_copy->list_audio, hb_audio_copy(audio) );
+ }
+ }
+
+ title_copy->list_subtitle = hb_list_init();
+
+ /*
+ * The following code is confusing, there are two ways in which
+ * we select subtitles and it depends on whether this is single or
+ * two pass mode.
+ *
+ * subtitle_scan may be enabled, in which case the first pass
+ * scans all subtitles of that language. The second pass does not
+ * select any because they are set at the end of the first pass.
+ *
+ * We may have manually selected a subtitle, in which case that is
+ * selected in the first pass of a single pass, or the second of a
+ * two pass.
+ */
+ memset( audio_lang, 0, sizeof( audio_lang ) );
+
+ if ( job->indepth_scan ) {
+
+ /*
+ * Find the first audio language that is being encoded
+ */
+ for( i = 0; i < hb_list_count(job->list_audio); i++ )
+ {
+ if( ( audio = hb_list_item( job->list_audio, i ) ) )
{
+ strncpy(audio_lang, audio->config.lang.iso639_2, sizeof(audio_lang));
break;
}
- if( ( audio = hb_list_item( title->list_audio, job->audios[i] ) ) )
- {
- audio_copy = malloc( sizeof( hb_audio_t ) );
- memcpy( audio_copy, audio, sizeof( hb_audio_t ) );
- hb_list_add( title_copy->list_audio, audio_copy );
- }
}
}
- /* Copy the subtitle we want (or not) */
- title_copy->list_subtitle = hb_list_init();
- if( ( subtitle = hb_list_item( title->list_subtitle, job->subtitle ) ) )
+ /*
+ * If doing a subtitle scan then add all the matching subtitles for this
+ * language.
+ */
+ if ( job->indepth_scan )
{
- subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
- memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
- hb_list_add( title_copy->list_subtitle, subtitle_copy );
+ for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
+ {
+ subtitle = hb_list_item( title->list_subtitle, i );
+ if( strcmp( subtitle->iso639_2, audio_lang ) == 0 &&
+ subtitle->source == VOBSUB )
+ {
+ /*
+ * Matched subtitle language with audio language, so
+ * add this to our list to scan.
+ *
+ * We will update the subtitle list on the second pass
+ * later after the first pass has completed.
+ */
+ subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
+ memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
+ hb_list_add( title_copy->list_subtitle, subtitle_copy );
+ }
+ }
+ } else {
+ /*
+ * Not doing a subtitle scan in this pass, but maybe we are in the
+ * first pass?
+ */
+ if( job->pass != 1 )
+ {
+ /*
+ * Copy all of them from the input job, to the title_copy/job_copy.
+ */
+ for( i = 0; i < hb_list_count(job->list_subtitle); i++ ) {
+ if( ( subtitle = hb_list_item( job->list_subtitle, i ) ) )
+ {
+ subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
+ memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
+ hb_list_add( title_copy->list_subtitle, subtitle_copy );
+ }
+ }
+ }
}
/* Copy the job */
job_copy = calloc( sizeof( hb_job_t ), 1 );
memcpy( job_copy, job, sizeof( hb_job_t ) );
+ title_copy->job = job_copy;
job_copy->title = title_copy;
+ job_copy->list_audio = title_copy->list_audio;
+ job_copy->list_subtitle = title_copy->list_subtitle; // sharing list between title and job
job_copy->file = strdup( job->file );
job_copy->h = h;
job_copy->pause = h->pause_lock;
+ /* Copy the job filter list */
+ if( job->filters )
+ {
+ int i;
+ int filter_count = hb_list_count( job->filters );
+ job_copy->filters = hb_list_init();
+ for( i = 0; i < filter_count; i++ )
+ {
+ /*
+ * Copy the filters, since the MacGui reuses the global filter objects
+ * meaning that queued up jobs overwrite the previous filter settings.
+ * In reality, settings is probably the only field that needs duplicating
+ * since it's the only value that is ever changed. But name is duplicated
+ * as well for completeness. Not copying private_data since it gets
+ * created for each job in renderInit.
+ */
+ hb_filter_object_t * filter = hb_list_item( job->filters, i );
+ hb_filter_object_t * filter_copy = malloc( sizeof( hb_filter_object_t ) );
+ memcpy( filter_copy, filter, sizeof( hb_filter_object_t ) );
+ if( filter->name )
+ filter_copy->name = strdup( filter->name );
+ if( filter->settings )
+ filter_copy->settings = strdup( filter->settings );
+ hb_list_add( job_copy->filters, filter_copy );
+ }
+ }
+
/* Add the job to the list */
hb_list_add( h->jobs, job_copy );
+ h->job_count = hb_count(h);
+ h->job_count_permanent++;
}
/**
@@ -489,6 +1411,10 @@ void hb_rem( hb_handle_t * h, hb_job_t * job )
{
hb_list_rem( h->jobs, job );
+ h->job_count = hb_count(h);
+ if (h->job_count_permanent)
+ h->job_count_permanent--;
+
/* XXX free everything XXX */
}
@@ -502,6 +1428,7 @@ void hb_start( hb_handle_t * h )
{
/* XXX Hack */
h->job_count = hb_list_count( h->jobs );
+ h->job_count_permanent = h->job_count;
hb_lock( h->state_lock );
h->state.state = HB_STATE_WORKING;
@@ -514,6 +1441,7 @@ void hb_start( hb_handle_t * h )
p.hours = -1;
p.minutes = -1;
p.seconds = -1;
+ p.sequence_id = 0;
#undef p
hb_unlock( h->state_lock );
@@ -521,7 +1449,7 @@ void hb_start( hb_handle_t * h )
h->work_die = 0;
h->work_thread = hb_work_init( h->jobs, h->cpu_count,
- &h->work_die, &h->work_error );
+ &h->work_die, &h->work_error, &h->current_job );
}
/**
@@ -535,6 +1463,8 @@ void hb_pause( hb_handle_t * h )
hb_lock( h->pause_lock );
h->paused = 1;
+ hb_current_job( h )->st_pause_date = hb_get_date();
+
hb_lock( h->state_lock );
h->state.state = HB_STATE_PAUSED;
hb_unlock( h->state_lock );
@@ -549,6 +1479,13 @@ void hb_resume( hb_handle_t * h )
{
if( h->paused )
{
+#define job hb_current_job( h )
+ if( job->st_pause_date != -1 )
+ {
+ job->st_paused += hb_get_date() - job->st_pause_date;
+ }
+#undef job
+
hb_unlock( h->pause_lock );
h->paused = 0;
}
@@ -562,10 +1499,73 @@ void hb_stop( hb_handle_t * h )
{
h->work_die = 1;
+ h->job_count = hb_count(h);
+ h->job_count_permanent = 0;
+
hb_resume( h );
}
/**
+ * Stops the conversion process.
+ * @param h Handle to hb_handle_t.
+ */
+void hb_scan_stop( hb_handle_t * h )
+{
+ h->scan_die = 1;
+
+ h->job_count = hb_count(h);
+ h->job_count_permanent = 0;
+
+ hb_resume( h );
+}
+
+/**
+ * Gets a filter object with the given type and settings.
+ * @param filter_id The type of filter to get.
+ * @param settings The filter settings to use.
+ * @returns The requested filter object.
+ */
+hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings)
+{
+ if (filter_id == HB_FILTER_ROTATE)
+ {
+ hb_filter_rotate.settings = (char*)settings;
+ return &hb_filter_rotate;
+ }
+
+ if (filter_id == HB_FILTER_DETELECINE)
+ {
+ hb_filter_detelecine.settings = (char*)settings;
+ return &hb_filter_detelecine;
+ }
+
+ if (filter_id == HB_FILTER_DECOMB)
+ {
+ hb_filter_decomb.settings = (char*)settings;
+ return &hb_filter_decomb;
+ }
+
+ if (filter_id == HB_FILTER_DEINTERLACE)
+ {
+ hb_filter_deinterlace.settings = (char*)settings;
+ return &hb_filter_deinterlace;
+ }
+
+ if (filter_id == HB_FILTER_DEBLOCK)
+ {
+ hb_filter_deblock.settings = (char*)settings;
+ return &hb_filter_deblock;
+ }
+
+ if (filter_id == HB_FILTER_DENOISE)
+ {
+ hb_filter_denoise.settings = (char*)settings;
+ return &hb_filter_denoise;
+ }
+ return NULL;
+}
+
+/**
* Returns the state of the conversion process.
* @param h Handle to hb_handle_t.
* @param s Handle to hb_state_t which to copy the state data.
@@ -575,13 +1575,32 @@ void hb_get_state( hb_handle_t * h, hb_state_t * s )
hb_lock( h->state_lock );
memcpy( s, &h->state, sizeof( hb_state_t ) );
- h->state.state = HB_STATE_IDLE;
+ if ( h->state.state == HB_STATE_SCANDONE || h->state.state == HB_STATE_WORKDONE )
+ h->state.state = HB_STATE_IDLE;
+
+ hb_unlock( h->state_lock );
+}
+
+void hb_get_state2( hb_handle_t * h, hb_state_t * s )
+{
+ hb_lock( h->state_lock );
+
+ memcpy( s, &h->state, sizeof( hb_state_t ) );
hb_unlock( h->state_lock );
}
/**
- * Closes access to libhb by freeing the hb_handle_t handle ontained in hb_init_real.
+ * Called in MacGui in UpdateUI to check
+ * for a new scan being completed to set a new source
+ */
+int hb_get_scancount( hb_handle_t * h)
+ {
+ return h->scanCount;
+ }
+
+/**
+ * Closes access to libhb by freeing the hb_handle_t handle ontained in hb_init.
* @param _h Pointer to handle to hb_handle_t.
*/
void hb_close( hb_handle_t ** _h )
@@ -590,11 +1609,17 @@ void hb_close( hb_handle_t ** _h )
hb_title_t * title;
h->die = 1;
+
hb_thread_close( &h->main_thread );
while( ( title = hb_list_item( h->list_title, 0 ) ) )
{
hb_list_rem( h->list_title, title );
+ if( title->job && title->job->filters )
+ {
+ hb_list_close( &title->job->filters );
+ }
+ free( title->job );
hb_title_close( &title );
}
hb_list_close( &h->list_title );
@@ -602,11 +1627,44 @@ void hb_close( hb_handle_t ** _h )
hb_list_close( &h->jobs );
hb_lock_close( &h->state_lock );
hb_lock_close( &h->pause_lock );
+
free( h );
*_h = NULL;
}
/**
+ * Cleans up libhb at a process level. Call before the app closes. Removes preview directory.
+ */
+void hb_global_close()
+{
+ char dirname[1024];
+ DIR * dir;
+ struct dirent * entry;
+
+ /* Find and remove temp folder */
+ memset( dirname, 0, 1024 );
+ hb_get_temporary_directory( dirname );
+
+ dir = opendir( dirname );
+ if (dir)
+ {
+ while( ( entry = readdir( dir ) ) )
+ {
+ char filename[1024];
+ if( entry->d_name[0] == '.' )
+ {
+ continue;
+ }
+ memset( filename, 0, 1024 );
+ snprintf( filename, 1023, "%s/%s", dirname, entry->d_name );
+ unlink( filename );
+ }
+ closedir( dir );
+ rmdir( dirname );
+ }
+}
+
+/**
* Monitors the state of the update, scan, and work threads.
* Sets scan done state when scan thread exits.
* Sets work done state when work thread exits.
@@ -616,14 +1674,12 @@ static void thread_func( void * _h )
{
hb_handle_t * h = (hb_handle_t *) _h;
char dirname[1024];
- DIR * dir;
- struct dirent * entry;
h->pid = getpid();
/* Create folder for temporary files */
memset( dirname, 0, 1024 );
- hb_get_tempory_directory( h, dirname );
+ hb_get_temporary_directory( dirname );
hb_mkdir( dirname );
@@ -643,11 +1699,30 @@ static void thread_func( void * _h )
{
hb_thread_close( &h->scan_thread );
- hb_log( "libhb: scan thread found %d valid title(s)",
- hb_list_count( h->list_title ) );
+ if ( h->scan_die )
+ {
+ hb_title_t * title;
+
+ hb_remove_previews( h );
+ while( ( title = hb_list_item( h->list_title, 0 ) ) )
+ {
+ hb_list_rem( h->list_title, title );
+ hb_title_close( &title );
+ }
+
+ hb_log( "hb_scan: canceled" );
+ }
+ else
+ {
+ hb_log( "libhb: scan thread found %d valid title(s)",
+ hb_list_count( h->list_title ) );
+ }
hb_lock( h->state_lock );
- h->state.state = HB_STATE_SCANDONE;
- hb_unlock( h->state_lock );
+ h->state.state = HB_STATE_SCANDONE; //originally state.state
+ hb_unlock( h->state_lock );
+ /*we increment this sessions scan count by one for the MacGui
+ to trigger a new source being set */
+ h->scanCount++;
}
/* Check if the work thread is done */
@@ -661,33 +1736,51 @@ static void thread_func( void * _h )
hb_lock( h->state_lock );
h->state.state = HB_STATE_WORKDONE;
h->state.param.workdone.error = h->work_error;
+
+ h->job_count = hb_count(h);
+ if (h->job_count < 1)
+ h->job_count_permanent = 0;
hb_unlock( h->state_lock );
}
hb_snooze( 50 );
}
+ if( h->scan_thread )
+ {
+ hb_scan_stop( h );
+ hb_thread_close( &h->scan_thread );
+ }
if( h->work_thread )
{
hb_stop( h );
hb_thread_close( &h->work_thread );
}
+ hb_remove_previews( h );
+}
- /* Remove temp folder */
- dir = opendir( dirname );
- while( ( entry = readdir( dir ) ) )
+/**
+ * Redirects stderr to the registered callback
+ * function.
+ * @param _data Unused.
+ */
+static void redirect_thread_func(void * _data)
+{
+ int pfd[2];
+ pipe(pfd);
+#if defined( SYS_MINGW )
+ // dup2 doesn't work on windows for some stupid reason
+ stderr->_file = pfd[1];
+#else
+ dup2(pfd[1], /*stderr*/ 2);
+#endif
+ FILE * log_f = fdopen(pfd[0], "rb");
+
+ char line_buffer[500];
+ while(fgets(line_buffer, 500, log_f) != NULL)
{
- char filename[1024];
- if( entry->d_name[0] == '.' )
- {
- continue;
- }
- memset( filename, 0, 1024 );
- snprintf( filename, 1023, "%s/%s", dirname, entry->d_name );
- unlink( filename );
+ hb_log_callback(line_buffer);
}
- closedir( dir );
- rmdir( dirname );
}
/**
@@ -700,6 +1793,39 @@ int hb_get_pid( hb_handle_t * h )
}
/**
+ * Returns the id for the given instance.
+ * @param h Handle to hb_handle_t
+ * @returns The ID for the given instance
+ */
+int hb_get_instance_id( hb_handle_t * h )
+{
+ return h->id;
+}
+
+/**
+ * Returns the title with the given title index.
+ * @param h Handle to hb_handle_t
+ * @param title_index the index of the title to get
+ * @returns The requested title
+ */
+hb_title_t * hb_get_title_by_index( hb_handle_t * h, int title_index )
+{
+ hb_title_t * title;
+ int i;
+ int count = hb_list_count( h->list_title );
+ for (i = 0; i < count; i++)
+ {
+ title = hb_list_item( h->list_title, i );
+ if (title->index == title_index)
+ {
+ return title;
+ }
+ }
+
+ return NULL;
+}
+
+/**
* Sets the current state.
* @param h Handle to hb_handle_t
* @param s Handle to new hb_state_t
@@ -709,13 +1835,29 @@ void hb_set_state( hb_handle_t * h, hb_state_t * s )
hb_lock( h->pause_lock );
hb_lock( h->state_lock );
memcpy( &h->state, s, sizeof( hb_state_t ) );
- if( h->state.state == HB_STATE_WORKING )
+ if( h->state.state == HB_STATE_WORKING ||
+ h->state.state == HB_STATE_SEARCHING )
{
/* XXX Hack */
+ if (h->job_count < 1)
+ h->job_count_permanent = 1;
+
h->state.param.working.job_cur =
- h->job_count - hb_list_count( h->jobs );
- h->state.param.working.job_count = h->job_count;
+ h->job_count_permanent - hb_list_count( h->jobs );
+ h->state.param.working.job_count = h->job_count_permanent;
+
+ // Set which job is being worked on
+ if (h->current_job)
+ h->state.param.working.sequence_id = h->current_job->sequence_id;
+ else
+ h->state.param.working.sequence_id = 0;
}
hb_unlock( h->state_lock );
hb_unlock( h->pause_lock );
}
+
+/* Passes a pointer to persistent data */
+hb_interjob_t * hb_interjob_get( hb_handle_t * h )
+{
+ return h->interjob;
+}