#include "hb.h"
#include "ffmpeg/avcodec.h"
+#include "ffmpeg/swscale.h"
struct hb_handle_s
{
/* The thread which processes the jobs. Others threads are launched
from this one (see work.c) */
hb_list_t * jobs;
+ hb_job_t * current_job;
int job_count;
+ int job_count_permanent;
volatile int work_die;
int work_error;
hb_thread_t * work_thread;
hb_lock_t * state_lock;
hb_state_t state;
-
+
int paused;
hb_lock_t * pause_lock;
+ /* For MacGui active queue
+ increments each time the scan thread completes*/
+ int scanCount;
+
};
hb_work_object_t * hb_objects = NULL;
}
}
+ /*
+ * Initialise buffer pool
+ */
+ hb_buffer_pool_init();
+
/* CPU count detection */
hb_log( "hb_init: checking cpu count" );
h->cpu_count = hb_get_cpu_count();
/* libavcodec */
avcodec_init();
- register_avcodec( &mpeg4_encoder );
- register_avcodec( &mp2_decoder );
- register_avcodec( &ac3_encoder );
+ avcodec_register_all();
av_register_codec_parser( &mpegaudio_parser);
/* Start library thread */
HB_NORMAL_PRIORITY );
return h;
+
+ /* Set the scan count to start at 0 */
+ //scan_count = 0;
}
/**
h->list_title = hb_list_init();
h->jobs = hb_list_init();
+ h->current_job = NULL;
h->state_lock = hb_lock_init();
h->state.state = HB_STATE_IDLE;
/* libavcodec */
avcodec_init();
- register_avcodec( &mpeg4_encoder );
- register_avcodec( &mp2_decoder );
- register_avcodec( &ac3_encoder );
+ avcodec_register_all();
/* Start library thread */
hb_log( "hb_init: starting libhb thread" );
FILE * file;
uint8_t * buf1, * buf2, * buf3, * buf4, * pen;
uint32_t * p32;
- AVPicture pic1, pic2, pic3, pic4;
- ImgReSampleContext * context;
+ AVPicture pic_in, pic_preview, pic_deint, pic_crop, pic_scale;
+ struct SwsContext * context;
int i;
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 );
- avpicture_fill( &pic1, buf1, PIX_FMT_YUV420P,
+ avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
title->width, title->height );
- avpicture_fill( &pic2, buf2, PIX_FMT_YUV420P,
+ avpicture_fill( &pic_deint, buf2, PIX_FMT_YUV420P,
title->width, title->height );
- avpicture_fill( &pic3, buf3, PIX_FMT_YUV420P,
+ avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P,
job->width, job->height );
- avpicture_fill( &pic4, buf4, PIX_FMT_RGBA32,
+ avpicture_fill( &pic_preview, buf4, PIX_FMT_RGBA32,
job->width, job->height );
-
+
+ // Allocate the AVPicture frames and fill in
+
memset( filename, 0, 1024 );
hb_get_tempory_filename( h, filename, "%x%d",
fread( buf1, title->width * title->height * 3 / 2, 1, file );
fclose( file );
- context = img_resample_full_init(
- job->width, job->height, title->width, title->height,
- job->crop[0], job->crop[1], job->crop[2], job->crop[3],
- 0, 0, 0, 0 );
-
if( job->deinterlace )
{
- avpicture_deinterlace( &pic2, &pic1, PIX_FMT_YUV420P,
- title->width, title->height );
- img_resample( context, &pic3, &pic2 );
+ // Deinterlace and crop
+ avpicture_deinterlace( &pic_deint, &pic_in, PIX_FMT_YUV420P, title->width, title->height );
+ av_picture_crop( &pic_crop, &pic_deint, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
}
else
{
- img_resample( context, &pic3, &pic1 );
+ // Crop
+ av_picture_crop( &pic_crop, &pic_in, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
}
- img_convert( &pic4, PIX_FMT_RGBA32, &pic3, PIX_FMT_YUV420P,
- job->width, job->height );
+
+ // Get scaling context
+ context = sws_getContext(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,
+ (uint16_t)(SWS_LANCZOS|SWS_ACCURATE_RND), NULL, NULL, NULL);
+
+ // Scale
+ sws_scale(context,
+ pic_crop.data, pic_crop.linesize,
+ 0, title->height - (job->crop[0] + job->crop[1]),
+ pic_scale.data, pic_scale.linesize);
+
+ // Free context
+ sws_freeContext( context );
+
+ // 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);
+
+ // Create preview
+ sws_scale(context,
+ pic_scale.data, pic_scale.linesize,
+ 0, job->height,
+ pic_preview.data, pic_preview.linesize);
+
+ // Free context
+ sws_freeContext( context );
/* Gray background */
p32 = (uint32_t *) buffer;
}
memset( pen, 0xFF, 4 * ( job->width + 2 ) );
- free( buf1 );
- free( buf2 );
- free( buf3 );
- free( buf4 );
+ // Clean up
+ avpicture_free( &pic_preview );
+ avpicture_free( &pic_scale );
+ avpicture_free( &pic_deint );
+ avpicture_free( &pic_in );
}
/**
return hb_list_item( h->jobs, i );
}
+hb_job_t * hb_current_job( hb_handle_t * h )
+{
+ return( h->current_job );
+}
+
/**
* Adds a job to the job list.
* @param h Handle to hb_handle_t.
title_copy->list_audio = hb_list_init();
/* Do nothing about audio during first pass */
- if( job->pass != 1 )
+ if( job->pass == 0 || job->pass == 2 )
{
for( i = 0; i < 8; i++ )
{
title_copy->list_subtitle = hb_list_init();
-
+ /*
+ * The following code is confusing, there are three ways in which
+ * we select subtitles and it depends on whether this is single or
+ * two pass mode.
+ *
+ * subtitle_scan may be enabled, in which case the first pass
+ * 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->subtitle_scan || job->native_language ) {
+ if ( job->indepth_scan || job->native_language ) {
/*
* Find the first audio language that is being encoded
}
}
-
+ /*
+ * 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 )
{
- hb_log( "Enabled subtitles in native language '%s', audio is in '%s'",
- job->native_language, audio_lang);
+ 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.
}
}
}
-
- if ( job->subtitle_scan || job->native_language )
+
+ /*
+ * If doing a subtitle scan then add all the matching subtitles for this
+ * language.
+ */
+ if ( job->indepth_scan )
{
- /*
- * Select subtitles that match the language we want
- */
for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
{
subtitle = hb_list_item( title->list_subtitle, i );
/*
* Matched subtitle language with audio language, so
* add this to our list to scan.
+ *
+ * We will update the subtitle list on the second pass
+ * later after the first pass has completed.
*/
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->subtitle_scan ) {
+ if ( job->native_language ) {
/*
* With native language just select the
* first match in our langiage, not all of
- * them.
+ * them. Subsequent ones are likely to be commentary
*/
break;
}
}
} else {
/*
- * Manually selected subtitle, in which case only bother adding them
- * for pass 0 or pass 2 of a two pass.
+ * Not doing a subtitle scan in this pass, but maybe we are in the
+ * first pass?
*/
- if( job->pass != 1 )
+ if( job->select_subtitle )
{
- if( ( subtitle = hb_list_item( title->list_subtitle, job->subtitle ) ) )
+ /*
+ * 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.
+ */
+ if( job->pass != 1 && job->native_language )
{
- subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
- memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
- hb_list_add( title_copy->list_subtitle, subtitle_copy );
+ /*
+ * 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++ )
+ {
+ 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 );
+ }
+ }
}
}
}
job_copy->h = h;
job_copy->pause = h->pause_lock;
+ /* Copy the job filter list */
+ if( job->filters )
+ {
+ int i;
+ int filter_count = hb_list_count( job->filters );
+ job_copy->filters = hb_list_init();
+ for( i = 0; i < filter_count; i++ )
+ {
+ hb_filter_object_t * filter = hb_list_item( job->filters, i );
+ hb_list_add( job_copy->filters, filter );
+ }
+ }
+
/* Add the job to the list */
hb_list_add( h->jobs, job_copy );
+ h->job_count = hb_count(h);
+ h->job_count_permanent++;
}
/**
void hb_rem( hb_handle_t * h, hb_job_t * job )
{
hb_list_rem( h->jobs, job );
+
+ h->job_count = hb_count(h);
+ if (h->job_count_permanent)
+ h->job_count_permanent--;
/* XXX free everything XXX */
}
{
/* XXX Hack */
h->job_count = hb_list_count( h->jobs );
+ h->job_count_permanent = h->job_count;
hb_lock( h->state_lock );
h->state.state = HB_STATE_WORKING;
h->work_die = 0;
h->work_thread = hb_work_init( h->jobs, h->cpu_count,
- &h->work_die, &h->work_error );
+ &h->work_die, &h->work_error, &h->current_job );
}
/**
{
h->work_die = 1;
+ h->job_count = hb_count(h);
+ h->job_count_permanent = 0;
+
hb_resume( h );
}
hb_lock( h->state_lock );
memcpy( s, &h->state, sizeof( hb_state_t ) );
- h->state.state = HB_STATE_IDLE;
+ if ( h->state.state == HB_STATE_SCANDONE || h->state.state == HB_STATE_WORKDONE )
+ h->state.state = HB_STATE_IDLE;
+
+ hb_unlock( h->state_lock );
+}
+
+void hb_get_state2( hb_handle_t * h, hb_state_t * s )
+{
+ hb_lock( h->state_lock );
+
+ memcpy( s, &h->state, sizeof( hb_state_t ) );
hb_unlock( h->state_lock );
}
/**
+ * Called in MacGui in UpdateUI to check
+ * for a new scan being completed to set a new source
+ */
+int hb_get_scancount( hb_handle_t * h)
+ {
+ return h->scanCount;
+ }
+
+/**
* Closes access to libhb by freeing the hb_handle_t handle ontained in hb_init_real.
* @param _h Pointer to handle to hb_handle_t.
*/
while( ( title = hb_list_item( h->list_title, 0 ) ) )
{
hb_list_rem( h->list_title, title );
+ if( title->job && title->job->filters )
+ {
+ hb_list_close( &title->job->filters );
+ }
free( title->job );
hb_title_close( &title );
}
hb_lock_close( &h->pause_lock );
free( h );
*_h = NULL;
+
}
/**
hb_log( "libhb: scan thread found %d valid title(s)",
hb_list_count( h->list_title ) );
hb_lock( h->state_lock );
- h->state.state = HB_STATE_SCANDONE;
- hb_unlock( h->state_lock );
+ h->state.state = HB_STATE_SCANDONE; //originally state.state
+ hb_unlock( h->state_lock );
+ /*we increment this sessions scan count by one for the MacGui
+ to trigger a new source being set */
+ h->scanCount++;
}
/* Check if the work thread is done */
hb_lock( h->state_lock );
h->state.state = HB_STATE_WORKDONE;
h->state.param.workdone.error = h->work_error;
+
+ h->job_count = hb_count(h);
+ if (h->job_count < 1)
+ h->job_count_permanent = 0;
hb_unlock( h->state_lock );
}
if( h->state.state == HB_STATE_WORKING )
{
/* XXX Hack */
+ if (h->job_count < 1)
+ h->job_count_permanent = 1;
+
h->state.param.working.job_cur =
- h->job_count - hb_list_count( h->jobs );
- h->state.param.working.job_count = h->job_count;
+ h->job_count_permanent - hb_list_count( h->jobs );
+ h->state.param.working.job_count = h->job_count_permanent;
}
hb_unlock( h->state_lock );
hb_unlock( h->pause_lock );
OSDN Git Service
