#include <stdarg.h>
#include <time.h>
#include <sys/time.h>
-#include <assert.h>
#include "common.h"
+#include "lang.h"
+#include "hb.h"
/**********************************************************************
* Global variables
{ { "32", 32 }, { "40", 40 }, { "48", 48 }, { "56", 56 },
{ "64", 64 }, { "80", 80 }, { "96", 96 }, { "112", 112 },
{ "128", 128 }, { "160", 160 }, { "192", 192 }, { "224", 224 },
- { "256", 256 }, { "320", 320 }, { "384", 384 } };
+ { "256", 256 }, { "320", 320 }, { "384", 384 }, { "448", 448 },
+ { "768", 768 } };
int hb_audio_bitrates_count = sizeof( hb_audio_bitrates ) /
sizeof( hb_rate_t );
int hb_audio_bitrates_default = 8; /* 128 kbps */
*********************************************************************/
void hb_reduce( int *x, int *y, int num, int den )
{
- int lower = MIN( num, den );
- int i;
- *x = num;
- *y = den;
- for( i = lower - 1; i > 1; --i )
+ // find the greatest common divisor of num & den by Euclid's algorithm
+ int n = num, d = den;
+ while ( d )
{
- if( ( num % i == 0 ) && ( den % i == 0 ) )
- {
- *x = num / i;
- *y = den / i;
- break;
- }
+ int t = d;
+ d = n % d;
+ n = t;
+ }
+
+ // at this point n is the gcd. if it's non-zero remove it from num
+ // and den. Otherwise just return the original values.
+ if ( n )
+ {
+ *x = num / n;
+ *y = den / n;
+ }
+ else
+ {
+ *x = num;
+ *y = den;
}
}
if ( title->height == 0 || title->width == 0 || title->aspect == 0 )
{
hb_log( "hb_fix_aspect: incomplete info for title %d: "
- "height = %d, width = %d, aspect = %d",
- title->height, title->width, title->aspect );
+ "height = %d, width = %d, aspect = %.3f",
+ title->index, title->height, title->width, title->aspect );
return;
}
}
}
+ double par = (double)title->width / ( (double)title->height * title->aspect );
+ double cropped_sar = (double)( title->height - job->crop[0] - job->crop[1] ) /
+ (double)(title->width - job->crop[2] - job->crop[3] );
+ double ar = par * cropped_sar;
if( keep == HB_KEEP_WIDTH )
{
- job->height = MULTIPLE_16(
- (uint64_t) job->width * title->width * HB_ASPECT_BASE *
- ( title->height - job->crop[0] - job->crop[1] ) /
- ( (uint64_t) title->height * title->aspect *
- ( title->width - job->crop[2] - job->crop[3] ) ) );
+ job->height = MULTIPLE_16( (uint64_t)( (double)job->width * ar ) );
job->height = MAX( 16, job->height );
}
else
{
- job->width = MULTIPLE_16(
- (uint64_t) job->height * title->height * title->aspect *
- ( title->width - job->crop[2] - job->crop[3] ) /
- ( (uint64_t) title->width * HB_ASPECT_BASE *
- ( title->height - job->crop[0] - job->crop[1] ) ) );
+ job->width = MULTIPLE_16( (uint64_t)( (double)job->height / ar ) );
job->width = MAX( 16, job->width );
}
}
length += 135000;
length /= 90000;
+ if( size == -1 )
+ {
+ hb_interjob_t * interjob = hb_interjob_get( job->h );
+ avail = job->vbitrate * 125 * length;
+ avail += length * interjob->vrate * overhead / interjob->vrate_base;
+ }
+
/* Video overhead */
avail -= length * job->vrate * overhead / job->vrate_base;
+ if( size == -1 )
+ {
+ goto ret;
+ }
+
for( i = 0; i < hb_list_count(job->list_audio); i++ )
{
/* Audio data */
switch( audio->config.out.codec )
{
case HB_ACODEC_FAAC:
+ case HB_ACODEC_CA_AAC:
case HB_ACODEC_VORBIS:
samples_per_frame = 1024;
break;
samples_per_frame = 1152;
break;
case HB_ACODEC_AC3:
+ case HB_ACODEC_DCA:
samples_per_frame = 1536;
break;
default:
avail -= length * audio->config.out.samplerate * overhead / samples_per_frame;
}
+ret:
if( avail < 0 )
{
return 0;
fprintf( stderr, "%s", string );
}
+int global_verbosity_level; //Necessary for hb_deep_log
+/**********************************************************************
+ * hb_deep_log
+ **********************************************************************
+ * If verbose mode is >= level, print message with timestamp. Messages
+ * longer than 360 characters are stripped ;p
+ *********************************************************************/
+void hb_deep_log( hb_debug_level_t level, char * log, ... )
+{
+ char string[362]; /* 360 chars + \n + \0 */
+ time_t _now;
+ struct tm * now;
+ va_list args;
+
+ if( global_verbosity_level < level )
+ {
+ /* Hiding message */
+ return;
+ }
+
+ /* Get the time */
+ _now = time( NULL );
+ now = localtime( &_now );
+ sprintf( string, "[%02d:%02d:%02d] ",
+ now->tm_hour, now->tm_min, now->tm_sec );
+
+ /* Convert the message to a string */
+ va_start( args, log );
+ vsnprintf( string + 11, 349, log, args );
+ va_end( args );
+
+ /* Add the end of line */
+ strcat( string, "\n" );
+
+ /* Print it */
+ fprintf( stderr, "%s", string );
+}
+
/**********************************************************************
* hb_error
**********************************************************************
}
hb_list_close( &t->list_subtitle );
+ if( t->metadata )
+ {
+ if( t->metadata->coverart )
+ {
+ free( t->metadata->coverart );
+ }
+ free( t->metadata );
+ }
+
free( t );
*_t = NULL;
}
*********************************************************************/
hb_audio_t *hb_audio_copy(const hb_audio_t *src)
{
- hb_audio_t *audio = calloc(1, sizeof(*audio));
- memcpy(audio, src, sizeof(*audio));
+ hb_audio_t *audio = NULL;
+
+ if( src )
+ {
+ audio = calloc(1, sizeof(*audio));
+ memcpy(audio, src, sizeof(*audio));
+ }
return audio;
}
*********************************************************************/
void hb_audio_config_init(hb_audio_config_t * audiocfg)
{
- assert(audiocfg != NULL);
-
/* Set read only paramaters to invalid values */
audiocfg->in.codec = 0xDEADBEEF;
audiocfg->in.bitrate = -1;
audiocfg->in.samplerate = -1;
audiocfg->in.channel_layout = 0;
+ audiocfg->in.version = 0;
+ audiocfg->in.mode = 0;
audiocfg->flags.ac3 = 0;
audiocfg->lang.description[0] = 0;
audiocfg->lang.simple[0] = 0;
audiocfg->out.samplerate = 44100;
audiocfg->out.mixdown = HB_AMIXDOWN_DOLBYPLII;
audiocfg->out.dynamic_range_compression = 0;
+ audiocfg->out.name = NULL;
}
/**********************************************************************
*********************************************************************/
int hb_audio_add(const hb_job_t * job, const hb_audio_config_t * audiocfg)
{
- assert(job != NULL);
- assert(audiocfg != NULL);
-
hb_title_t *title = job->title;
hb_audio_t *audio;
hb_audio_config_t * hb_list_audio_config_item(hb_list_t * list, int i)
{
- assert(list != NULL);
hb_audio_t *audio = NULL;
if( (audio = hb_list_item(list, i)) )
return NULL;
}
+
+/**********************************************************************
+ * hb_subtitle_copy
+ **********************************************************************
+ *
+ *********************************************************************/
+hb_subtitle_t *hb_subtitle_copy(const hb_subtitle_t *src)
+{
+ hb_subtitle_t *subtitle = NULL;
+
+ if( src )
+ {
+ subtitle = calloc(1, sizeof(*subtitle));
+ memcpy(subtitle, src, sizeof(*subtitle));
+ }
+ return subtitle;
+}
+
+/**********************************************************************
+ * hb_subtitle_add
+ **********************************************************************
+ *
+ *********************************************************************/
+int hb_subtitle_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, int track)
+{
+ hb_title_t *title = job->title;
+ hb_subtitle_t *subtitle;
+
+ subtitle = hb_subtitle_copy( hb_list_item( title->list_subtitle, track ) );
+ if( subtitle == NULL )
+ {
+ /* We fail! */
+ return 0;
+ }
+ subtitle->config = *subtitlecfg;
+ hb_list_add(job->list_subtitle, subtitle);
+ return 1;
+}
+
+int hb_srt_add( const hb_job_t * job,
+ const hb_subtitle_config_t * subtitlecfg,
+ const char *lang )
+{
+ hb_subtitle_t *subtitle;
+ iso639_lang_t *language = NULL;
+ int retval = 0;
+
+ subtitle = calloc( 1, sizeof( *subtitle ) );
+
+ subtitle->id = (hb_list_count(job->list_subtitle) << 8) | 0xFF;
+ subtitle->format = TEXTSUB;
+ subtitle->source = SRTSUB;
+
+ language = lang_for_code2( lang );
+
+ if( language )
+ {
+
+ strcpy( subtitle->lang, language->eng_name );
+ strncpy( subtitle->iso639_2, lang, 4 );
+
+ subtitle->config = *subtitlecfg;
+ subtitle->config.dest = PASSTHRUSUB;
+
+ hb_list_add(job->list_subtitle, subtitle);
+ retval = 1;
+ }
+ return retval;
+}
OSDN Git Service
