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
1ceeee9
..
94b8411
100644
(file)
--- a/
libhb/sync.c
+++ b/
libhb/sync.c
@@
-483,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 {
@@
-664,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 {
@@
-983,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++;
@@
-1010,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;