#include "a52dec/a52.h"
#include "dca.h"
+#define HB_MAX_PREVIEWS 30 // 30 previews = every 5 minutes of a 2.5 hour video
+
typedef struct
{
hb_handle_t * h;
hb_dvd_t * dvd;
hb_stream_t * stream;
+
+ int preview_count;
+ int store_previews;
} hb_scan_t;
static void LookForAudio( hb_title_t * title, hb_buffer_t * b );
static int AllAudioOK( hb_title_t * title );
-static const char *aspect_to_string( int aspect )
+static const char *aspect_to_string( double aspect )
{
- switch ( aspect )
+ switch ( (int)(aspect * 9.) )
{
- case HB_ASPECT_BASE * 1 / 1: return "1:1";
- case HB_ASPECT_BASE * 4 / 3: return "4:3";
- case HB_ASPECT_BASE * 16 / 9: return "16:9";
- case HB_ASPECT_BASE * 221 / 100: return "2.21:1";
+ case 9 * 4 / 3: return "4:3";
+ case 9 * 16 / 9: return "16:9";
}
static char arstr[32];
- double a = (double)aspect / HB_ASPECT_BASE;
- sprintf( arstr, aspect >= 1.? "%.2f:1" : "1:%.2f", a );
+ sprintf( arstr, aspect >= 1.? "%.2f:1" : "1:%.2f", aspect );
return arstr;
}
hb_thread_t * hb_scan_init( hb_handle_t * handle, const char * path,
- int title_index, hb_list_t * list_title )
+ int title_index, hb_list_t * list_title,
+ int preview_count, int store_previews )
{
hb_scan_t * data = calloc( sizeof( hb_scan_t ), 1 );
data->path = strdup( path );
data->title_index = title_index;
data->list_title = list_title;
-
+
+ data->preview_count = preview_count;
+ data->store_previews = store_previews;
+
return hb_thread_init( "scan", ScanFunc, data, HB_NORMAL_PRIORITY );
}
int j;
hb_state_t state;
hb_audio_t * audio;
- hb_title_t * title_tmp = NULL;
title = hb_list_item( data->list_title, i );
- /* I've seen a DVD with strictly identical titles. Check this
- here and ignore it if redundant */
- for( j = 0; j < i; j++ )
- {
- title_tmp = hb_list_item( data->list_title, j );
- if( title->vts == title_tmp->vts &&
- title->block_start == title_tmp->block_start &&
- title->block_end == title_tmp->block_end &&
- title->block_count == title_tmp->block_count )
- {
- break;
- }
- else
- {
- title_tmp = NULL;
- }
- }
- if( title_tmp )
- {
- hb_log( "scan: title %d is duplicate with title %d",
- title->index, title_tmp->index );
- hb_list_rem( data->list_title, title );
- free( title ); /* This _will_ leak! */
- continue;
- }
-
#define p state.param.scanning
/* Update the UI */
state.state = HB_STATE_SCANNING;
j++;
}
- /* If we don't have any audio streams left, remove the title */
- if( !hb_list_count( title->list_audio ) )
- {
- hb_list_rem( data->list_title, title );
- free( title );
- continue;
- }
-
i++;
}
/* Preserve a source's pixel aspect, if it's available. */
if( title->pixel_aspect_width && title->pixel_aspect_height )
{
- job->pixel_aspect_width = title->pixel_aspect_width;
- job->pixel_aspect_height = title->pixel_aspect_height;
+ job->anamorphic.par_width = title->pixel_aspect_width;
+ job->anamorphic.par_height = title->pixel_aspect_height;
}
- if( title->aspect == 16 && !job->pixel_aspect_width && !job->pixel_aspect_height)
+ if( title->aspect != 0 && title->aspect != 1. &&
+ !job->anamorphic.par_width && !job->anamorphic.par_height)
{
- hb_reduce( &job->pixel_aspect_width, &job->pixel_aspect_height,
- 16 * title->height, 9 * title->width );
- }
- else if( !job->pixel_aspect_width && !job->pixel_aspect_height )
- {
- hb_reduce( &job->pixel_aspect_width, &job->pixel_aspect_height,
- 4 * title->height, 3 * title->width );
+ hb_reduce( &job->anamorphic.par_width, &job->anamorphic.par_height,
+ (int)(title->aspect * title->height + 0.5), title->width );
}
job->width = title->width - job->crop[2] - job->crop[3];
job->vrate_base = title->rate_base;
job->list_audio = hb_list_init();
-
- job->subtitle = -1;
+ job->list_subtitle = hb_list_init();
job->mux = HB_MUX_MP4;
}
// -----------------------------------------------
// stuff related to cropping
-#define DARK 64
+#define DARK 32
+
+static inline int absdiff( int x, int y )
+{
+ return x < y ? y - x : x - y;
+}
+
+static inline int clampBlack( int x )
+{
+ // luma 'black' is 16 and anything less should be clamped at 16
+ return x < 16 ? 16 : x;
+}
static int row_all_dark( hb_title_t *title, uint8_t* luma, int row )
{
- int i = title->width;
- luma += i * row;
- while ( --i >= 0 )
+ luma += title->width * row;
+
+ // compute the average luma value of the row
+ int i, avg = 0;
+ for ( i = 0; i < title->width; ++i )
{
- if ( *luma++ > DARK )
+ avg += clampBlack( luma[i] );
+ }
+ avg /= title->width;
+ if ( avg >= DARK )
+ return 0;
+
+ // since we're trying to detect smooth borders, only take the row if
+ // all pixels are within +-16 of the average (this range is fairly coarse
+ // but there's a lot of quantization noise for luma values near black
+ // so anything less will fail to crop because of the noise).
+ for ( i = 0; i < title->width; ++i )
+ {
+ if ( absdiff( avg, clampBlack( luma[i] ) ) > 16 )
return 0;
}
return 1;
}
-static int column_all_dark( hb_title_t *title, uint8_t* luma, int top, int col )
+static int column_all_dark( hb_title_t *title, uint8_t* luma, int top, int bottom,
+ int col )
{
- int i = title->height - top;
int stride = title->width;
+ int height = title->height - top - bottom;
luma += stride * top + col;
- for ( ; --i >= 0; luma += stride )
+
+ // compute the average value of the column
+ int i = height, avg = 0, row = 0;
+ for ( ; --i >= 0; row += stride )
+ {
+ avg += clampBlack( luma[row] );
+ }
+ avg /= height;
+ if ( avg >= DARK )
+ return 0;
+
+ // since we're trying to detect smooth borders, only take the column if
+ // all pixels are within +-16 of the average.
+ i = height, row = 0;
+ for ( ; --i >= 0; row += stride )
{
- if ( *luma > DARK )
+ if ( absdiff( avg, clampBlack( luma[row] ) ) > 16 )
return 0;
}
return 1;
typedef struct {
int n;
- int t[10];
- int b[10];
- int l[10];
- int r[10];
+ int t[HB_MAX_PREVIEWS];
+ int b[HB_MAX_PREVIEWS];
+ int l[HB_MAX_PREVIEWS];
+ int r[HB_MAX_PREVIEWS];
} crop_record_t;
static void record_crop( crop_record_t *crops, int t, int b, int l, int r )
hb_list_t * list_es;
int progressive_count = 0;
int interlaced_preview_count = 0;
- info_list_t * info_list = calloc( 10+1, sizeof(*info_list) );
+ info_list_t * info_list = calloc( data->preview_count+1, sizeof(*info_list) );
crop_record_t *crops = calloc( 1, sizeof(*crops) );
buf_ps = hb_buffer_init( HB_DVD_READ_BUFFER_SIZE );
hb_log( "scan: decoding previews for title %d", title->index );
if (data->dvd)
- hb_dvd_start( data->dvd, title->index, 1 );
+ {
+ hb_dvd_start( data->dvd, title, 1 );
+ title->angle_count = hb_dvd_angle_count( data->dvd );
+ hb_log( "scan: title angle(s) %d", title->angle_count );
+ }
- for( i = 0; i < 10; i++ )
+ for( i = 0; i < data->preview_count; i++ )
{
int j;
FILE * file_preview;
if (data->dvd)
{
- if( !hb_dvd_seek( data->dvd, (float) ( i + 1 ) / 11.0 ) )
+ if( !hb_dvd_seek( data->dvd, (float) ( i + 1 ) / ( data->preview_count + 1.0 ) ) )
{
continue;
}
/* we start reading streams at zero rather than 1/11 because
* short streams may have only one sequence header in the entire
* file and we need it to decode any previews. */
- if (!hb_stream_seek(data->stream, (float) i / 11.0 ) )
+ if (!hb_stream_seek(data->stream, (float) i / ( data->preview_count + 1.0 ) ) )
{
continue;
}
}
- hb_log( "scan: preview %d", i + 1 );
+ hb_deep_log( 2, "scan: preview %d", i + 1 );
int vcodec = title->video_codec? title->video_codec : WORK_DECMPEG2;
hb_work_object_t *vid_decoder = hb_get_work( vcodec );
vid_decoder->codec_param = title->video_codec_param;
+ vid_decoder->title = title;
vid_decoder->init( vid_decoder, NULL );
hb_buffer_t * vid_buf = NULL;
+ int vidskip = 0;
+
+ if ( title->flags & HBTF_NO_IDR )
+ {
+ // title doesn't have IDR frames so we decode but drop one second's
+ // worth of frames to allow the decoder to converge.
+ if ( ! title->rate_base )
+ {
+ vidskip = 30;
+ }
+ else
+ {
+ vidskip = (double)title->rate / (double)title->rate_base + 0.5;
+ }
+ }
for( j = 0; j < 10240 ; j++ )
{
{
if( !hb_dvd_read( data->dvd, buf_ps ) )
{
+ if ( vid_buf )
+ {
+ break;
+ }
hb_log( "Warning: Could not read data for preview %d, skipped", i + 1 );
goto skip_preview;
}
{
if ( !hb_stream_read(data->stream,buf_ps) )
{
+ if ( vid_buf )
+ {
+ break;
+ }
hb_log( "Warning: Could not read data for preview %d, skipped", i + 1 );
goto skip_preview;
}
}
- if ( title->demuxer == HB_NULL_DEMUXER )
- {
- hb_demux_null( buf_ps, list_es, 0 );
- }
- else
- {
- hb_demux_ps( buf_ps, list_es, 0 );
- }
+ (hb_demux[title->demuxer])(buf_ps, list_es, 0 );
while( ( buf_es = hb_list_item( list_es, 0 ) ) )
{
if( buf_es->id == title->video_id && vid_buf == NULL )
{
vid_decoder->work( vid_decoder, &buf_es, &vid_buf );
+ if ( vid_buf && vidskip && --vidskip > 0 )
+ {
+ // we're dropping frames to get the video decoder in sync
+ // when the video stream doesn't contain IDR frames
+ hb_buffer_close( &vid_buf );
+ vid_buf = NULL;
+ }
}
else if( ! AllAudioOK( title ) )
{
/* Get size and rate infos */
hb_work_info_t vid_info;
- vid_decoder->info( vid_decoder, &vid_info );
+ if( !vid_decoder->info( vid_decoder, &vid_info ) )
+ {
+ /*
+ * Could not fill vid_info, don't continue and try to use vid_info
+ * in this case.
+ */
+ vid_decoder->close( vid_decoder );
+ free( vid_decoder );
+ continue;
+ }
vid_decoder->close( vid_decoder );
free( vid_decoder );
remember_info( info_list, &vid_info );
+ title->video_codec_name = strdup( vid_info.name );
title->width = vid_info.width;
title->height = vid_info.height;
title->rate = vid_info.rate;
title->rate_base = vid_info.rate_base;
+ title->video_bitrate = vid_info.bitrate;
if( title->rate_base == 1126125 )
{
*/
if( progressive_count == 6 )
{
- hb_log("Title's mostly NTSC Film, setting fps to 23.976");
+ hb_deep_log( 2, "Title's mostly NTSC Film, setting fps to 23.976");
}
title->rate_base = 1126125;
}
/* Check preview for interlacing artifacts */
if( hb_detect_comb( vid_buf, title->width, title->height, 10, 30, 9, 10, 30, 9 ) )
{
- hb_log("Interlacing detected in preview frame %i", i+1);
+ hb_deep_log( 2, "Interlacing detected in preview frame %i", i+1);
interlaced_preview_count++;
}
-
- hb_get_tempory_filename( data->h, filename, "%x%d",
- (intptr_t)title, i );
-
- file_preview = fopen( filename, "w" );
- if( file_preview )
+
+ if( data->store_previews )
{
- fwrite( vid_buf->data, title->width * title->height * 3 / 2,
- 1, file_preview );
- fclose( file_preview );
- }
- else
- {
- hb_log( "scan: fopen failed (%s)", filename );
+ hb_get_tempory_filename( data->h, filename, "%" PRIxPTR "%d",
+ (intptr_t)title, i );
+
+ file_preview = fopen( filename, "wb" );
+ if( file_preview )
+ {
+ fwrite( vid_buf->data, title->width * title->height * 3 / 2,
+ 1, file_preview );
+ fclose( file_preview );
+ }
+ else
+ {
+ hb_log( "scan: fopen failed (%s)", filename );
+ }
}
/* Detect black borders */
#define Y vid_buf->data
int top, bottom, left, right;
int h4 = title->height / 4, w4 = title->width / 4;
- for ( top = 2; top < h4; ++top )
+
+ // When widescreen content is matted to 16:9 or 4:3 there's sometimes
+ // a thin border on the outer edge of the matte. On TV content it can be
+ // "line 21" VBI data that's normally hidden in the overscan. For HD
+ // content it can just be a diagnostic added in post production so that
+ // the frame borders are visible. We try to ignore these borders so
+ // we can crop the matte. The border width depends on the resolution
+ // (12 pixels on 1080i looks visually the same as 4 pixels on 480i)
+ // so we allow the border to be up to 1% of the frame height.
+ const int border = title->height / 100;
+
+ for ( top = border; top < h4; ++top )
{
if ( ! row_all_dark( title, Y, top ) )
break;
}
- if ( top < 4 )
+ if ( top <= border )
{
- // we started at row two to avoid the "line 19" noise that shows
- // up on row 0 & 1 of some TV shows. Since we stopped before row 4
- // check if row 0 & 1 are dark or if we shouldn't crop the top at all.
- if ( row_all_dark( title, Y, 0 ) )
+ // we never made it past the border region - see if the rows we
+ // didn't check are dark or if we shouldn't crop at all.
+ for ( top = 0; top < border; ++top )
{
- top = row_all_dark( title, Y, 1 )? top : 1;
+ if ( ! row_all_dark( title, Y, top ) )
+ break;
}
- else
+ if ( top >= border )
{
top = 0;
}
}
- for ( bottom = 0; bottom < h4; ++bottom )
+ for ( bottom = border; bottom < h4; ++bottom )
{
if ( ! row_all_dark( title, Y, title->height - 1 - bottom ) )
break;
}
+ if ( bottom <= border )
+ {
+ for ( bottom = 0; bottom < border; ++bottom )
+ {
+ if ( ! row_all_dark( title, Y, title->height - 1 - bottom ) )
+ break;
+ }
+ if ( bottom >= border )
+ {
+ bottom = 0;
+ }
+ }
for ( left = 0; left < w4; ++left )
{
- if ( ! column_all_dark( title, Y, top, left ) )
+ if ( ! column_all_dark( title, Y, top, bottom, left ) )
break;
}
for ( right = 0; right < w4; ++right )
{
- if ( ! column_all_dark( title, Y, top, title->width - 1 - right ) )
+ if ( ! column_all_dark( title, Y, top, bottom, title->width - 1 - right ) )
break;
}
// compute the aspect ratio based on the storage dimensions and the
// pixel aspect ratio (if supplied) or just storage dimensions if no PAR.
- title->aspect = ( (double)title->width / (double)title->height + 0.05 ) *
- HB_ASPECT_BASE;
-
- double aspect = (double)title->width / (double)title->height;
+ title->aspect = (double)title->width / (double)title->height;
if( title->pixel_aspect_width && title->pixel_aspect_height )
{
- aspect *= (double)title->pixel_aspect_width /
- (double)title->pixel_aspect_height;
+ title->aspect *= (double)title->pixel_aspect_width /
+ (double)title->pixel_aspect_height;
+
+ // For unknown reasons some French PAL DVDs put the original
+ // content's aspect ratio into the mpeg PAR even though it's
+ // the wrong PAR for the DVD. Apparently they rely on the fact
+ // that DVD players ignore the content PAR and just use the
+ // aspect ratio from the DVD metadata. So, if the aspect computed
+ // from the PAR is different from the container's aspect we use
+ // the container's aspect & recompute the PAR from it.
+ if( title->container_aspect && (int)(title->aspect * 9) != (int)(title->container_aspect * 9) )
+ {
+ hb_log("scan: content PAR gives wrong aspect %.2f; "
+ "using container aspect %.2f", title->aspect,
+ title->container_aspect );
+ title->aspect = title->container_aspect;
+ hb_reduce( &title->pixel_aspect_width, &title->pixel_aspect_height,
+ (int)(title->aspect * title->height + 0.5), title->width );
+ }
}
- title->aspect = ( aspect + 0.05 ) * HB_ASPECT_BASE;
- if ( crops->n )
+ // don't try to crop unless we got at least 3 previews
+ if ( crops->n > 2 )
{
sort_crops( crops );
// The next line selects median cropping - at least
audio->config.in.samplerate = info.rate;
audio->config.in.bitrate = info.bitrate;
audio->config.in.channel_layout = info.channel_layout;
+ audio->config.in.version = info.version;
+ audio->config.in.mode = info.mode;
audio->config.flags.ac3 = info.flags;
// update the audio description string based on the info we found
OSDN Git Service
