X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=cde51322cb3a2d95ae30b06aec4b14acf2e7d617;hb=07cc0ebf6a7141a76fd9b6e2da6cf510def1ebc7;hp=62fe9c4f50d7bd60c0d53b47ff2ce936fff3e4ad;hpb=4e3f08663b249ff5604e4de3878a226b21f342dc;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/hb.c b/libhb/hb.c index 62fe9c4f..cde51322 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 { @@ -72,7 +73,6 @@ hb_handle_t * hb_init_real( 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 */ @@ -122,9 +122,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 +152,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 +217,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 ); @@ -318,11 +318,16 @@ 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; + uint32_t * p32, swsflags; AVPicture pic_in, pic_preview, pic_deint, pic_crop, pic_scale; struct SwsContext * context; int i; + 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 ); @@ -370,7 +375,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, title->height - (job->crop[0] + job->crop[1]), PIX_FMT_YUV420P, job->width, job->height, PIX_FMT_YUV420P, - (uint16_t)(SWS_LANCZOS|SWS_ACCURATE_RND), NULL, NULL, NULL); + swsflags, NULL, NULL, NULL); // Scale sws_scale(context, @@ -383,8 +388,8 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, // Get preview context context = sws_getContext(job->width, job->height, PIX_FMT_YUV420P, - job->width, job->height, PIX_FMT_RGBA32, - (uint16_t)(SWS_LANCZOS|SWS_ACCURATE_RND), NULL, NULL, NULL); + job->width, job->height, PIX_FMT_RGBA32, + swsflags, NULL, NULL, NULL); // Create preview sws_scale(context, @@ -427,6 +432,116 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, 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], 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++ ) + { + 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: %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, * @@ -450,11 +565,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 mod = job->modulus; - int aspect = title->aspect; + double aspect = title->aspect; /* Gotta handle bounding dimensions differently than for non-anamorphic encodes: @@ -468,13 +583,14 @@ void hb_set_anamorphic_size( hb_job_t * job, if ( job->maxWidth && (job->maxWidth < job->width) ) width = job->maxWidth; - if ( job->maxHeight && (job->maxHeight < (width / storage_aspect * 10000)) ) + height = (double)width / storage_aspect; + if ( job->maxHeight && (job->maxHeight < height) ) { height = job->maxHeight; } else { - height = width * 10000 / storage_aspect; + height = (double)width / storage_aspect; } @@ -539,20 +655,27 @@ void hb_set_anamorphic_size( hb_job_t * job, 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; @@ -562,13 +685,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; @@ -578,7 +701,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. @@ -586,16 +710,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 ); } /** @@ -604,14 +726,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; @@ -676,7 +798,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; @@ -684,7 +806,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 ) ); } /** @@ -723,7 +845,7 @@ 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]; @@ -745,21 +867,11 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) /* 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 < 8; i++ ) + if( ( audio = hb_list_item( job->list_audio, i ) ) ) { - if( job->audios[i] < 0 ) - { - 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 ); - } + hb_list_add( title_copy->list_audio, hb_audio_copy(audio) ); } } @@ -789,15 +901,11 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) /* * Find the first audio language that is being encoded */ - for( i = 0; i < 8; i++ ) + for( i = 0; i < hb_list_count(job->list_audio); i++ ) { - if( job->audios[i] < 0 ) - { - break; - } - if( ( audio = hb_list_item( title->list_audio, job->audios[i] ) ) ) + if( ( audio = hb_list_item( job->list_audio, i ) ) ) { - strncpy(audio_lang, audio->iso639_2, sizeof(audio_lang)); + strncpy(audio_lang, audio->config.lang.iso639_2, sizeof(audio_lang)); break; } } @@ -924,6 +1032,7 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) 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->file = strdup( job->file ); job_copy->h = h; job_copy->pause = h->pause_lock;