Support 400 10 profile (#87)

* intermediate code

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

* fixed code for 400-10 profile

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_enc.c

@@ -113,7 +113,7 @@ static const args_opt_t enc_args_opts[] = {
     },
     {
         ARGS_NO_KEY,  "profile", ARGS_VAL_TYPE_STRING, 0, NULL,
-        "profile setting flag  (422-10)"
+        "profile string (422-10, 400-10)"
     },
     {
         ARGS_NO_KEY,  "level", ARGS_VAL_TYPE_STRING, 0, NULL,

app/oapv_app_y4m.h

@@ -66,23 +66,19 @@ static int y4m_parse_tags(y4m_params_t *y4m, char *tags)
 
     char *p;
     char *q;
-    char  t_buff[20];
+    char  colorspace[20];
     int   found_w = 0, found_h = 0, found_cf = 0;
     int   fps_n, fps_d, pix_ratio_n, pix_ratio_d;
 
     for(p = tags;; p = q) {
-
         /*Skip any leading spaces.*/
-        while(*p == ' ')
-            p++;
+        while(*p == ' ')  p++;
 
         /*If that's all we have, stop.*/
-        if(p[0] == '\0')
-            break;
+        if(p[0] == '\0')  break;
 
         /*Find the end of this tag.*/
-        for(q = p + 1; *q != '\0' && *q != ' '; q++) {
-        }
+        for(q = p + 1; *q != '\0' && *q != ' '; q++) { }
 
         /*Process the tag.*/
         switch(p[0]) {
@@ -117,8 +113,8 @@ static int y4m_parse_tags(y4m_params_t *y4m, char *tags)
         case 'C': {
             if(q - p > 16)
                 return OAPV_ERR;
-            memcpy(t_buff, p + 1, q - p - 1);
-            t_buff[q - p - 1] = '\0';
+            memcpy(colorspace, p + 1, q - p - 1);
+            colorspace[q - p - 1] = '\0';
             found_cf = 1;
             break;
         }
@@ -130,41 +126,45 @@ static int y4m_parse_tags(y4m_params_t *y4m, char *tags)
         logerr("Mandatory arugments are not found in y4m header");
         return OAPV_ERR;
     }
-    /* Setting default colorspace to yuv420 and input_bd to 8 if header info. is NA */
+
     if(!found_cf) {
         y4m->color_format = OAPV_CF_YCBCR420;
         y4m->bit_depth = 8;
     }
 
-    if(strcmp(t_buff, "420jpeg") == 0 || strcmp(t_buff, "420") == 0 ||
-       strcmp(t_buff, "420mpeg2") == 0 || strcmp(t_buff, "420paidv") == 0) {
+    if(strcmp(colorspace, "420jpeg") == 0 || strcmp(colorspace, "420") == 0 ||
+       strcmp(colorspace, "420mpeg2") == 0 || strcmp(colorspace, "420paidv") == 0) {
         y4m->color_format = OAPV_CF_YCBCR420;
         y4m->bit_depth = 8;
     }
-    else if(strcmp(t_buff, "422") == 0) {
+    else if(strcmp(colorspace, "422") == 0) {
         y4m->color_format = OAPV_CF_YCBCR422;
         y4m->bit_depth = 8;
     }
-    else if(strcmp(t_buff, "444") == 0) {
+    else if(strcmp(colorspace, "444") == 0) {
         y4m->color_format = OAPV_CF_YCBCR444;
         y4m->bit_depth = 8;
     }
-    else if(strcmp(t_buff, "420p10") == 0) {
+    else if(strcmp(colorspace, "420p10") == 0) {
         y4m->color_format = OAPV_CF_YCBCR420;
         y4m->bit_depth = 10;
     }
-    else if(strcmp(t_buff, "422p10") == 0) {
+    else if(strcmp(colorspace, "422p10") == 0) {
         y4m->color_format = OAPV_CF_YCBCR422;
         y4m->bit_depth = 10;
     }
-    else if(strcmp(t_buff, "444p10") == 0) {
+    else if(strcmp(colorspace, "444p10") == 0) {
         y4m->color_format = OAPV_CF_YCBCR444;
         y4m->bit_depth = 10;
     }
-    else if(strcmp(t_buff, "mono") == 0) {
+    else if(strcmp(colorspace, "mono") == 0) {
         y4m->color_format = OAPV_CF_YCBCR400;
         y4m->bit_depth = 8;
     }
+    else if(strcmp(colorspace, "mono10") == 0) {
+        y4m->color_format = OAPV_CF_YCBCR400;
+        y4m->bit_depth = 10;
+    }
     else {
         y4m->color_format = OAPV_CF_UNKNOWN;
         y4m->bit_depth = -1;
@@ -255,10 +255,12 @@ static int write_y4m_header(char *fname, oapv_imgb_t *imgb)
     else if(color_format == OAPV_CF_YCBCR400) {
         if(bit_depth == 8)
             strcpy(c_buf, "mono");
+        else if(bit_depth == 10)
+            strcpy(c_buf, "mono10");
     }
 
     if(strlen(c_buf) == 0) {
-        logerr("Color format is not suuported by y4m");
+        logerr("Color format is not suuported by y4m\n");
         return -1;
     }
 

inc/oapv.h

@@ -197,6 +197,7 @@ extern "C" {
  * profiles
  *****************************************************************************/
 #define OAPV_PROFILE_422_10             (33)
+#define OAPV_PROFILE_400_10             (99)
 
 /*****************************************************************************
  * optimization level control
@@ -393,7 +394,8 @@ struct oapv_dict_str_int {
 };
 
 static const oapv_dict_str_int_t oapv_param_opts_profile[] = {
-    {"422-10",  OAPV_PROFILE_422_10},
+    {"422-10", OAPV_PROFILE_422_10},
+    {"400-10", OAPV_PROFILE_400_10},
     {"", 0} // termination
 };
 
@@ -532,7 +534,6 @@ struct oapve_param {
     int           full_range_flag;
 };
 
-#define OAPV_CDESC_THREADS_AUTO          0
 /*****************************************************************************
  * automatic assignment of number of threads in creation of encoder & decoder
  *****************************************************************************/

src/oapv.c

@@ -1318,7 +1318,7 @@ int oapve_encode(oapve_t eid, oapv_frms_t *ifrms, oapvm_t mid, oapv_bitb_t *bitb
         ret = enc_read_param(ctx, ctx->param);
         oapv_assert_rv(ret == OAPV_OK, ret);
 
-        oapv_assert_rv(ctx->param->profile_idc == OAPV_PROFILE_422_10, OAPV_ERR_UNSUPPORTED);
+        oapv_assert_rv(ctx->param->profile_idc == OAPV_PROFILE_422_10 || ctx->param->profile_idc == OAPV_PROFILE_400_10, OAPV_ERR_UNSUPPORTED);
 
         // prepare for encoding a frame
         ret = enc_frm_prepare(ctx, frm->imgb, (rfrms != NULL) ? rfrms->frm[i].imgb : NULL);