#include "hb.h"
-
-#include "ffmpeg/avcodec.h"
-#include "ffmpeg/swscale.h"
+#include "hbffmpeg.h"
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'
/* 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;
};
+hb_lock_t *hb_avcodec_lock;
hb_work_object_t * hb_objects = NULL;
static void thread_func( void * );
+void hb_avcodec_init()
+{
+ hb_avcodec_lock = hb_lock_init();
+ av_register_all();
+}
+
+int hb_avcodec_open(AVCodecContext *avctx, AVCodec *codec)
+{
+ int ret;
+ hb_lock( hb_avcodec_lock );
+ ret = avcodec_open(avctx, codec);
+ hb_unlock( hb_avcodec_lock );
+ return ret;
+}
+
+int hb_avcodec_close(AVCodecContext *avctx)
+{
+ int ret;
+ hb_lock( hb_avcodec_lock );
+ ret = avcodec_close(avctx);
+ hb_unlock( hb_avcodec_lock );
+ return ret;
+}
+
/**
* Registers work objects, by adding the work object to a liked list.
* @param w Handle to hb_work_object_t to register.
* @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;
- /* 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;
h->pause_lock = hb_lock_init();
+ h->interjob = calloc( sizeof( hb_interjob_t ), 1 );
+
/* libavcodec */
- avcodec_init();
- avcodec_register_all();
- av_register_codec_parser( &mpegaudio_parser);
+ hb_avcodec_init();
/* Start library thread */
hb_log( "hb_init: starting libhb thread" );
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;
}
/**
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 */
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 );
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;
}
*/
char * hb_get_version( hb_handle_t * h )
{
- return HB_VERSION;
+ return HB_PROJECT_VERSION;
}
/**
*/
int hb_get_build( hb_handle_t * h )
{
- return HB_BUILD;
+ return HB_PROJECT_BUILD;
}
/**
}
/**
+ * 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.
* @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;
/* 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 );
}
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 );
}
/**
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;
+ int rgb_width = ((job->width + 7) >> 3) << 3;
+ int preview_size;
- swsflags = SWS_LANCZOS;
-#ifndef __x86_64__
- swsflags |= SWS_ACCURATE_RND;
-#endif /* __x86_64__ */
+ swsflags = SWS_LANCZOS | SWS_ACCURATE_RND;
- 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, 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,
- job->width, job->height );
+ 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" );
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 )
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_RGB32,
swsflags, NULL, NULL, NULL);
// Create preview
// 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 */
- 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 );
+ preview_size = pic_preview.linesize[0];
+ 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 + 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;
}
- memset( pen, 0xFF, 4 * ( job->width + 2 ) );
// Clean up
avpicture_free( &pic_preview );
* @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];
+ // int flag[3] ; // debugging flag
uint16_t s1, s2, s3, s4;
cc_1 = 0; cc_2 = 0;
int offset = 0;
- for( k = 0; k < 3; k++ )
+ if ( buf->flags & 16 )
{
- /* One pas for Y, one pass for Cb, one pass for Cr */
+ /* 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
offset = width * height;
width >>= 1;
height >>= 1;
- threshold >>= 1;
- color_equal >>= 1;
- color_diff >>= 1;
}
else if ( k == 2 )
{
so it's width*height + (width / 2) * (height / 2) */
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;
-
+
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 + 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.*/
- if ( ( abs( s1 - s3 ) < color_equal ) &&
+ 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 * 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;
- }
}
+
+
+ /* 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
-/* 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]);
+ 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
-
- /* When more than one plane shows combing, tell the caller. */
- if (flag[0] || flag[1] || flag[2] )
- {
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,
int *output_width, int *output_height,
int *output_par_width, int *output_par_height )
{
- /* "Loose" anamorphic.
- - Uses mod16-compliant dimensions,
- - Allows users to set the width
- - Handles ITU pixel aspects
- */
-
/* Set up some variables to make the math easier to follow. */
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;
- int width = job->width;
- int height; // Gets set later, ignore user value
- int mod = job->modulus;
- int aspect = title->aspect;
-
- /* Gotta handle bounding dimensions differently
- than for non-anamorphic encodes:
- If the width is too big, just reset it with no rescaling.
- Instead of using the aspect-scaled job height,
- we need to see if the job width divided by the storage aspect
- is bigger than the max. If so, set it to the max (this is sloppy).
- If not, set job height to job width divided by storage aspect.
- */
-
- if ( job->maxWidth && (job->maxWidth < job->width) )
- width = job->maxWidth;
-
- if ( job->maxHeight && (job->maxHeight < (width / storage_aspect * 10000)) )
- {
- 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)
- mod = job->modulus;
- 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);
+ double storage_aspect = (double)cropped_width / (double)cropped_height;
+ int mod = job->anamorphic.modulus ? job->anamorphic.modulus : 16;
+ double aspect = title->aspect;
+
+ int pixel_aspect_width = job->anamorphic.par_width;
+ int pixel_aspect_height = job->anamorphic.par_height;
- /* Now do the same for a mod-friendly value near job->height. */
- for( i = 1;; i++)
+ /* If a source was really NTSC or PAL and the user specified ITU PAR
+ values, replace the standard PAR values with the ITU broadcast ones. */
+ if( title->width == 720 && job->anamorphic.itu_par )
{
- h = i * mod;
+ // 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.;
- 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);
-
- int pixel_aspect_width = job->pixel_aspect_width;
- int pixel_aspect_height = job->pixel_aspect_height;
-
- if (cropped_width <= 706)
- {
/* 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;
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;
}
}
- /* Figure out what dimensions the source would display at. */
- int source_display_width = cropped_width * ((float)pixel_aspect_width / (float)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.
- The output PAR is the output display width / output storage width. */
- pixel_aspect_width = height * source_display_width / cropped_height;
- pixel_aspect_height = width;
+ /* 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
+ - 2: Loose anamorphic, round to mod16 and preserve storage aspect ratio
+ - 3: Power user anamorphic, specify everything
+ */
+ int width, height;
+ 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;
+ break;
+
+ case 2:
+ /* "Loose" anamorphic.
+ - Uses mod16-compliant dimensions,
+ - Allows users to set the width
+ */
+ width = job->width;
+ // 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.
+ Instead of using the aspect-scaled job height,
+ we need to see if the job width divided by the storage aspect
+ is bigger than the max. If so, set it to the max (this is sloppy).
+ 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;
+
+ 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;
+
+ /* 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;
+
+ /* Pass the results back to the caller */
+ *output_width = width;
+ *output_height = height;
+ break;
+
+ case 3:
+ /* Anamorphic 3: Power User Jamboree
+ - Set everything based on specified values */
+
+ /* Use specified storage dimensions */
+ 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 );
+
+ /* That finishes the storage dimensions. On to display. */
+ if( job->anamorphic.dar_width && job->anamorphic.dar_height )
+ {
+ /* We need to adjust the PAR to produce this aspect. */
+ pixel_aspect_width = height * job->anamorphic.dar_width / job->anamorphic.dar_height;
+ pixel_aspect_height = width;
+ }
+ else
+ {
+ /* 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 */
+ *output_width = width;
+ *output_height = height;
+ break;
+ }
+
/* 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,
+ hb_reduce( output_par_width, output_par_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;
}
/**
* @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;
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;
}
i--;
job->width = 16 * i;
- job->height = MULTIPLE_16( 16 * i * HB_ASPECT_BASE / aspect );
+ job->height = MULTIPLE_16( (int)( (double)job->width / aspect ) );
}
/**
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];
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 < 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) );
}
}
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.
*
* 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
*/
- for( i = 0; i < 8; i++ )
+ for( i = 0; i < hb_list_count(job->list_audio); i++ )
{
- if( job->audios[i] < 0 )
+ if( ( audio = hb_list_item( job->list_audio, i ) ) )
{
- break;
- }
- if( ( audio = hb_list_item( title->list_audio, job->audios[i] ) ) )
- {
- strncpy(audio_lang, audio->iso639_2, sizeof(audio_lang));
+ strncpy(audio_lang, audio->config.lang.iso639_2, sizeof(audio_lang));
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;
- }
- }
}
/*
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
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 {
* 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.
- */
- } else {
- /*
- * Definitely not doing a subtitle scan.
+ * Copy all of them from the input job, to the title_copy/job_copy.
*/
- 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 );
}
}
}
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->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;
}
/**
- * 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 )
/* 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 );
}
/**
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;
+}
OSDN Git Service
