OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WinGui:
[handbrake-jp/handbrake-jp-git.git]
/
test
/
test.c
diff --git
a/test/test.c
b/test/test.c
index
e8d9d18
..
fc753d2
100644
(file)
--- a/
test/test.c
+++ b/
test/test.c
@@
-365,6
+365,8
@@
int main( int argc, char ** argv )
if( stop_at_string ) free( stop_at_string );
if( start_at_string ) free( start_at_string );
if( stop_at_string ) free( stop_at_string );
if( start_at_string ) free( start_at_string );
+ // write a carriage return to stdout - avoids overlap / line wrapping when stderr is redirected
+ fprintf( stdout, "\n" );
fprintf( stderr, "HandBrake has exited.\n" );
return 0;
fprintf( stderr, "HandBrake has exited.\n" );
return 0;
@@
-608,7
+610,7
@@
static int HandleEvents( hb_handle_t * h )
if (preset)
{
if (preset)
{
- fprintf( stderr, "+ Using preset: %s", preset_name);
+ fprintf( stderr, "+ Using preset: %s
\n
", preset_name);
if (!strcmp(preset_name, "Universal"))
{
if (!strcmp(preset_name, "Universal"))
{
@@
-1511,7
+1513,7
@@
static int HandleEvents( hb_handle_t * h )
}
else
{
}
else
{
- fprintf(stderr, "ERROR: Unable to parse audio input \"%s\", skipping.",
+ fprintf(stderr, "ERROR: Unable to parse audio input \"%s\", skipping.
\n
",
token);
free(audio);
}
token);
free(audio);
}
@@
-1913,10
+1915,12
@@
static int HandleEvents( hb_handle_t * h )
( audio->out.codec & HB_ACODEC_PASS_FLAG ) &&
!( audio->out.codec & audio->in.codec ) )
{
( audio->out.codec & HB_ACODEC_PASS_FLAG ) &&
!( audio->out.codec & audio->in.codec ) )
{
+ // AC3 passthru not possible, fallback to AC3 encoder.
+ fprintf( stderr, "AC3 passthru requested and input codec is not AC3 for track %d, using AC3 encoder\n",
+ audio->out.track );
audio->out.codec = HB_ACODEC_AC3;
audio->out.mixdown = hb_get_default_mixdown( audio->out.codec, audio->in.channel_layout );
audio->out.codec = HB_ACODEC_AC3;
audio->out.mixdown = hb_get_default_mixdown( audio->out.codec, audio->in.channel_layout );
- audio->out.bitrate = hb_get_default_audio_bitrate(
- audio->out.codec, audio->out.samplerate,
+ audio->out.bitrate = hb_get_default_audio_bitrate( audio->out.codec, audio->out.samplerate,
audio->out.mixdown );
}
// fix 'copy' to select a specific codec
audio->out.mixdown );
}
// fix 'copy' to select a specific codec
@@
-1926,7
+1930,7
@@
static int HandleEvents( hb_handle_t * h )
if ( !( audio->out.codec & HB_ACODEC_MASK ) )
{
// Passthru not possible, drop audio.
if ( !( audio->out.codec & HB_ACODEC_MASK ) )
{
// Passthru not possible, drop audio.
- fprintf( stderr, "Passthru requested and input codec is not the same as output codec for track %d\n",
+ fprintf( stderr, "Passthru requested and input codec is not the same as output codec for track %d
, dropping track
\n",
audio->out.track );
hb_audio_t * item = hb_list_item( job->list_audio, i );
hb_list_rem( job->list_audio, item );
audio->out.track );
hb_audio_t * item = hb_list_item( job->list_audio, i );
hb_list_rem( job->list_audio, item );