X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=a835d2766213383cc151c237c18fa349446862f2;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=30fce039cc0bbafde351131fe9e683a30ad8824b;hpb=8636c14c5c663b2c3b519829489352979702ab10;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/hb.c b/libhb/hb.c index 30fce039..a835d276 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -1,9 +1,15 @@ #include "hb.h" #include "hbffmpeg.h" +#include +#include +#include -#if defined( SYS_MINGW ) && defined( PTW32_STATIC_LIB ) +#if defined( SYS_MINGW ) +#include +#if defined( PTW32_STATIC_LIB ) #include #endif +#endif struct hb_handle_s { @@ -59,6 +65,7 @@ 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() { @@ -86,47 +93,95 @@ int hb_avcodec_close(AVCodecContext *avctx) int hb_ff_layout_xlat(int64_t ff_channel_layout, int channels) { + int hb_layout; + switch (ff_channel_layout) { case CH_LAYOUT_MONO: - return HB_INPUT_CH_LAYOUT_MONO; + hb_layout = HB_INPUT_CH_LAYOUT_MONO; + break; case CH_LAYOUT_STEREO: - return HB_INPUT_CH_LAYOUT_STEREO; + hb_layout = HB_INPUT_CH_LAYOUT_STEREO; + break; case CH_LAYOUT_SURROUND: - return HB_INPUT_CH_LAYOUT_3F; + hb_layout = HB_INPUT_CH_LAYOUT_3F; + break; case CH_LAYOUT_4POINT0: - return HB_INPUT_CH_LAYOUT_3F1R; + hb_layout = HB_INPUT_CH_LAYOUT_3F1R; + break; case CH_LAYOUT_2_2: - return HB_INPUT_CH_LAYOUT_2F2R; + hb_layout = HB_INPUT_CH_LAYOUT_2F2R; + break; case CH_LAYOUT_QUAD: - return HB_INPUT_CH_LAYOUT_2F2R; + hb_layout = HB_INPUT_CH_LAYOUT_2F2R; + break; case CH_LAYOUT_5POINT0: - // ffmpeg like to neglect to signal LFE - if (channels == 6) - return HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; - return HB_INPUT_CH_LAYOUT_3F2R; + hb_layout = HB_INPUT_CH_LAYOUT_3F2R; + break; case CH_LAYOUT_5POINT1: - return HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; + hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; case CH_LAYOUT_5POINT0_BACK: - // ffmpeg like to neglect to signal LFE - if (channels == 6) - return HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; - return HB_INPUT_CH_LAYOUT_3F2R; + hb_layout = HB_INPUT_CH_LAYOUT_3F2R; + break; case CH_LAYOUT_5POINT1_BACK: - return HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; + hb_layout = HB_INPUT_CH_LAYOUT_3F2R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; case CH_LAYOUT_7POINT0: - // ffmpeg like to neglect to signal LFE - if (channels == 8) - return HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE; - return HB_INPUT_CH_LAYOUT_3F4R; + hb_layout = HB_INPUT_CH_LAYOUT_3F4R; + break; case CH_LAYOUT_7POINT1: - return HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE; + hb_layout = HB_INPUT_CH_LAYOUT_3F4R|HB_INPUT_CH_LAYOUT_HAS_LFE; + break; case CH_LAYOUT_STEREO_DOWNMIX: - return HB_INPUT_CH_LAYOUT_STEREO; + 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: - return HB_INPUT_CH_LAYOUT_STEREO; + hb_log("Unsupported number of audio channels (%d).\n", channels); + hb_layout = 0; + break; } - return HB_INPUT_CH_LAYOUT_STEREO; + return hb_layout; } /** @@ -140,21 +195,54 @@ void hb_register( hb_work_object_t * w ) } /** - * 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. + * Ensures that the process has been initialized. */ -hb_handle_t * hb_init( int verbose, int update_check ) +static void process_init() { if (!hb_process_initialized) { #if defined( SYS_MINGW ) && defined( PTW32_STATIC_LIB ) pthread_win32_process_attach_np(); #endif - hb_process_initialized =1; + +#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( int verbose, int update_check ) +{ + process_init(); + hb_handle_t * h = calloc( sizeof( hb_handle_t ), 1 ); uint64_t date; @@ -228,6 +316,9 @@ hb_handle_t * hb_init( int verbose, int update_check ) 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 ); @@ -329,6 +420,9 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) 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 ); @@ -478,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 ) @@ -699,11 +811,31 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i /** * 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 + * @param output_par_height Pointer to returned pixel height */ void hb_set_anamorphic_size( hb_job_t * job, int *output_width, int *output_height, @@ -1019,6 +1151,53 @@ hb_job_t * hb_current_job( hb_handle_t * h ) } /** + * 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. * @param job Handle to hb_job_t. @@ -1325,6 +1504,52 @@ void hb_scan_stop( hb_handle_t * 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. @@ -1519,6 +1744,30 @@ static void thread_func( void * _h ) } /** + * 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) + { + hb_log_callback(line_buffer); + } +} + +/** * Returns the PID. * @param h Handle to hb_handle_t */ @@ -1530,6 +1779,7 @@ 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 ) { @@ -1537,6 +1787,29 @@ int hb_get_instance_id( hb_handle_t * h ) } /** + * 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