diff options
| author | jstebbins <[email protected]> | 2012-03-27 20:11:26 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2012-03-27 20:11:26 +0000 |
| commit | 45b8f81a2e184e2b7deaf47afc49483766191a27 (patch) | |
| tree | 30ed0892995cb4ad3255909f69269c453000800a /libhb/muxcommon.c | |
| parent | 7eb7737023be00fa0dc9be75a4984b80c0e5ce57 (diff) | |
Rework filter pipeline
This patch enhances the filter objects. The 2 key improvements are:
1. A filter can change the image dimensions as frames pass through it.
2. A filter can output more than one frame.
In addition, I have:
Moved cropping & scalling into a filter object
Added 90 degree rotation to the rotate filter
Moved subtitle burn-in rendering to a filter object.
Moved VFR/CFR handling into a framerate shaping filter object.
Removed render.c since all it's responsibilities got moved to filters.
Improves VOBSUB and SSA subtitle handling. Allows subtitle animations.
SSA karaoke support.
My apologies in advance if anything breaks ;)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4546 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxcommon.c')
| -rw-r--r-- | libhb/muxcommon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c index 39f56dc6b..ffb7aa35e 100644 --- a/libhb/muxcommon.c +++ b/libhb/muxcommon.c @@ -188,7 +188,7 @@ static void MoveToInternalFifos( int tk, hb_mux_t *mux, hb_buffer_t * buf ) // (b) we can control how data from multiple tracks is // interleaved in the output file. mf_push( mux, tk, buf ); - if ( buf->stop >= mux->pts ) + if ( buf->s.stop >= mux->pts ) { // buffer is past our next interleave point so // note that this track is ready to be output. @@ -201,7 +201,7 @@ static void OutputTrackChunk( hb_mux_t *mux, int tk, hb_mux_object_t *m ) hb_track_t *track = mux->track[tk]; hb_buffer_t *buf; - while ( ( buf = mf_peek( track ) ) != NULL && buf->start < mux->pts ) + while ( ( buf = mf_peek( track ) ) != NULL && buf->s.start < mux->pts ) { buf = mf_pull( mux, tk ); track->frames += 1; @@ -276,7 +276,7 @@ static int muxWork( hb_work_object_t * w, hb_buffer_t ** buf_in, // Otherwise clear rdy. if ( ( mux->eof & (1 << i) ) == 0 && ( track->mf.out == track->mf.in || - track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->stop + track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->s.stop < mux->pts + mux->interleave ) ) { mux->rdy &=~ ( 1 << i ); |