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]
/
libhb
/
decdca.c
diff --git
a/libhb/decdca.c
b/libhb/decdca.c
index
ec625c5
..
89c2b1c
100644
(file)
--- a/
libhb/decdca.c
+++ b/
libhb/decdca.c
@@
-33,7
+33,7
@@
struct hb_work_private_s
hb_list_t * list;
hb_list_t * list;
-
int out_discrete_channels;
+ int out_discrete_channels;
};
};
@@
-75,13
+75,15
@@
static int decdcaInit( hb_work_object_t * w, hb_job_t * job )
pv->list = hb_list_init();
pv->state = dca_init( 0 );
pv->list = hb_list_init();
pv->state = dca_init( 0 );
-
/* Decide what format we want out of libdca
-
work.c has already done some of this deduction for us in do_job() */
+ /* Decide what format we want out of libdca
+ work.c has already done some of this deduction for us in do_job() */
- pv->flags_out = HB_AMIXDOWN_GET_DCA_FORMAT(audio->config.out.mixdown);
+ pv->flags_out = HB_AMIXDOWN_GET_DCA_FORMAT(audio->config.out.mixdown);
+ if ( audio->config.out.codec == HB_ACODEC_LAME )
+ pv->flags_out |= DCA_ADJUST_LEVEL;
-
/* pass the number of channels used into the private work data */
-
/* will only be actually used if we're not doing AC3 passthru */
+ /* pass the number of channels used into the private work data */
+ /* will only be actually used if we're not doing AC3 passthru */
pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
pv->level = 32768.0;
pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
pv->level = 32768.0;
@@
-156,6
+158,7
@@
static hb_buffer_t * Decode( hb_work_object_t * w )
hb_audio_t * audio = w->audio;
int i, j, k;
int64_t pts, pos;
hb_audio_t * audio = w->audio;
int i, j, k;
int64_t pts, pos;
+ uint64_t upts, upos;
int num_blocks;
/* Get a frame header if don't have one yet */
int num_blocks;
/* Get a frame header if don't have one yet */
@@
-198,7
+201,10
@@
static hb_buffer_t * Decode( hb_work_object_t * w )
}
/* Get the whole frame */
}
/* Get the whole frame */
- hb_list_getbytes( pv->list, pv->frame, pv->size, &pts, &pos );
+ hb_list_getbytes( pv->list, pv->frame, pv->size, &upts, &upos );
+ pts = (int64_t)upts;
+ pos = (int64_t)upos;
+
if ( pts != pv->last_buf_pts )
{
pv->last_buf_pts = pts;
if ( pts != pv->last_buf_pts )
{
pv->last_buf_pts = pts;
@@
-262,10
+268,10
@@
static hb_buffer_t * Decode( hb_work_object_t * w )
/* Interleave */
for( j = 0; j < 256; j++ )
{
/* Interleave */
for( j = 0; j < 256; j++ )
{
-
for ( k = 0; k < pv->out_discrete_channels; k++ )
-
{
-
samples_out[(pv->out_discrete_channels*j)+k] = samples_in[(256*k)+j] * 16384;
-
}
+ for ( k = 0; k < pv->out_discrete_channels; k++ )
+ {
+ samples_out[(pv->out_discrete_channels*j)+k] = samples_in[(256*k)+j] * 16384;
+ }
}
}
}
}