X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=31b45c2df35d9ae41514a5e81a3221666e1c9b1e;hb=8425b4e14041ee668806cff29e458ae73bcd894f;hp=5f176f1ae373b6e5cb2e4c68413f1be33c5d9edb;hpb=ce7f458c94769fbc2ca1c4dd23fcb799d001cb53;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/hb.c b/libhb/hb.c index 5f176f1a..31b45c2d 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -1,7 +1,8 @@ #include "hb.h" -#include "ffmpeg/avcodec.h" -#include "ffmpeg/swscale.h" +#include "libavcodec/avcodec.h" +#include "libavformat/avformat.h" +#include "libswscale/swscale.h" struct hb_handle_s { @@ -68,12 +69,10 @@ hb_handle_t * hb_init_real( int verbose, int update_check ) hb_handle_t * h = calloc( sizeof( hb_handle_t ), 1 ); uint64_t date; - /* See hb_log() in common.c */ - if( verbose > HB_DEBUG_NONE ) - { + /* See hb_deep_log() and hb_log() in common.c */ + global_verbosity_level = verbose; + if( verbose ) putenv( "HB_DEBUG=1" ); - av_log_set_level(AV_LOG_DEBUG); - } /* Check for an update on the website if asked to */ h->build = -1; @@ -122,9 +121,7 @@ hb_handle_t * hb_init_real( int verbose, int update_check ) h->pause_lock = hb_lock_init(); /* libavcodec */ - avcodec_init(); - avcodec_register_all(); - av_register_codec_parser( &mpegaudio_parser); + av_register_all(); /* Start library thread */ hb_log( "hb_init: starting libhb thread" ); @@ -154,7 +151,6 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) if( verbose > HB_DEBUG_NONE ) { putenv( "HB_DEBUG=1" ); - av_log_set_level(AV_LOG_DEBUG); } /* Check for an update on the website if asked to */ @@ -220,6 +216,9 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) 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 ); @@ -278,8 +277,11 @@ void hb_set_cpu_count( hb_handle_t * h, int cpu_count ) * @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 ) { hb_title_t * title; @@ -291,7 +293,8 @@ void hb_scan( hb_handle_t * h, const char * path, int title_index ) } 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, path, title_index, h->list_title, + preview_count, store_previews ); } /** @@ -322,16 +325,18 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, 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; swsflags = SWS_LANCZOS; #ifndef __x86_64__ swsflags |= SWS_ACCURATE_RND; #endif /* __x86_64__ */ - 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 ); + 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 ) ); avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P, title->width, title->height ); avpicture_fill( &pic_deint, buf2, PIX_FMT_YUV420P, @@ -339,7 +344,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P, job->width, job->height ); avpicture_fill( &pic_preview, buf4, PIX_FMT_RGBA32, - job->width, job->height ); + rgb_width, job->height ); // Allocate the AVPicture frames and fill in @@ -355,7 +360,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, 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 ); if( job->deinterlace ) @@ -387,8 +392,8 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, sws_freeContext( context ); // Get preview context - context = sws_getContext(job->width, job->height, PIX_FMT_YUV420P, - job->width, job->height, PIX_FMT_RGBA32, + context = sws_getContext(rgb_width, job->height, PIX_FMT_YUV420P, + rgb_width, job->height, PIX_FMT_RGBA32, swsflags, NULL, NULL, NULL); // Create preview @@ -408,6 +413,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, } /* 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 ) ); @@ -418,7 +424,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, nextLine = pen + 4 * ( title->width + 2 ); memset( pen, 0xFF, 4 ); pen += 4; - memcpy( pen, buf4 + 4 * job->width * i, 4 * job->width ); + memcpy( pen, buf4 + preview_size * i, 4 * job->width ); pen += 4 * job->width; memset( pen, 0xFF, 4 ); pen = nextLine; @@ -445,19 +451,29 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, * @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 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, block, cc_1, cc_2, cc[3], flag[3]; + int j, k, n, off, cc_1, cc_2, cc[3], flag[3] ; uint16_t s1, s2, s3, s4; cc_1 = 0; cc_2 = 0; int offset = 0; + + if ( buf->flags & 16 ) + { + /* 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++ ) { - /* One pas for Y, one pass for Cb, one pass for Cr */ - if( k == 1 ) { /* Y has already been checked, now offset by Y's dimensions @@ -466,9 +482,6 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i offset = width * height; width >>= 1; height >>= 1; - threshold >>= 1; - color_equal >>= 1; - color_diff >>= 1; } else if ( k == 2 ) { @@ -477,10 +490,7 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i offset *= 5/4; } - /* Look at one horizontal line at a time */ - block = width; - - for( j = 0; j < block; ++j ) + for( j = 0; j < width; ++j ) { off = 0; @@ -488,9 +498,9 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i { /* Look at groups of 4 sequential horizontal lines */ s1 = ( ( buf->data + offset )[ off + j ] & 0xff ); - s2 = ( ( buf->data + offset )[ off + j + block ] & 0xff ); - s3 = ( ( buf->data + offset )[ off + j + 2 * block ] & 0xff ); - s4 = ( ( buf->data + offset )[ off + j + 3 * block ] & 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.*/ @@ -505,38 +515,38 @@ int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, i ++cc_2; /* Now move down 2 horizontal lines before starting over.*/ - off += 2 * block; + off += 2 * width; } } // compare results - /* The final metric seems to be doing some kind of bits per pixel style calculation - to decide whether or not enough lines showed alternating colors for the frame size. */ + /* 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 ) ); - - /* If the plane's cc score meets the threshold, flag it as combed. */ - flag[k] = 0; - if ( cc[k] > threshold ) - { - flag[k] = 1; - } } -#if 0 -/* Debugging info */ -// if(flag) - hb_log("flags: %i/%i/%i | cc0: %i | cc1: %i | cc2: %i", flag[0], flag[1], flag[2], cc[0], cc[1], cc[2]); -#endif - /* When more than one plane shows combing, tell the caller. */ - if (flag[0] || flag[1] || flag[2] ) + /* 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: %lld (%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: %lld (%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, @@ -561,11 +571,11 @@ void hb_set_anamorphic_size( hb_job_t * job, 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] ; - int storage_aspect = cropped_width * 10000 / cropped_height; + double storage_aspect = (double)cropped_width / (double)cropped_height; int width = job->width; - int height; // Gets set later, ignore user value + int height; // Gets set later, ignore user job->height value int mod = job->modulus; - int aspect = title->aspect; + double aspect = title->aspect; /* Gotta handle bounding dimensions differently than for non-anamorphic encodes: @@ -577,21 +587,11 @@ void hb_set_anamorphic_size( hb_job_t * job, */ if ( job->maxWidth && (job->maxWidth < job->width) ) - width = job->maxWidth; + width = job->maxWidth; - if ( job->maxHeight && (job->maxHeight < (width / storage_aspect * 10000)) ) - { + height = ((double)width / storage_aspect) + 0.5; + if ( job->maxHeight && (job->maxHeight < height) ) height = job->maxHeight; - } - else - { - height = width * 10000 / storage_aspect; - } - - - /* Time to get picture dimensions that divide cleanly. - These variables will store temporary dimensions as we iterate. */ - int i, w, h; /* In case the user specified a modulus, use it */ if (job->modulus) @@ -599,71 +599,39 @@ void hb_set_anamorphic_size( hb_job_t * job, else mod = 16; - /* Iterate through multiples of mod to find one close to job->width. */ - for( i = 1;; i++ ) - { - w = mod * i; - - if (w < width) - { - if ( ( width - w ) <= ( mod / 2 ) ) - /* We'll take a width that's - smaller, but close enough. */ - break; - } - if (w == width) - /* Mod 16 dimensions, how nice! */ - break; - if( w > width ) - { - if ( ( w - width ) < (mod/2) ) - /* We'll take a width that's bigger, if we have to. */ - break; - } - } - width = mod * (i); - - /* Now do the same for a mod-friendly value near job->height. */ - for( i = 1;; i++) - { - h = i * mod; - - if (h < height) - { - if ( ( height - h ) <= ( mod / 2 )) - /* Go with a smaller height, - if it's close enough. */ - break; - } - if (h == height) - /* Mod 16 dimensions, how nice! */ - break; - - if ( h > height) - { - if ( ( h - height ) < ( mod / 2 )) - /* Use a taller height if necessary */ - break; - } - } - height = mod * (i); + /* Time to get picture dimensions that divide cleanly.*/ + width = MULTIPLE_MOD( width, mod); + 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; + int pixel_aspect_width = job->pixel_aspect_width; int pixel_aspect_height = job->pixel_aspect_height; - - if (cropped_width <= 706) + + /* If a source was really 704*480 and hard matted with cropping + to 720*480, replace the PAR values with the ITU broadcast ones. */ + if (title->width == 720 && cropped_width <= 706) { + // 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 (aspect == 16) + if (iaspect == 16) { /* It's widescreen */ pixel_aspect_width = 40; pixel_aspect_height = 33; } - else + else if (iaspect == 12) { /* It's 4:3 */ pixel_aspect_width = 10; @@ -673,13 +641,13 @@ void hb_set_anamorphic_size( hb_job_t * job, else if (title->height == 576) { /* It's PAL */ - if(aspect == 16) + if(iaspect == 16) { /* It's widescreen */ pixel_aspect_width = 16; pixel_aspect_height = 11; } - else + else if (iaspect == 12) { /* It's 4:3 */ pixel_aspect_width = 12; @@ -689,7 +657,8 @@ void hb_set_anamorphic_size( hb_job_t * job, } /* Figure out what dimensions the source would display at. */ - int source_display_width = cropped_width * ((float)pixel_aspect_width / (float)pixel_aspect_height) ; + int source_display_width = cropped_width * (double)pixel_aspect_width / + (double)pixel_aspect_height ; /* The film AR is the source's display width / cropped source height. The output display width is the output height * film AR. @@ -697,16 +666,14 @@ void hb_set_anamorphic_size( hb_job_t * job, pixel_aspect_width = height * source_display_width / cropped_height; pixel_aspect_height = width; - /* While x264 is smart enough to reduce fractions on its own, libavcodec - needs some help with the math, so lose superfluous factors. */ - hb_reduce( &pixel_aspect_width, &pixel_aspect_height, - pixel_aspect_width, pixel_aspect_height ); - /* Pass the results back to the caller */ *output_width = width; *output_height = height; - *output_par_width = pixel_aspect_width; - *output_par_height = pixel_aspect_height; + + /* 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 ); } /** @@ -715,14 +682,14 @@ void hb_set_anamorphic_size( hb_job_t * job, * @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; @@ -787,7 +754,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; @@ -795,7 +762,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 ) ); } /** @@ -853,18 +820,42 @@ 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 == 0 || job->pass == 2 ) + for( i = 0; i < hb_list_count(job->list_audio); i++ ) { - for( i = 0; i < hb_list_count(job->list_audio); i++ ) + if( ( audio = hb_list_item( job->list_audio, i ) ) ) { - if( ( audio = hb_list_item( job->list_audio, i ) ) ) - { - hb_list_add( title_copy->list_audio, hb_audio_copy(audio) ); - } + hb_list_add( title_copy->list_audio, hb_audio_copy(audio) ); } } @@ -1299,19 +1290,22 @@ static void thread_func( void * _h ) /* Remove temp folder */ dir = opendir( dirname ); - while( ( entry = readdir( dir ) ) ) + if (dir) { - char filename[1024]; - if( entry->d_name[0] == '.' ) + while( ( entry = readdir( dir ) ) ) { - continue; + char filename[1024]; + if( entry->d_name[0] == '.' ) + { + continue; + } + memset( filename, 0, 1024 ); + snprintf( filename, 1023, "%s/%s", dirname, entry->d_name ); + unlink( filename ); } - memset( filename, 0, 1024 ); - snprintf( filename, 1023, "%s/%s", dirname, entry->d_name ); - unlink( filename ); + closedir( dir ); + rmdir( dirname ); } - closedir( dir ); - rmdir( dirname ); } /**