initial code to support 444-12 and 4444-12 (#127)

* initial code to support 444-12 and 4444-12

Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com>

* fixed missing profile spec

Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com>

---------

Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com>

Author: kpchoi

app/oapv_app_dec.c

@@ -319,7 +319,9 @@ static void print_stat_frm(oapvd_stat_t *stat, oapv_frms_t *frms, oapvm_t mid, a
                              : finfo[i].cs == OAPV_CS_YCBCR422_10LE ? "4:2:2-10"
                              : finfo[i].cs == OAPV_CS_YCBCR422_12LE ? "4:2:2-12"
                              : finfo[i].cs == OAPV_CS_YCBCR444_10LE ? "4:4:4-10"
+                             : finfo[i].cs == OAPV_CS_YCBCR444_12LE ? "4:4:4-12"
                              : finfo[i].cs == OAPV_CS_YCBCR4444_10LE ? "4:4:4:4-10"
+                             : finfo[i].cs == OAPV_CS_YCBCR4444_12LE ? "4:4:4:4-12"
                              : "unknown-cs";
 
         // clang-format on

app/oapv_app_enc.c

@@ -127,6 +127,10 @@ static const args_opt_t enc_args_opts[] = {
         "profile string\n"
         "      - 422-10: YCbCr422 10bit (default)\n"
         "      - 422-12; YCbCr422 12bit\n"
+        "      - 444-10: YCbCr444 10bit\n"
+        "      - 444-12; YCbCr444 12bit\n"
+        "      - 4444-10: YCbCr4444 10bit\n"
+        "      - 4444-12; YCbCr4444 12bit\n"
         "      - 400-10: YCbCr400 (monochrome) 10bit\n"
         "      Note: Color space and bit depth of input video will be converted\n"
         "            automatically to support the given profile, if needs\n"
@@ -890,8 +894,10 @@ int main(int argc, const char **argv)
     int codec_depth = (param->profile_idc == OAPV_PROFILE_422_10 ||
         param->profile_idc == OAPV_PROFILE_400_10 ||
         param->profile_idc == OAPV_PROFILE_444_10 ||
-        param->profile_idc == OAPV_PROFILE_4444_10) ? 10 :
-        (param->profile_idc == OAPV_PROFILE_422_12) ? 12 : 0;
+        param->profile_idc == OAPV_PROFILE_4444_10) ? 10 : (
+        param->profile_idc == OAPV_PROFILE_422_12 ||
+        param->profile_idc == OAPV_PROFILE_444_12 ||
+        param->profile_idc == OAPV_PROFILE_4444_12) ? 12 : 0;
 
     if (codec_depth == 0) {
         logerr("ERR: invalid profile\n");
@@ -964,6 +970,11 @@ int main(int argc, const char **argv)
             clk_end = oapv_clk_from(clk_beg);
             clk_tot += clk_end;
 
+            if(OAPV_FAILED(ret)) {
+                logerr("ERR: failed to encode (return: %d)\n", ret);
+                goto ERR;
+            }
+
             bitrate_tot += stat.frm_size[FRM_IDX];
 
             print_stat_au(&stat, au_cnt, param, args_var->max_au, bitrate_tot, clk_end, clk_tot);
@@ -1053,7 +1064,7 @@ int main(int argc, const char **argv)
     bitrate_tot /= au_cnt;
     bitrate_tot /= 1000;
 
-    
+
     if (cfmt == OAPV_CF_YCBCR400) { // 1-channel
         logv3("  -----------------: bitrate(kbps)\tPSNR-Y\n");
         logv3("  Summary          : %-4.4f\t%-5.4f\n",

app/oapv_app_y4m.h

@@ -161,6 +161,10 @@ static int y4m_parse_tags(y4m_params_t *y4m, char *tags)
         y4m->color_format = OAPV_CF_YCBCR444;
         y4m->bit_depth = 10;
     }
+    else if(strcmp(colorspace, "444p12") == 0) {
+        y4m->color_format = OAPV_CF_YCBCR444;
+        y4m->bit_depth = 12;
+    }
     else if(strcmp(colorspace, "mono") == 0) {
         y4m->color_format = OAPV_CF_YCBCR400;
         y4m->bit_depth = 8;
@@ -257,6 +261,8 @@ static int write_y4m_header(char *fname, oapv_imgb_t *imgb)
             strcpy(c_buf, "444");
         else if(bit_depth == 10)
             strcpy(c_buf, "444p10");
+        else if(bit_depth == 12)
+            strcpy(c_buf, "444p12");
     }
     else if(color_format == OAPV_CF_YCBCR400) {
         if(bit_depth == 8)

inc/oapv.h

@@ -236,7 +236,9 @@ extern "C" {
 #define OAPV_PROFILE_422_10             (33)
 #define OAPV_PROFILE_422_12             (44)
 #define OAPV_PROFILE_444_10             (55)
+#define OAPV_PROFILE_444_12             (66)
 #define OAPV_PROFILE_4444_10            (77)
+#define OAPV_PROFILE_4444_12            (88)
 #define OAPV_PROFILE_400_10             (99)
 
 /*****************************************************************************
@@ -445,7 +447,9 @@ static const oapv_dict_str_int_t oapv_param_opts_profile[] = {
     {"422-10", OAPV_PROFILE_422_10},
     {"422-12", OAPV_PROFILE_422_12},
     {"444-10", OAPV_PROFILE_444_10},
+    {"444-12", OAPV_PROFILE_444_12},
     {"4444-10", OAPV_PROFILE_4444_10},
+    {"4444-12", OAPV_PROFILE_4444_12},
     {"400-10", OAPV_PROFILE_400_10},
     {"", 0} // termination
 };

src/oapv.c

@@ -963,7 +963,9 @@ static int enc_profile_spec[][5] = {
     {OAPV_PROFILE_422_10, 2, 2, 10, 10},
     {OAPV_PROFILE_422_12, 2, 2, 10, 12},
     {OAPV_PROFILE_444_10, 2, 3, 10, 10},
+    {OAPV_PROFILE_444_12, 2, 3, 10, 12},
     {OAPV_PROFILE_4444_10, 2, 4, 10, 10},
+    {OAPV_PROFILE_4444_12, 2, 4, 10, 12},
     {OAPV_PROFILE_400_10, 0, 0, 10, 10},
     {0, 0, 0, 0, 0} // termination
 };