summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2017-07-12 15:16:18 -0700
committerJohn Stebbins <[email protected]>2017-07-12 15:16:18 -0700
commitf440d254eb2d9074e777fa6838a7bef8e681cbf0 (patch)
treeb11631f351506a987806f17fb661e41a8fb4e3ae
parent03fd75b764d068e54c3c9704157b58eb6bf8b46b (diff)
alignment cosmetics
-rw-r--r--libhb/h264_common.h33
-rw-r--r--libhb/h265_common.h45
2 files changed, 56 insertions, 22 deletions
diff --git a/libhb/h264_common.h b/libhb/h264_common.h
index f237ef7e7..09db213f3 100644
--- a/libhb/h264_common.h
+++ b/libhb/h264_common.h
@@ -10,16 +10,31 @@
#ifndef HB_H264_COMMON_H
#define HB_H264_COMMON_H
-static const char * const hb_h264_profile_names_8bit[] = { "auto", "high", "main", "baseline", NULL, };
-static const char * const hb_h264_profile_names_10bit[] = { "auto", "high10", NULL, };
-static const char * const hb_h264_level_names[] = { "auto", "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", NULL, };
-static const int hb_h264_level_values[] = { -1, 10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 52, 0, };
+static const char * const hb_h264_profile_names_8bit[] = {
+ "auto", "high", "main", "baseline", NULL, };
+static const char * const hb_h264_profile_names_10bit[] = {
+ "auto", "high10", NULL, };
+static const char * const hb_h264_level_names[] = {
+ "auto", "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0",
+ "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", NULL, };
+static const int hb_h264_level_values[] = {
+ -1, 10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32,
+ 40, 41, 42, 50, 51, 52, 0, };
// stolen from libx264's x264.h
-static const char * const hb_h264_fullrange_names[] = { "off", "on", NULL, };
-static const char * const hb_h264_vidformat_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", NULL, };
-static const char * const hb_h264_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", NULL, };
-static const char * const hb_h264_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_h264_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", "YCgCo", "bt2020nc", "bt2020c", NULL, };
+static const char * const hb_h264_fullrange_names[] = {
+ "off", "on", NULL, };
+static const char * const hb_h264_vidformat_names[] = {
+ "component", "pal", "ntsc", "secam", "mac", "undef", NULL, };
+static const char * const hb_h264_colorprim_names[] = {
+ "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m",
+ "smpte240m", "film", "bt2020", NULL, };
+static const char * const hb_h264_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_h264_colmatrix_names[] = {
+ "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m",
+ "smpte240m", "YCgCo", "bt2020nc", "bt2020c", NULL, };
#endif //HB_H264_COMMON_H
diff --git a/libhb/h265_common.h b/libhb/h265_common.h
index aa4736497..ef156da42 100644
--- a/libhb/h265_common.h
+++ b/libhb/h265_common.h
@@ -14,22 +14,41 @@
// in HEVC, all "random access point" NAL units are keyframes
#define HB_HEVC_NALU_KEYFRAME(nal_unit_type) (((nal_unit_type) >= 16) && ((nal_unit_type) <= 23))
-static const char * const hb_h265_tier_names[] = { "auto", "main", "high", NULL, };
-static const char * const hb_h265_profile_names_8bit[] = { "auto", "main", "mainstillpicture", NULL, };
-static const char * const hb_h265_profile_names_10bit[] = { "auto", "main10", "main10-intra", NULL, };
+static const char * const hb_h265_tier_names[] = {
+ "auto", "main", "high", NULL, };
+static const char * const hb_h265_profile_names_8bit[] = {
+ "auto", "main", "mainstillpicture", NULL, };
+static const char * const hb_h265_profile_names_10bit[] = {
+ "auto", "main10", "main10-intra", NULL, };
#ifdef USE_QSV
-static const char * const hb_h265_qsv_profile_names_10bit[] = { "auto", "main10", NULL, };
+static const char * const hb_h265_qsv_profile_names_10bit[] = {
+ "auto", "main10", NULL, };
#endif
-static const char * const hb_h265_profile_names_12bit[] = { "auto", "main12", "main12-intra", NULL, };
-static const char * const hb_h265_profile_names_16bit[] = { "auto", "main16", "main16-intra", 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 hb_h265_level_values[] = { -1, 30, 60, 63, 90, 93, 120, 123, 150, 153, 156, 180, 183, 186, 0, };
+static const char * const hb_h265_profile_names_12bit[] = {
+ "auto", "main12", "main12-intra", NULL, };
+static const char * const hb_h265_profile_names_16bit[] = {
+ "auto", "main16", "main16-intra", 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 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, };
+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