Kp refactoring cleanup 20260508 (#206)

kpchoi · web-flow · commit 27d4d719c4bb · 2026-05-08T16:06:13.000+09:00
* fixed wrong return error value

Signed-off-by: kp5.choi@samsung.com &lt;kp5.choi@samsung.com&gt;

* refactor and fix typo

Signed-off-by: kp5.choi@samsung.com &lt;kp5.choi@samsung.com&gt;

---------

Signed-off-by: kp5.choi@samsung.com &lt;kp5.choi@samsung.com&gt;
diff --git a/app/oapv_app_enc.c b/app/oapv_app_enc.c
@@ -126,11 +126,11 @@ static const args_opt_t enc_args_opts[] = {
         ARGS_NO_KEY,  "profile", ARGS_VAL_TYPE_STRING, 0, NULL,
         "profile string\n"
         "      - 422-10: YCbCr422 10bit (default)\n"
-        "      - 422-12; YCbCr422 12bit\n"
+        "      - 422-12: YCbCr422 12bit\n"
         "      - 444-10: YCbCr444 10bit\n"
-        "      - 444-12; YCbCr444 12bit\n"
+        "      - 444-12: YCbCr444 12bit\n"
         "      - 4444-10: YCbCr4444 10bit\n"
-        "      - 4444-12; YCbCr4444 12bit\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"
@@ -485,7 +485,7 @@ static int check_conf(oapve_cdesc_t *cdesc, args_var_t *vars)
         }
         int p = get_val_from_key(oapv_param_opts_profile, vars->profile);
         if(p < 0) {
-            logerr("ERR: invalid profile (%s)\n", vars->family);
+            logerr("ERR: invalid profile (%s)\n", vars->profile);
             return -1;
         }
 
@@ -732,7 +732,7 @@ static int update_param(args_var_t *vars, oapve_param_t *param)
         }
         int kbps = family_to_bitrate(vars->family, param);
         if(kbps < 0) {
-            logerr("ERR: failed to get targe bitrate from family value\n");
+            logerr("ERR: failed to get target bitrate from family value\n");
             return -1;
         }
         sprintf(vars->bitrate, "%d", kbps);
@@ -781,7 +781,7 @@ static int parse_master_display(const char* data_string, oapvm_payload_mdcv_t *m
     // Check if sscanf successfully assigned all expected fields (10 numerical values).
     const int expected_fields = 10;
     if (assigned_fields != expected_fields) {
-        logerr("Parsing error: master diplay color volume information");
+        logerr("Parsing error: master display color volume information");
         return -1;
     }
     return 0; // Success
diff --git a/inc/oapv.h b/inc/oapv.h
@@ -315,7 +315,7 @@ struct oapv_imgb {
     int           h[OAPV_MAX_CC];
     /* X position of left top (in unit of pixel) */
     int           x[OAPV_MAX_CC];
-    /* Y postion of left top (in unit of pixel) */
+    /* Y position of left top (in unit of pixel) */
     int           y[OAPV_MAX_CC];
     /* buffer stride (in unit of byte) */
     int           s[OAPV_MAX_CC];
diff --git a/src/oapv.c b/src/oapv.c
@@ -36,7 +36,7 @@ static void imgb_pad(oapv_imgb_t *imgb, int aw, int ah, int comp_sft[N_C][2])
     int imgb_w = imgb->w[0];
     int imgb_h = imgb->h[0];
 
-    if(aw == imgb_w && ah == imgb_h) { // no needs to pad
+    if(aw == imgb_w && ah == imgb_h) { // no need to pad
         return;
     }
 
@@ -79,7 +79,7 @@ static void imgb_pad_p210(oapv_imgb_t *imgb, int aw, int ah, int comp_sft[N_C][2
     int imgb_w = imgb->w[0];
     int imgb_h = imgb->h[0];
 
-    if(aw == imgb_w && ah == imgb_h) { // no needs to pad
+    if(aw == imgb_w && ah == imgb_h) { // no need to pad
         return;
     }
 
@@ -703,7 +703,7 @@ static void enc_flush(oapve_ctx_t *ctx)
                     ctx->tpool->release(&ctx->thread_id[i]);
                 }
             }
-            // dinitialize the tc
+            // deinitialize the tc
             oapv_tpool_deinit(ctx->tpool);
             oapv_mfree_fast(ctx->tpool);
             ctx->tpool = NULL;
@@ -1083,7 +1083,7 @@ static int enc_frm_prepare(oapve_ctx_t *ctx, oapve_param_t *param, oapv_imgb_t *
         ctx->core[i]->ctx = ctx;
         ctx->core[i]->thread_idx = i;
     }
-    // recontruction picture
+    // reconstruction picture
     if(imgb_r != NULL) {
         for(int c = 0; c < ctx->num_comp; c++) {
             imgb_r->w[c] = imgb_i->w[c];
@@ -1608,7 +1608,7 @@ static int dec_frm_prepare(oapvd_ctx_t *ctx, oapv_imgb_t *imgb)
 
 static void dec_frm_finish(oapvd_ctx_t *ctx)
 {
-    imgb_release(ctx->imgb);                   // decrease reference cnout
+    imgb_release(ctx->imgb); // decrease reference count
     ctx->imgb = NULL;
 }
 
@@ -1807,7 +1807,7 @@ static void dec_flush(oapvd_ctx_t *ctx)
                     ctx->tpool->release(&ctx->thread_id[i]);
                 }
             }
-            // dinitialize the tpool
+            // deinitialize the tpool
             oapv_tpool_deinit(ctx->tpool);
             oapv_mfree(ctx->tpool);
             ctx->tpool = NULL;
diff --git a/src/oapv_bs.c b/src/oapv_bs.c
@@ -232,7 +232,6 @@ void oapv_bsr_skip(oapv_bs_t *bs, int size)
 
 void *oapv_bsr_sink(oapv_bs_t *bs)
 {
-    oapv_assert_rv(bs->cur - BSW_GET_SINK_BYTE(bs) < bs->end, NULL);
     oapv_assert_rv((bs->leftbits & 7) == 0, NULL);
     bs->cur = bs->cur - (bs->leftbits >> 3);
     bs->code = 0;
diff --git a/src/oapv_metadata.c b/src/oapv_metadata.c
@@ -133,38 +133,38 @@ static int meta_verify_mdp_data(int type, int size, u8 *data)
 {
     if(type == OAPV_METADATA_ITU_T_T35) {
         if(size == 0) {
-            return OAPV_ERR_MALFORMED_BITSTREAM;
+            return OAPV_ERR_INVALID_ARGUMENT;
         }
         if(*data == 0xFF) {
             if(size == 1) {
-                return OAPV_ERR_MALFORMED_BITSTREAM;
+                return OAPV_ERR_INVALID_ARGUMENT;
             }
         }
     }
     else if(type == OAPV_METADATA_MDCV) {
         if(size != 24) {
-            return OAPV_ERR_MALFORMED_BITSTREAM;
+            return OAPV_ERR_INVALID_ARGUMENT;
         }
     }
     else if(type == OAPV_METADATA_CLL) {
         if(size != 4) {
-            return OAPV_ERR_MALFORMED_BITSTREAM;
+            return OAPV_ERR_INVALID_ARGUMENT;
         }
     }
     else if(type == OAPV_METADATA_USER_DEFINED) {
         if(size < 16) {
-            return OAPV_ERR_MALFORMED_BITSTREAM;
+            return OAPV_ERR_INVALID_ARGUMENT;
         }
     }
     else if(type == OAPV_METADATA_FILLER) {
         for(int i = 0; i < size; i++) {
             if(data[i] != 0xFF) {
-                return OAPV_ERR_MALFORMED_BITSTREAM;
+                return OAPV_ERR_INVALID_ARGUMENT;
             }
         }
     }
     else {
-        return OAPV_OK;
+        return OAPV_OK; // undefined payload type
     }
     return OAPV_OK;
 }
diff --git a/src/oapv_tbl.c b/src/oapv_tbl.c
diff --git a/src/oapv_vlc.c b/src/oapv_vlc.c

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ static void imgb_pad(oapv_imgb_t *imgb, int aw, int ah, int comp_sft[N_C][2])`
`36`	`36`	`int imgb_w = imgb->w[0];`
`37`	`37`	`int imgb_h = imgb->h[0];`
`38`	`38`
`39`		`- if(aw == imgb_w && ah == imgb_h) { // no needs to pad`
	`39`	`+ if(aw == imgb_w && ah == imgb_h) { // no need to pad`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`
`@@ -79,7 +79,7 @@ static void imgb_pad_p210(oapv_imgb_t *imgb, int aw, int ah, int comp_sft[N_C][2`
`79`	`79`	`int imgb_w = imgb->w[0];`
`80`	`80`	`int imgb_h = imgb->h[0];`
`81`	`81`
`82`		`- if(aw == imgb_w && ah == imgb_h) { // no needs to pad`
	`82`	`+ if(aw == imgb_w && ah == imgb_h) { // no need to pad`
`83`	`83`	`return;`
`84`	`84`	`}`
`85`	`85`
`@@ -703,7 +703,7 @@ static void enc_flush(oapve_ctx_t *ctx)`
`703`	`703`	`ctx->tpool->release(&ctx->thread_id[i]);`
`704`	`704`	`}`
`705`	`705`	`}`
`706`		`- // dinitialize the tc`
	`706`	`+ // deinitialize the tc`
`707`	`707`	`oapv_tpool_deinit(ctx->tpool);`
`708`	`708`	`oapv_mfree_fast(ctx->tpool);`
`709`	`709`	`ctx->tpool = NULL;`
`@@ -1083,7 +1083,7 @@ static int enc_frm_prepare(oapve_ctx_t ctx, oapve_param_t param, oapv_imgb_t *`
`1083`	`1083`	`ctx->core[i]->ctx = ctx;`
`1084`	`1084`	`ctx->core[i]->thread_idx = i;`
`1085`	`1085`	`}`
`1086`		`- // recontruction picture`
	`1086`	`+ // reconstruction picture`
`1087`	`1087`	`if(imgb_r != NULL) {`
`1088`	`1088`	`for(int c = 0; c < ctx->num_comp; c++) {`
`1089`	`1089`	`imgb_r->w[c] = imgb_i->w[c];`
`@@ -1608,7 +1608,7 @@ static int dec_frm_prepare(oapvd_ctx_t ctx, oapv_imgb_t imgb)`
`1608`	`1608`
`1609`	`1609`	`static void dec_frm_finish(oapvd_ctx_t *ctx)`
`1610`	`1610`	`{`
`1611`		`- imgb_release(ctx->imgb); // decrease reference cnout`
	`1611`	`+ imgb_release(ctx->imgb); // decrease reference count`
`1612`	`1612`	`ctx->imgb = NULL;`
`1613`	`1613`	`}`
`1614`	`1614`
`@@ -1807,7 +1807,7 @@ static void dec_flush(oapvd_ctx_t *ctx)`
`1807`	`1807`	`ctx->tpool->release(&ctx->thread_id[i]);`
`1808`	`1808`	`}`
`1809`	`1809`	`}`
`1810`		`- // dinitialize the tpool`
	`1810`	`+ // deinitialize the tpool`
`1811`	`1811`	`oapv_tpool_deinit(ctx->tpool);`
`1812`	`1812`	`oapv_mfree(ctx->tpool);`
`1813`	`1813`	`ctx->tpool = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,6 @@ void oapv_bsr_skip(oapv_bs_t *bs, int size)`
`232`	`232`
`233`	`233`	`void oapv_bsr_sink(oapv_bs_t bs)`
`234`	`234`	`{`
`235`		`- oapv_assert_rv(bs->cur - BSW_GET_SINK_BYTE(bs) < bs->end, NULL);`
`236`	`235`	`oapv_assert_rv((bs->leftbits & 7) == 0, NULL);`
`237`	`236`	`bs->cur = bs->cur - (bs->leftbits >> 3);`
`238`	`237`	`bs->code = 0;`
Original file line number	Diff line number	Diff line change
`@@ -133,38 +133,38 @@ static int meta_verify_mdp_data(int type, int size, u8 *data)`
`133`	`133`	`{`
`134`	`134`	`if(type == OAPV_METADATA_ITU_T_T35) {`
`135`	`135`	`if(size == 0) {`
`136`		`- return OAPV_ERR_MALFORMED_BITSTREAM;`
	`136`	`+ return OAPV_ERR_INVALID_ARGUMENT;`
`137`	`137`	`}`
`138`	`138`	`if(*data == 0xFF) {`
`139`	`139`	`if(size == 1) {`
`140`		`- return OAPV_ERR_MALFORMED_BITSTREAM;`
	`140`	`+ return OAPV_ERR_INVALID_ARGUMENT;`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`else if(type == OAPV_METADATA_MDCV) {`
`145`	`145`	`if(size != 24) {`
`146`		`- return OAPV_ERR_MALFORMED_BITSTREAM;`
	`146`	`+ return OAPV_ERR_INVALID_ARGUMENT;`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`else if(type == OAPV_METADATA_CLL) {`
`150`	`150`	`if(size != 4) {`
`151`		`- return OAPV_ERR_MALFORMED_BITSTREAM;`
	`151`	`+ return OAPV_ERR_INVALID_ARGUMENT;`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`else if(type == OAPV_METADATA_USER_DEFINED) {`
`155`	`155`	`if(size < 16) {`
`156`		`- return OAPV_ERR_MALFORMED_BITSTREAM;`
	`156`	`+ return OAPV_ERR_INVALID_ARGUMENT;`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`else if(type == OAPV_METADATA_FILLER) {`
`160`	`160`	`for(int i = 0; i < size; i++) {`
`161`	`161`	`if(data[i] != 0xFF) {`
`162`		`- return OAPV_ERR_MALFORMED_BITSTREAM;`
	`162`	`+ return OAPV_ERR_INVALID_ARGUMENT;`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`else {`
`167`		`- return OAPV_OK;`
	`167`	`+ return OAPV_OK; // undefined payload type`
`168`	`168`	`}`
`169`	`169`	`return OAPV_OK;`
`170`	`170`	`}`