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/dvdnav.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/dvdnav.c')
| -rw-r--r-- | libhb/dvdnav.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c index 1de7444af..52d062b06 100644 --- a/libhb/dvdnav.c +++ b/libhb/dvdnav.c @@ -553,17 +553,19 @@ static hb_title_t * hb_dvdnav_title_scan( hb_dvd_t * e, int t, uint64_t min_dura audio->config.lang.type = lang_extension; - lang = lang_for_code( ifo->vtsi_mat->vts_audio_attr[i].lang_code ); + lang = lang_for_code( lang_code ); - snprintf( audio->config.lang.description, sizeof( audio->config.lang.description ), "%s (%s)", + snprintf( audio->config.lang.description, + sizeof( audio->config.lang.description ), "%s (%s)", strlen(lang->native_name) ? lang->native_name : lang->eng_name, - audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : ( audio->config.in.codec == - HB_ACODEC_DCA ? "DTS" : ( audio->config.in.codec == - HB_ACODEC_FFMPEG ? "MPEG" : "LPCM" ) ) ); - snprintf( audio->config.lang.simple, sizeof( audio->config.lang.simple ), "%s", + audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : + ( audio->config.in.codec == HB_ACODEC_DCA ? "DTS" : + ( audio->config.in.codec == HB_ACODEC_FFMPEG ? "MPEG" : "LPCM" ) ) ); + snprintf( audio->config.lang.simple, + sizeof( audio->config.lang.simple ), "%s", strlen(lang->native_name) ? lang->native_name : lang->eng_name ); - snprintf( audio->config.lang.iso639_2, sizeof( audio->config.lang.iso639_2 ), "%s", - lang->iso639_2); + snprintf( audio->config.lang.iso639_2, + sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2); switch( lang_extension ) { @@ -1621,7 +1623,7 @@ static hb_buffer_t * hb_dvdnav_read( hb_dvd_t * e ) // The muxers expect to only get chapter 2 and above // They write chapter 1 when chapter 2 is detected. if (chapter > 1) - b->new_chap = chapter; + b->s.new_chap = chapter; chapter = 0; error_count = 0; return b; @@ -1762,7 +1764,7 @@ static hb_buffer_t * hb_dvdnav_read( hb_dvd_t * e ) // The muxers expect to only get chapter 2 and above // They write chapter 1 when chapter 2 is detected. if (chapter > 1) - b->new_chap = chapter; + b->s.new_chap = chapter; chapter = 0; return b; |