diff options
author | Rodeo <[email protected]> | 2012-12-20 17:25:29 +0000 |
---|---|---|
committer | Rodeo <[email protected]> | 2012-12-20 17:25:29 +0000 |
commit | 4d39a8e8624b61124941636b6b05c15aeed31af6 (patch) | |
tree | 4e682059c4c30c5491bf7ca54d0e628e358e8c22 /libhb/encx264.c | |
parent | 20b2389e3096aef6ba3deb08806131675e7c4215 (diff) |
hb_apply_h264_level: cosmetics, change the meaning of the last parameter (be_quiet -> verbose). Seems more common.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5101 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/encx264.c')
-rw-r--r-- | libhb/encx264.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libhb/encx264.c b/libhb/encx264.c index abdc235c3..04c0be9a3 100644 --- a/libhb/encx264.c +++ b/libhb/encx264.c @@ -287,7 +287,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) if (job->h264_level != NULL && *job->h264_level) { if (hb_apply_h264_level(¶m, job->h264_level, - job->x264_profile, 0) < 0) + job->x264_profile, 1) < 0) { free(pv); pv = NULL; @@ -641,11 +641,11 @@ int hb_check_h264_level(const char *h264_level, int width, int height, param.i_fps_den = fps_den; param.b_interlaced = !!interlaced; param.b_fake_interlaced = !!fake_interlaced; - return (hb_apply_h264_level(¶m, h264_level, NULL, 1) != 0); + return (hb_apply_h264_level(¶m, h264_level, NULL, 0) != 0); } int hb_apply_h264_level(x264_param_t *param, const char *h264_level, - const char *x264_profile, int be_quiet) + const char *x264_profile, int verbose) { float f_framerate; const x264_level_t *x264_level = NULL; @@ -768,7 +768,7 @@ int hb_apply_h264_level(x264_param_t *param, const char *h264_level, if (x264_level->frame_only && (param->b_interlaced || param->b_fake_interlaced)) { - if (!be_quiet) + if (verbose) { hb_log("hb_apply_h264_level [warning]: interlaced flag not supported for level %s, disabling", h264_level); @@ -868,7 +868,7 @@ int hb_apply_h264_level(x264_param_t *param, const char *h264_level, */ if (x264_level->frame_size < i_mb_size) { - if (!be_quiet) + if (verbose) { hb_log("hb_apply_h264_level [warning]: frame size (%dx%d, %d macroblocks) too high for level %s (max. %d macroblocks)", i_mb_width * 16, i_mb_height * 16, i_mb_size, h264_level, @@ -878,7 +878,7 @@ int hb_apply_h264_level(x264_param_t *param, const char *h264_level, } else if (x264_level->mbps < i_mb_rate) { - if (!be_quiet) + if (verbose) { hb_log("hb_apply_h264_level [warning]: framerate (%.3f) too high for level %s at %dx%d (max. %.3f)", f_framerate, h264_level, param->i_width, param->i_height, @@ -893,7 +893,7 @@ int hb_apply_h264_level(x264_param_t *param, const char *h264_level, max_mb_side = sqrt(x264_level->frame_size * 8); if (i_mb_width > max_mb_side) { - if (!be_quiet) + if (verbose) { hb_log("hb_apply_h264_level [warning]: frame too wide (%d) for level %s (max. %d)", param->i_width, h264_level, max_mb_side * 16); @@ -902,7 +902,7 @@ int hb_apply_h264_level(x264_param_t *param, const char *h264_level, } if (i_mb_height > max_mb_side) { - if (!be_quiet) + if (verbose) { hb_log("hb_apply_h264_level [warning]: frame too tall (%d) for level %s (max. %d)", param->i_height, h264_level, max_mb_side * 16); @@ -988,7 +988,7 @@ char * hb_x264_param_unparse(const char *x264_preset, const char *x264_tune, param.i_width = width; param.i_height = height; // be quiet so at to not pollute GUI logs - hb_apply_h264_level(¶m, h264_level, x264_profile, 1); + hb_apply_h264_level(¶m, h264_level, x264_profile, 0); } /* |