X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=898650ac2fbb0fd2df4878c22df11d713d35b53d;hb=d6a4ae73b86cca10f2342c9e26c132855cad6356;hp=bc1c1f0a627205f0bd6065e7754823396174de76;hpb=e2e14fb8fc8a8f4b47d20946de956585bb904a35;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/hb.c b/libhb/hb.c index bc1c1f0a..898650ac 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -5,7 +5,7 @@ struct hb_handle_s { /* 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' @@ -38,6 +38,11 @@ struct hb_handle_s /* For MacGui active queue increments each time the scan thread completes*/ int scanCount; + + /* 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; }; @@ -86,7 +91,7 @@ void hb_register( hb_work_object_t * w ) * @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 ) { hb_handle_t * h = calloc( sizeof( hb_handle_t ), 1 ); uint64_t date; @@ -142,6 +147,8 @@ hb_handle_t * hb_init_real( int verbose, int update_check ) h->pause_lock = hb_lock_init(); + h->interjob = calloc( sizeof( hb_interjob_t ), 1 ); + /* libavcodec */ hb_avcodec_init(); @@ -150,11 +157,31 @@ hb_handle_t * hb_init_real( int verbose, int update_check ) h->die = 0; h->main_thread = hb_thread_init( "libhb", thread_func, h, HB_NORMAL_PRIORITY ); + hb_register( &hb_sync ); + hb_register( &hb_decmpeg2 ); + hb_register( &hb_decvobsub ); + hb_register( &hb_encvobsub ); + hb_register( &hb_deccc608 ); + hb_register( &hb_decsrtsub ); + 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 ); +#ifdef __APPLE__ + hb_register( &hb_encca_aac ); +#endif return h; - - /* Set the scan count to start at 0 */ - //scan_count = 0; } /** @@ -229,10 +256,12 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) hb_register( &hb_sync ); hb_register( &hb_decmpeg2 ); - hb_register( &hb_decsub ); + hb_register( &hb_decvobsub ); + hb_register( &hb_encvobsub ); + hb_register( &hb_deccc608 ); + hb_register( &hb_decsrtsub ); hb_register( &hb_render ); hb_register( &hb_encavcodec ); - hb_register( &hb_encxvid ); hb_register( &hb_encx264 ); hb_register( &hb_enctheora ); hb_register( &hb_deca52 ); @@ -245,6 +274,9 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) hb_register( &hb_encfaac ); hb_register( &hb_enclame ); hb_register( &hb_encvorbis ); +#ifdef __APPLE__ + hb_register( &hb_encca_aac ); +#endif return h; } @@ -295,6 +327,46 @@ 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_tempory_directory( h, 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, "%" PRIxPTR, (intptr_t) title ); + 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. @@ -308,6 +380,7 @@ void hb_scan( hb_handle_t * h, const char * path, int title_index, hb_title_t * title; /* 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 ); @@ -343,7 +416,7 @@ 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, swsflags; + uint32_t swsflags; AVPicture pic_in, pic_preview, pic_deint, pic_crop, pic_scale; struct SwsContext * context; int i; @@ -354,25 +427,25 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, 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, job->width, job->height ) ); - buf4 = av_malloc( avpicture_get_size( PIX_FMT_RGBA32, rgb_width, job->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( &pic_deint, buf2, PIX_FMT_YUV420P, title->width, title->height ); avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P, - job->width, job->height ); - avpicture_fill( &pic_preview, buf4, PIX_FMT_RGBA32, + 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", + hb_get_tempory_filename( h, filename, "%" PRIxPTR "%d", (intptr_t) title, picture ); - file = fopen( filename, "r" ); + file = fopen( filename, "rb" ); if( !file ) { hb_log( "hb_get_preview: fopen failed" ); @@ -412,7 +485,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, // Get preview context context = sws_getContext(rgb_width, job->height, PIX_FMT_YUV420P, - rgb_width, job->height, PIX_FMT_RGBA32, + rgb_width, job->height, PIX_FMT_RGB32, swsflags, NULL, NULL, NULL); // Create preview @@ -424,31 +497,13 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, // Free context sws_freeContext( context ); - /* Gray background */ - p32 = (uint32_t *) buffer; - for( i = 0; i < ( title->width + 2 ) * ( title->height + 2 ); i++ ) - { - p32[i] = 0xFF808080; - } - - /* Draw the picture, centered, and draw the cropping zone */ preview_size = pic_preview.linesize[0]; - 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 ); + pen = buffer; for( i = 0; i < job->height; i++ ) { - uint8_t * nextLine; - nextLine = pen + 4 * ( title->width + 2 ); - memset( pen, 0xFF, 4 ); - pen += 4; memcpy( pen, buf4 + preview_size * i, 4 * job->width ); pen += 4 * job->width; - memset( pen, 0xFF, 4 ); - pen = nextLine; } - memset( pen, 0xFF, 4 * ( job->width + 2 ) ); // Clean up avpicture_free( &pic_preview ); @@ -476,7 +531,8 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, */ 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], flag[3] ; + 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; @@ -638,7 +694,7 @@ void hb_set_anamorphic_size( hb_job_t * job, /* 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 @@ -662,7 +718,7 @@ void hb_set_anamorphic_size( hb_job_t * job, - Allows users to set the width */ width = job->width; - height; // Gets set later, ignore user job->height value + // 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. @@ -674,18 +730,23 @@ void hb_set_anamorphic_size( hb_job_t * job, if ( job->maxWidth && (job->maxWidth < job->width) ) width = job->maxWidth; + + /* Time to get picture width that divide cleanly.*/ + width = MULTIPLE_MOD( width, mod); + + /* Verify these new dimensions don't violate max height and width settings */ + if ( job->maxWidth && (job->maxWidth < job->width) ) + width = job->maxWidth; + height = ((double)width / storage_aspect) + 0.5; if ( job->maxHeight && (job->maxHeight < height) ) height = job->maxHeight; - /* Time to get picture dimensions that divide cleanly.*/ - width = MULTIPLE_MOD( width, mod); + /* Time to get picture height that divide cleanly.*/ height = MULTIPLE_MOD( height, mod); /* Verify these new dimensions don't violate max height and width settings */ - if ( job->maxWidth && (job->maxWidth < job->width) ) - width = job->maxWidth; if ( job->maxHeight && (job->maxHeight < height) ) height = job->maxHeight; @@ -737,12 +798,24 @@ void hb_set_anamorphic_size( hb_job_t * job, } else { - /* We first need the display ar. - That's the source display width divided by the source height after cropping. - Then we multiple the output height by that to get the pixel aspect width, - and the pixel aspect height is the storage width.*/ - pixel_aspect_width = height * source_display_width / cropped_height; - pixel_aspect_height = width; + /* 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 */ @@ -943,7 +1016,7 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) title_copy->list_subtitle = hb_list_init(); /* - * The following code is confusing, there are three ways in which + * 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. * @@ -951,17 +1024,13 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) * scans all subtitles of that language. The second pass does not * select any because they are set at the end of the first pass. * - * native_language may have a preferred language, in which case we - * may be switching the language we want for the subtitles in the - * first pass of a single pass, or the second pass of a two 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 || job->native_language ) { + if ( job->indepth_scan ) { /* * Find the first audio language that is being encoded @@ -974,35 +1043,6 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) break; } } - - /* - * In all cases switch the language if we need to to our native - * language. - */ - if( job->native_language ) - { - if( strncasecmp( job->native_language, audio_lang, - sizeof( audio_lang ) ) != 0 ) - { - - if( job->pass != 2 ) - { - hb_log( "Enabled subtitles in native language '%s', audio is in '%s'", - job->native_language, audio_lang); - } - /* - * The main audio track is not in our native language, so switch - * the subtitles to use our native language instead. - */ - strncpy( audio_lang, job->native_language, sizeof( audio_lang ) ); - } else { - /* - * native language is irrelevent, free it. - */ - free( job->native_language ); - job->native_language = NULL; - } - } } /* @@ -1014,7 +1054,8 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) 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 ) + if( strcmp( subtitle->iso639_2, audio_lang ) == 0 && + subtitle->source == VOBSUB ) { /* * Matched subtitle language with audio language, so @@ -1026,14 +1067,6 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) subtitle_copy = malloc( sizeof( hb_subtitle_t ) ); memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) ); hb_list_add( title_copy->list_subtitle, subtitle_copy ); - if ( job->native_language ) { - /* - * With native language just select the - * first match in our langiage, not all of - * them. Subsequent ones are likely to be commentary - */ - break; - } } } } else { @@ -1041,52 +1074,17 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) * Not doing a subtitle scan in this pass, but maybe we are in the * first pass? */ - if( job->select_subtitle ) + if( job->pass != 1 ) { /* - * Don't add subtitles here, we'll add them via select_subtitle - * at the end of the subtitle_scan. + * Copy all of them from the input job, to the title_copy/job_copy. */ - } else { - /* - * Definitely not doing a subtitle scan. - */ - if( job->pass != 1 && job->native_language ) - { - /* - * We are not doing a subtitle scan but do want the - * native langauge subtitle selected, so select it - * for pass 0 or pass 2 of a two pass. - */ - for( i=0; i < hb_list_count( title->list_subtitle ); i++ ) + for( i = 0; i < hb_list_count(job->list_subtitle); i++ ) { + if( ( subtitle = hb_list_item( job->list_subtitle, i ) ) ) { - subtitle = hb_list_item( title->list_subtitle, i ); - if( strcmp( subtitle->iso639_2, audio_lang ) == 0 ) - { - /* - * Matched subtitle language with audio language, so - * add this to our list to 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 ); - break; - } - } - } else { - /* - * Manually selected subtitle, in which case only - * bother adding them for pass 0 or pass 2 of a two - * pass. - */ - if( job->pass != 1 ) - { - if( ( subtitle = hb_list_item( title->list_subtitle, job->subtitle ) ) ) - { - subtitle_copy = malloc( sizeof( hb_subtitle_t ) ); - memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) ); - hb_list_add( title_copy->list_subtitle, subtitle_copy ); - } + subtitle_copy = malloc( sizeof( hb_subtitle_t ) ); + memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) ); + hb_list_add( title_copy->list_subtitle, subtitle_copy ); } } } @@ -1098,6 +1096,7 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) 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; @@ -1264,7 +1263,7 @@ int hb_get_scancount( hb_handle_t * h) } /** - * Closes access to libhb by freeing the hb_handle_t handle ontained in hb_init_real. + * 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 ) @@ -1427,3 +1426,9 @@ void hb_set_state( hb_handle_t * h, hb_state_t * s ) 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; +}