diff options
| author | Rodeo <[email protected]> | 2015-02-15 18:46:26 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2015-02-15 18:46:26 +0000 |
| commit | 56586d73ed29fe64187c9083a84da4146db65bcc (patch) | |
| tree | fa04e19eb87acf9a964a6c1ff33a23e21a4ac6df | |
| parent | c721fa4582108285a8399348ad098fc4e0a766ae (diff) | |
H.265: don't allow requesting Main 10 profile.
This is pointless since we only do 8-bit encoding for now.
Also add a few extra tables for future use.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6904 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/common.c | 6 | ||||
| -rw-r--r-- | libhb/encx265.c | 1 | ||||
| -rw-r--r-- | libhb/h265_common.h | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/libhb/common.c b/libhb/common.c index 9db9e7462..3476dbf7a 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -17,6 +17,7 @@ #include "lang.h" #include "common.h" #include "h264_common.h" +#include "h265_common.h" #ifdef USE_QSV #include "qsv_common.h" #endif @@ -1210,10 +1211,9 @@ const char* const* hb_video_encoder_get_profiles(int encoder) case HB_VCODEC_X264: return hb_h264_profile_names; -#ifdef USE_X265 case HB_VCODEC_X265: - return x265_profile_names; -#endif + return hb_h265_profile_names; + default: return NULL; } diff --git a/libhb/encx265.c b/libhb/encx265.c index 3d6aabee7..4e1e3e2c4 100644 --- a/libhb/encx265.c +++ b/libhb/encx265.c @@ -10,6 +10,7 @@ #include "hb.h" #include "hb_dict.h" +#include "h265_common.h" #include "x265.h" int encx265Init (hb_work_object_t*, hb_job_t*); diff --git a/libhb/h265_common.h b/libhb/h265_common.h new file mode 100644 index 000000000..cc1b38708 --- /dev/null +++ b/libhb/h265_common.h @@ -0,0 +1,25 @@ +/* h265_common.h + + Copyright (c) 2003-2015 HandBrake Team + This file is part of the HandBrake source code + Homepage: <http://handbrake.fr/>. + It may be used under the terms of the GNU General Public License v2. + For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html + */ + +#ifndef HB_H265_COMMON_H +#define HB_H265_COMMON_H + +static const char * const hb_h265_tier_names[] = { "auto", "main", "high", NULL, }; +static const char * const hb_h265_profile_names[] = { "auto", "main", "mainstillpicture", NULL, }; +static const char * const hb_h265_level_names[] = { "auto", "1.0", "2.0", "2.1", "3.0", "3.1", "4.0", "4.1", "5.0", "5.1", "5.2", "6.0", "6.1", "6.2", NULL, }; +static const int const hb_h265_level_values[] = { -1, 30, 60, 63, 90, 93, 120, 123, 150, 153, 156, 180, 183, 186, 0, }; + +// stolen from libx265's x265.h +static const char * const hb_h265_fullrange_names[] = { "limited", "full", NULL, }; +static const char * const hb_h265_vidformat_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", NULL, }; +static const char * const hb_h265_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", NULL, }; +static const char * const hb_h265_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12", NULL, }; +static const char * const hb_h265_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", "YCgCo", "bt2020nc", "bt2020c", NULL, }; + +#endif //HB_H265_COMMON_H |