diff options
| author | Robert Swain <robert.swain@collabora.co.uk> | 2010-07-21 17:24:33 +0200 |
|---|---|---|
| committer | Robert Swain <robert.swain@collabora.co.uk> | 2010-07-26 14:29:02 +0200 |
| commit | 60d647dcf520e7c8c46acde8344c89bb20a47f8c (patch) | |
| tree | c0b378319dfb209cf6f201fd9710af1e7abb87ff /ext | |
| parent | 30fff25b68a877d4c94bfcb5fabc0355c5d5c81e (diff) | |
x264enc: Improve x264enc defaults
- medium x264 speed/quality preset
- threads defaults to 0 which automatically uses 1.5x number of cpu cores
Addresses part of bug #607798
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/x264/gstx264enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 1f1bb459..dba17a0d 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -37,9 +37,9 @@ * If #GstX264Enc:dct8x8 is enabled, then High profile is used. * Otherwise, if #GstX264Enc:cabac entropy coding is enabled or #GstX264Enc:bframes * are allowed, then Main Profile is in effect, and otherwise Baseline profile - * applies. As such, Main is presently the default profile, which is fine for - * most players and settings, but in some cases (e.g. hardware platforms) - * a more restricted profile/level may be necessary. + * applies. No profile is imposed by default, which is fine for most software + * players and settings, but in some cases (e.g. hardware platforms) a more + * restricted profile/level may be necessary. * * If a preset/tuning are specified then these will define the default values and * the property defaults will be ignored. After this the option-string property is @@ -145,7 +145,7 @@ enum ARG_TUNE, }; -#define ARG_THREADS_DEFAULT 1 +#define ARG_THREADS_DEFAULT 0 /* 0 means 'auto' which is 1.5x number of CPU cores */ #define ARG_PASS_DEFAULT 0 #define ARG_QUANTIZER_DEFAULT 21 #define ARG_MULTIPASS_CACHE_FILE_DEFAULT "x264.log" @@ -179,10 +179,10 @@ enum #define ARG_RC_MB_TREE_DEFAULT TRUE #define ARG_RC_LOOKAHEAD_DEFAULT 40 #define ARG_INTRA_REFRESH_DEFAULT FALSE -#define ARG_PROFILE_DEFAULT 1 /* Main profile matches current defaults */ +#define ARG_PROFILE_DEFAULT 2 /* 'Main Profile' - matches profile of property defaults */ #define ARG_OPTION_STRING_DEFAULT "" static GString *x264enc_defaults; -#define ARG_SPEED_PRESET_DEFAULT 0 /* no preset */ +#define ARG_SPEED_PRESET_DEFAULT 6 /* 'medium' preset - matches x264 CLI default */ #define ARG_PSY_TUNE_DEFAULT 0 /* no psy tuning */ #define ARG_TUNE_DEFAULT 0 /* no tuning */ |