From 86283bee130ad89990104b1cdb6a12e2377691fa Mon Sep 17 00:00:00 2001 From: Rodeo Date: Fri, 28 Mar 2014 22:23:59 +0000 Subject: CLI: clean up encoder preset/tune/profile/level option names The new generic option names are: --encoder-preset --encoder-tune --encoder-profile --encoder-level In addition, the supported values for these options can be listed via: --encoder-preset-list --encoder-tune-list --encoder-profile-list --encoder-level-list Existing encoder-specific option names are preserved so as not to break existing scripts, but only the new generic names are documented and supported. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6135 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/work.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'libhb') diff --git a/libhb/work.c b/libhb/work.c index c8dcb0c0b..d0a0f6cd3 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -311,16 +311,9 @@ void hb_display_job_info(hb_job_t *job) switch (job->vcodec) { case HB_VCODEC_X264: - hb_log(" + x264 preset: %s", job->encoder_preset); - break; case HB_VCODEC_X265: - hb_log(" + x265 preset: %s", job->encoder_preset); - break; -#ifdef USE_QSV case HB_VCODEC_QSV_H264: - hb_log(" + QSV preset: %s", job->encoder_preset); - break; -#endif + hb_log(" + preset: %s", job->encoder_preset); default: break; } @@ -330,11 +323,8 @@ void hb_display_job_info(hb_job_t *job) switch (job->vcodec) { case HB_VCODEC_X264: - hb_log(" + x264 tune: %s", job->encoder_tune); - break; case HB_VCODEC_X265: - hb_log(" + x265 tune: %s", job->encoder_tune); - break; + hb_log(" + tune: %s", job->encoder_tune); default: break; } @@ -349,12 +339,9 @@ void hb_display_job_info(hb_job_t *job) switch (job->vcodec) { case HB_VCODEC_X264: - case HB_VCODEC_QSV_H264: - hb_log(" + H.264 profile: %s", job->encoder_profile); - break; case HB_VCODEC_X265: - hb_log(" + H.265 profile: %s", job->encoder_profile); - break; + case HB_VCODEC_QSV_H264: + hb_log(" + profile: %s", job->encoder_profile); default: break; } @@ -365,8 +352,7 @@ void hb_display_job_info(hb_job_t *job) { case HB_VCODEC_X264: case HB_VCODEC_QSV_H264: - hb_log(" + H.264 level: %s", job->encoder_level); - break; + hb_log(" + level: %s", job->encoder_level); default: break; } -- cgit v1.2.3