diff options
| author | titer <[email protected]> | 2006-04-17 18:50:02 +0000 |
|---|---|---|
| committer | titer <[email protected]> | 2006-04-17 18:50:02 +0000 |
| commit | b30c3a727aa539f10adeae2220b4aa48e0b18feb (patch) | |
| tree | eefa942e442271517817b3dcc3e9172e659fe4e0 /macosx/ExpressController.m | |
| parent | 82485cc9d132e1c284c9bd16dd8acd0094d42946 (diff) | |
Merge from avformat branch
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@60 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/ExpressController.m')
| -rw-r--r-- | macosx/ExpressController.m | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/macosx/ExpressController.m b/macosx/ExpressController.m index b78bdf8b5..2ffddf56e 100644 --- a/macosx/ExpressController.m +++ b/macosx/ExpressController.m @@ -200,27 +200,43 @@ hb_job_t * job = title->job; int pixels, aspect; - if( [fConvertFormatPopUp indexOfSelectedItem] ) + if( [fConvertFormatPopUp indexOfSelectedItem] == 0 ) { + /* iPod / H.264 */ + job->mux = HB_MUX_MP4; + job->vcodec = HB_VCODEC_X264; + job->h264_13 = 1; + job->vbitrate = 600; + pixels = 76800; + aspect = 4 * HB_ASPECT_BASE / 3; + } + else if( [fConvertFormatPopUp indexOfSelectedItem] == 1 ) + { + /* iPod / MPEG-4 */ + job->mux = HB_MUX_MP4; job->vcodec = HB_VCODEC_FFMPEG; job->vbitrate = 1200; pixels = 230400; + aspect = 4 * HB_ASPECT_BASE / 3; } else { - job->vcodec = HB_VCODEC_X264; - job->h264_13 = 1; - job->vbitrate = 600; - pixels = 76800; + /* PSP / MPEG-4 */ + job->mux = HB_MUX_PSP; + job->vrate = 27000000; + job->vrate_base = 900900; /* 29.97 fps */ + job->vcodec = HB_VCODEC_FFMPEG; + job->vbitrate = 600; + pixels = 76800; + job->arate = 24000; + job->abitrate = 96; + aspect = 16 * HB_ASPECT_BASE / 9; + } if( [fConvertAspectPopUp indexOfSelectedItem] ) { aspect = -1; } - else - { - aspect = 4 * HB_ASPECT_BASE / 3; - } hb_set_size( job, aspect, pixels ); |