X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fhb.c;h=da09ea0a62f0a0dc92f8f8f6b936c1bc25df2e9a;hb=814438ce8ec7b400d211ef9050278e283d2bba5f;hp=9b16313965300df287c4e030707453944e245b79;hpb=375691faedacdbef37da6f08c06c088f113b823c;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/hb.c b/libhb/hb.c index 9b163139..da09ea0a 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -82,6 +82,50 @@ int hb_avcodec_open(AVCodecContext *avctx, AVCodec *codec) return ret; } +int hb_av_find_stream_info(AVFormatContext *ic) +{ + int ret; + hb_lock( hb_avcodec_lock ); + ret = av_find_stream_info( ic ); + hb_unlock( hb_avcodec_lock ); + return ret; +} + +struct SwsContext* +hb_sws_get_context(int srcW, int srcH, enum PixelFormat srcFormat, + int dstW, int dstH, enum PixelFormat dstFormat, + int flags) +{ + struct SwsContext * ctx; + +#if 0 + // sws_getContext is being depricated. But it appears that + // the new method isn't quite wrung out yet. So when it is + // this code should be fixed up and enabled. + ctx = sws_alloc_context(); + if ( ctx ) + { + av_set_int(ctx, "srcw", srcW); + av_set_int(ctx, "srch", srcH); + av_set_int(ctx, "src_format", srcFormat); + av_set_int(ctx, "dstw", dstW); + av_set_int(ctx, "dsth", dstH); + av_set_int(ctx, "dst_format", dstFormat); + av_set_int(ctx, "sws_flags", flags); + + if (sws_init_context(ctx, NULL, NULL) < 0) { + fprintf(stderr, "Cannot initialize resampling context\n"); + sws_freeContext(ctx); + ctx = NULL; + } + } +#else + ctx = sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, + flags, NULL, NULL, NULL); +#endif + return ctx; +} + int hb_avcodec_close(AVCodecContext *avctx) { int ret; @@ -318,6 +362,7 @@ hb_handle_t * hb_init( int verbose, int update_check ) 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 ); @@ -336,6 +381,7 @@ hb_handle_t * hb_init( int verbose, int update_check ) #ifdef __APPLE__ hb_register( &hb_encca_aac ); #endif + hb_register( &hb_encac3 ); return h; } @@ -421,6 +467,7 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) 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 ); @@ -439,6 +486,7 @@ hb_handle_t * hb_init_dl( int verbose, int update_check ) #ifdef __APPLE__ hb_register( &hb_encca_aac ); #endif + hb_register( &hb_encac3 ); return h; } @@ -484,7 +532,7 @@ int hb_check_update( hb_handle_t * h, char ** version ) void hb_set_cpu_count( hb_handle_t * h, int cpu_count ) { cpu_count = MAX( 1, cpu_count ); - cpu_count = MIN( cpu_count, 8 ); + cpu_count = MIN( cpu_count, 64 ); h->cpu_count = cpu_count; } @@ -537,7 +585,7 @@ void hb_remove_previews( hb_handle_t * h ) * @param store_previews Whether or not to write previews to disk. */ void hb_scan( hb_handle_t * h, const char * path, int title_index, - int preview_count, int store_previews ) + int preview_count, int store_previews, uint64_t min_duration ) { hb_title_t * title; @@ -554,7 +602,7 @@ 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, &h->scan_die, path, title_index, h->list_title, preview_count, - store_previews ); + store_previews, min_duration ); } /** @@ -603,19 +651,20 @@ 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 deint_width = ((title->width + 7) >> 3) << 3; int rgb_width = ((job->width + 7) >> 3) << 3; int preview_size; 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 ) ); + buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, deint_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( &pic_deint, buf2, PIX_FMT_YUV420P, - title->width, title->height ); + deint_width, title->height ); avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P, rgb_width, job->height ); avpicture_fill( &pic_preview, buf4, PIX_FMT_RGB32, @@ -651,11 +700,11 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, } // Get scaling context - context = sws_getContext(title->width - (job->crop[2] + job->crop[3]), + context = hb_sws_get_context(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); + swsflags); // Scale sws_scale(context, @@ -667,9 +716,9 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, sws_freeContext( context ); // Get preview context - context = sws_getContext(rgb_width, job->height, PIX_FMT_YUV420P, + context = hb_sws_get_context(rgb_width, job->height, PIX_FMT_YUV420P, rgb_width, job->height, PIX_FMT_RGB32, - swsflags, NULL, NULL, NULL); + swsflags); // Create preview sws_scale(context, @@ -905,14 +954,21 @@ void hb_set_anamorphic_size( hb_job_t * job, - 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; + *output_width = MULTIPLE_MOD( cropped_width, 2 ); + *output_height = MULTIPLE_MOD( cropped_height, 2 ); + // adjust the source PAR for new width/height + // new PAR = source PAR * ( old width / new_width ) * ( new_height / old_height ) + pixel_aspect_width = title->pixel_aspect_width * cropped_width * (*output_height); + pixel_aspect_height = title->pixel_aspect_height * (*output_width) * cropped_height; break; case 2: @@ -931,33 +987,30 @@ void hb_set_anamorphic_size( hb_job_t * job, If not, set job height to job width divided by storage aspect. */ - 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; + 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; - - if ( job->maxHeight && (job->maxHeight < height) ) - height = job->maxHeight; /* 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->maxHeight && (job->maxHeight < height) ) - height = job->maxHeight; + + 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; + pixel_aspect_width = height * cropped_width * pixel_aspect_width; + pixel_aspect_height = width * cropped_height * pixel_aspect_height; /* Pass the results back to the caller */ *output_width = width; @@ -969,28 +1022,42 @@ void hb_set_anamorphic_size( hb_job_t * job, - Set everything based on specified values */ /* Use specified storage dimensions */ + storage_aspect = (double)job->width / (double)job->height; width = job->width; height = job->height; - /* Bind to max dimensions */ - if( job->maxWidth && width > job->maxWidth ) - width = job->maxWidth; - if( job->maxHeight && height > job->maxHeight ) - height = job->maxHeight; - /* Time to get picture dimensions that divide cleanly.*/ width = MULTIPLE_MOD( width, mod); height = MULTIPLE_MOD( height, mod); - /* Verify we're still within max dimensions */ - if( job->maxWidth && width > job->maxWidth ) - width = job->maxWidth - (mod/2); - if( job->maxHeight && height > job->maxHeight ) - height = job->maxHeight - (mod/2); - - /* Re-ensure we have 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 ) @@ -1207,6 +1274,7 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) hb_chapter_t * chapter, * chapter_copy; hb_audio_t * audio; hb_subtitle_t * subtitle, * subtitle_copy; + hb_attachment_t * attachment; int i; char audio_lang[4]; @@ -1254,7 +1322,6 @@ 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(); - for( i = 0; i < hb_list_count(job->list_audio); i++ ) { if( ( audio = hb_list_item( job->list_audio, i ) ) ) @@ -1263,7 +1330,18 @@ void hb_add( hb_handle_t * h, hb_job_t * job ) } } + /* Initialize subtitle list - filled out further below */ title_copy->list_subtitle = hb_list_init(); + + /* Copy all the attachments */ + title_copy->list_attachment = hb_list_init(); + for( i = 0; i < hb_list_count(title->list_attachment); i++ ) + { + if( ( attachment = hb_list_item( title->list_attachment, i ) ) ) + { + hb_list_add( title_copy->list_attachment, hb_attachment_copy(attachment) ); + } + } /* * The following code is confusing, there are two ways in which @@ -1511,37 +1589,37 @@ hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings) { if (filter_id == HB_FILTER_ROTATE) { - hb_filter_rotate.settings = strdup(settings); + hb_filter_rotate.settings = (char*)settings; return &hb_filter_rotate; } if (filter_id == HB_FILTER_DETELECINE) { - hb_filter_detelecine.settings = strdup(settings); + hb_filter_detelecine.settings = (char*)settings; return &hb_filter_detelecine; } if (filter_id == HB_FILTER_DECOMB) { - hb_filter_decomb.settings = strdup(settings); + hb_filter_decomb.settings = (char*)settings; return &hb_filter_decomb; } if (filter_id == HB_FILTER_DEINTERLACE) { - hb_filter_deinterlace.settings = strdup(settings); + hb_filter_deinterlace.settings = (char*)settings; return &hb_filter_deinterlace; } if (filter_id == HB_FILTER_DEBLOCK) { - hb_filter_deblock.settings = strdup(settings); + hb_filter_deblock.settings = (char*)settings; return &hb_filter_deblock; } if (filter_id == HB_FILTER_DENOISE) { - hb_filter_denoise.settings = strdup(settings); + hb_filter_denoise.settings = (char*)settings; return &hb_filter_denoise; } return NULL; @@ -1750,7 +1828,12 @@ 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];