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
x264 bump to r1339-82b80ef
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
sync.c
diff --git
a/libhb/sync.c
b/libhb/sync.c
index
2043b9d
..
94b8411
100644
(file)
--- a/
libhb/sync.c
+++ b/
libhb/sync.c
@@
-377,7
+377,7
@@
static void SyncVideo( hb_work_object_t * w )
* as if it started at zero so that our audio timing will
* be in sync.
*/
* as if it started at zero so that our audio timing will
* be in sync.
*/
- hb_log( "sync: first pts is %
lld"
, cur->start );
+ hb_log( "sync: first pts is %
"PRId64
, cur->start );
cur->start = 0;
}
}
cur->start = 0;
}
}
@@
-417,7
+417,7
@@
static void SyncVideo( hb_work_object_t * w )
if ( pv->first_drop )
{
hb_log( "sync: video time didn't advance - dropped %d frames "
if ( pv->first_drop )
{
hb_log( "sync: video time didn't advance - dropped %d frames "
- "(delta %d ms, current %
lld, next %lld
, dur %d)",
+ "(delta %d ms, current %
"PRId64", next %"PRId64"
, dur %d)",
pv->drop_count, (int)( cur->start - pv->first_drop ) / 90,
cur->start, next->start, (int)( next->start - cur->start ) );
pv->first_drop = 0;
pv->drop_count, (int)( cur->start - pv->first_drop ) / 90,
cur->start, next->start, (int)( next->start - cur->start ) );
pv->first_drop = 0;
@@
-446,7
+446,8
@@
static void SyncVideo( hb_work_object_t * w )
* Rewrite timestamps on subtitles that need it (on raw queue).
*/
if( subtitle->source == CC608SUB ||
* Rewrite timestamps on subtitles that need it (on raw queue).
*/
if( subtitle->source == CC608SUB ||
- subtitle->source == CC708SUB )
+ subtitle->source == CC708SUB ||
+ subtitle->source == SRTSUB )
{
/*
* Rewrite timestamps on subtitles that came from Closed Captions
{
/*
* Rewrite timestamps on subtitles that came from Closed Captions
@@
-482,8
+483,6
@@
static void SyncVideo( hb_work_object_t * w )
*/
if( sub->start < cur->start )
{
*/
if( sub->start < cur->start )
{
- uint64_t duration;
- duration = sub->stop - sub->start;
sub = hb_fifo_get( subtitle->fifo_raw );
hb_fifo_push( subtitle->fifo_out, sub );
} else {
sub = hb_fifo_get( subtitle->fifo_raw );
hb_fifo_push( subtitle->fifo_out, sub );
} else {
@@
-663,16
+662,8
@@
static void SyncVideo( hb_work_object_t * w )
} else {
/*
* Pass-Through, pop it off of the raw queue,
} else {
/*
* Pass-Through, pop it off of the raw queue,
- * rewrite times and make it available to be
- * reencoded.
*/
*/
- uint64_t sub_duration;
sub = hb_fifo_get( subtitle->fifo_raw );
sub = hb_fifo_get( subtitle->fifo_raw );
- sub_duration = sub->stop - sub->start;
- sub->start = cur->start;
- buf_tmp = hb_fifo_see( job->fifo_raw );
- int64_t duration = buf_tmp->start - cur->start;
- sub->stop = sub->start + duration;
hb_fifo_push( subtitle->fifo_sync, sub );
}
} else {
hb_fifo_push( subtitle->fifo_sync, sub );
}
} else {
@@
-713,7
+704,7
@@
static void SyncVideo( hb_work_object_t * w )
pts_skip = 0;
if ( duration <= 0 )
{
pts_skip = 0;
if ( duration <= 0 )
{
- hb_log( "sync: invalid video duration %
lld, start %lld, next %lld
",
+ hb_log( "sync: invalid video duration %
"PRId64", start %"PRId64", next %"PRId64"
",
duration, buf_tmp->start, next->start );
}
duration, buf_tmp->start, next->start );
}
@@
-878,7
+869,7
@@
static void SyncAudio( hb_work_object_t * w, int i )
{
// we were dropping old data but input buf time is now current
hb_log( "sync: audio %d time went backwards %d ms, dropped %d frames "
{
// we were dropping old data but input buf time is now current
hb_log( "sync: audio %d time went backwards %d ms, dropped %d frames "
- "(next %
lld, current %lld
)", i,
+ "(next %
"PRId64", current %"PRId64"
)", i,
(int)( sync->next_pts - sync->first_drop ) / 90,
sync->drop_count, sync->first_drop, sync->next_pts );
sync->first_drop = 0;
(int)( sync->next_pts - sync->first_drop ) / 90,
sync->drop_count, sync->first_drop, sync->next_pts );
sync->first_drop = 0;
@@
-893,7
+884,7
@@
static void SyncAudio( hb_work_object_t * w, int i )
// frame and this. assume we got a corrupted timestamp
// and just drop the next buf.
hb_log( "sync: %d minute time gap in audio %d - dropping buf"
// frame and this. assume we got a corrupted timestamp
// and just drop the next buf.
hb_log( "sync: %d minute time gap in audio %d - dropping buf"
- " start %
lld, next %lld"
,
+ " start %
"PRId64", next %"PRId64
,
(int)((start - sync->next_pts) / (90000*60)),
i, start, sync->next_pts );
buf = hb_fifo_get( audio->priv.fifo_raw );
(int)((start - sync->next_pts) / (90000*60)),
i, start, sync->next_pts );
buf = hb_fifo_get( audio->priv.fifo_raw );
@@
-909,7
+900,7
@@
static void SyncAudio( hb_work_object_t * w, int i )
if( sync->audio->config.out.codec == HB_ACODEC_DCA )
{
hb_log( "sync: audio gap %d ms. Skipping frames. Audio %d"
if( sync->audio->config.out.codec == HB_ACODEC_DCA )
{
hb_log( "sync: audio gap %d ms. Skipping frames. Audio %d"
- " start %
lld, next %lld"
,
+ " start %
"PRId64", next %"PRId64
,
(int)((start - sync->next_pts) / 90),
i, start, sync->next_pts );
pv->audio_passthru_slip += (start - sync->next_pts);
(int)((start - sync->next_pts) / 90),
i, start, sync->next_pts );
pv->audio_passthru_slip += (start - sync->next_pts);
@@
-917,7
+908,7
@@
static void SyncAudio( hb_work_object_t * w, int i )
return;
}
hb_log( "sync: adding %d ms of silence to audio %d"
return;
}
hb_log( "sync: adding %d ms of silence to audio %d"
- " start %
lld, next %lld"
,
+ " start %
"PRId64", next %"PRId64
,
(int)((start - sync->next_pts) / 90),
i, start, sync->next_pts );
InsertSilence( w, i, start - sync->next_pts );
(int)((start - sync->next_pts) / 90),
i, start, sync->next_pts );
InsertSilence( w, i, start - sync->next_pts );
@@
-982,6
+973,8
@@
static void UpdateState( hb_work_object_t * w )
if( !pv->count_frames )
{
pv->st_first = hb_get_date();
if( !pv->count_frames )
{
pv->st_first = hb_get_date();
+ pv->job->st_pause_date = -1;
+ pv->job->st_paused = 0;
}
pv->count_frames++;
}
pv->count_frames++;
@@
-1009,7
+1002,7
@@
static void UpdateState( hb_work_object_t * w )
{
int eta;
p.rate_avg = 1000.0 * (float) pv->st_counts[3] /
{
int eta;
p.rate_avg = 1000.0 * (float) pv->st_counts[3] /
- (float) ( pv->st_dates[3] - pv->st_first );
+ (float) ( pv->st_dates[3] - pv->st_first
- pv->job->st_paused
);
eta = (float) ( pv->count_frames_max - pv->st_counts[3] ) /
p.rate_avg;
p.hours = eta / 3600;
eta = (float) ( pv->count_frames_max - pv->st_counts[3] ) /
p.rate_avg;
p.hours = eta / 3600;