Skip to content

Commit 2cd1f2c

Browse files
author
openapv
authored
Merge pull request #7 from openapv/refactoring-totally
Many refactoring of functions and error handling code
2 parents 28254c5 + 99d01f1 commit 2cd1f2c

20 files changed

+170
-209
lines changed

‎app/oapv_app_args.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static int args_get_arg(ARGS_OPT * ops, int idx, char * result)
184184
static int args_parse_int_x_int(char * str, int * num0, int * num1)
185185
{
186186
char str0_t[64];
187-
int i, cnt0, cnt1;
187+
int i, cnt0 = 0, cnt1;
188188
char * str0, *str1 = NULL;
189189

190190
str0 = str;
@@ -494,7 +494,7 @@ static int args_parse(ARGS_PARSER * args, int argc, const char* argv[],
494494

495495
static int args_get_help(ARGS_PARSER * args, int idx, char * help)
496496
{
497-
int optional = 0;
497+
int optional;
498498
char vtype[32];
499499
ARGS_OPT * o = args->opts + idx;
500500
char default_value[256] = { 0 };

‎app/oapv_app_dec.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static void print_usage(const char** argv)
145145
goto ERR;
146146

147147
logv2("Syntax: \n");
148-
logv2(" %s -i 'input-file' [ options ] \n\n", "oapv_app_dec");
148+
logv2(" %s -i 'input-file' [ options ] \n\n", argv[0]);
149149

150150
logv2("Options:\n");
151151
logv2(" --help\n : list options\n");
@@ -228,7 +228,7 @@ static int set_extra_config(oapvd_t id, ARGS_VAR* args_vars)
228228
return 0;
229229
}
230230

231-
static int write_dec_img(oapvd_t id, char* fname, oapv_imgb_t* img, int flag_y4m)
231+
static int write_dec_img(char* fname, oapv_imgb_t* img, int flag_y4m)
232232
{
233233
if(flag_y4m) {
234234
if(write_y4m_frame_header(fname))
@@ -566,7 +566,7 @@ int main(int argc, const char** argv)
566566
goto END;
567567
}
568568
}
569-
write_dec_img(did, args_var->fname_out, imgb_o, is_y4m);
569+
write_dec_img(args_var->fname_out, imgb_o, is_y4m);
570570
}
571571
frm_cnt[i]++;
572572
}

‎app/oapv_app_enc.c‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ static ARGS_VAR* args_init_vars(ARGS_PARSER* args, oapve_param_t* param)
214214
ARGS_OPT* opts;
215215
ARGS_VAR* vars;
216216

217-
opts = args->opts;
218217
opts = args->opts;
219218
vars = malloc(sizeof(ARGS_VAR));
220219
assert_rv(vars != NULL, NULL);
@@ -285,7 +284,7 @@ static void print_usage(const char** argv)
285284
goto ERR;
286285

287286
logv2("Syntax: \n");
288-
logv2(" %s -i 'input-file' [ options ] \n\n", "oapv_app_enc");
287+
logv2(" %s -i 'input-file' [ options ] \n\n", argv[0]);
289288

290289
logv2("Options:\n");
291290
logv2(" --help\n : list options\n");
@@ -382,7 +381,7 @@ void print_stat_frame(int fnum, int gid, double* psnr, int bitrate, oapv_clk_t c
382381

383382
static int kbps_str_to_int(char* str)
384383
{
385-
int kbps = 0;
384+
int kbps;
386385
if(strchr(str, 'K') || strchr(str, 'k')) {
387386
char* tmp = strtok(str, "Kk ");
388387
kbps = (int)(atof(tmp));
@@ -422,16 +421,16 @@ static int update_param(ARGS_VAR* vars, oapve_param_t* param)
422421
while(len_cnt < len_y && cnt < OAPV_BLOCK_D) {
423422
sscanf(tmp, "%d", &param->q_matrix_y[cnt]);
424423
if(param->q_matrix_y[cnt] < 1 || param->q_matrix_y[cnt] > 256) {
425-
logerr("input value of q_matrix_y is valid\n");
426-
return OAPV_ERR;
424+
logerr("input value of q_matrix_y is invalid\n");
425+
return -1;
427426
}
428427
len_cnt += (int)log10(param->q_matrix_y[cnt]) + 2;
429428
tmp = vars->q_matrix_y + len_cnt;
430429
cnt++;
431430
}
432431
if(cnt < OAPV_BLOCK_D) {
433432
logerr("input number of q_matrix_y is not enough\n");
434-
return OAPV_ERR;
433+
return -1;
435434
}
436435
}
437436

@@ -444,16 +443,16 @@ static int update_param(ARGS_VAR* vars, oapve_param_t* param)
444443
while(len_cnt < len_u && cnt < OAPV_BLOCK_D) {
445444
sscanf(tmp, "%d", &param->q_matrix_u[cnt]);
446445
if(param->q_matrix_u[cnt] < 1 || param->q_matrix_u[cnt] > 256) {
447-
logerr("input value of q_matrix_u is valid\n");
448-
return OAPV_ERR;
446+
logerr("input value of q_matrix_u is invalid\n");
447+
return -1;
449448
}
450449
len_cnt += (int)log10(param->q_matrix_u[cnt]) + 2;
451450
tmp = vars->q_matrix_u + len_cnt;
452451
cnt++;
453452
}
454453
if(cnt < OAPV_BLOCK_D) {
455454
logerr("input number of q_matrix_u is not enough\n");
456-
return OAPV_ERR;
455+
return -1;
457456
}
458457
}
459458

@@ -466,16 +465,16 @@ static int update_param(ARGS_VAR* vars, oapve_param_t* param)
466465
while(len_cnt < len_v && cnt < OAPV_BLOCK_D) {
467466
sscanf(tmp, "%d", &param->q_matrix_v[cnt]);
468467
if(param->q_matrix_v[cnt] < 1 || param->q_matrix_v[cnt] > 256) {
469-
logerr("input value of q_matrix_v is valid\n");
470-
return OAPV_ERR;
468+
logerr("input value of q_matrix_v is invalid\n");
469+
return -1;
471470
}
472471
len_cnt += (int)log10(param->q_matrix_v[cnt]) + 2;
473472
tmp = vars->q_matrix_v + len_cnt;
474473
cnt++;
475474
}
476475
if(cnt < OAPV_BLOCK_D) {
477476
logerr("input number of q_matrix_v is not enough\n");
478-
return OAPV_ERR;
477+
return -1;
479478
}
480479
}
481480

@@ -541,7 +540,7 @@ int main(int argc, const char** argv)
541540
0,
542541
};
543542
int encod_frames = 0;
544-
int is_y4m = 0;
543+
int is_y4m;
545544
Y4M_INFO y4m;
546545
char fname_inp[256], fname_out[256], fname_rec[256];
547546
int is_out = 0, is_rec = 0;
@@ -618,7 +617,7 @@ int main(int argc, const char** argv)
618617
ret = -1;
619618
goto ERR;
620619
}
621-
y4m_update_param(args, &y4m, param);
620+
y4m_update_param(args, &y4m);
622621
cfmt = y4m.color_format;
623622
}
624623
else {
@@ -834,7 +833,7 @@ int main(int argc, const char** argv)
834833

835834
/* calculate PSNR */
836835
if(op_verbose == VERBOSE_FRAME) {
837-
measure_psnr(ifrms.frm[i].imgb, rfrms.frm[i].imgb, psnr, args_var->input_depth);
836+
measure_psnr(ifrms.frm[i].imgb, rfrms.frm[i].imgb, psnr, OAPV_CS_GET_BIT_DEPTH(ifrms.frm[i].imgb->cs));
838837
print_stat_frame(pic_cnt, stat.aui.frm_info[FRM_IDX].group_id, psnr, (stat.frm_size[FRM_IDX]) << 3, clk_end, (pic_cnt == 0));
839838
for(i = 0; i < (cfmt == OAPV_CF_YCBCR4444 ? 4 : 3); i++)
840839
psnr_avg[i] += psnr[i];

‎app/oapv_app_util.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,6 @@ static int imgb_write(char * fname, oapv_imgb_t * imgb)
441441

442442
int chroma_format = OAPV_CS_GET_FORMAT(imgb->cs);
443443
int bit_depth = OAPV_CS_GET_BIT_DEPTH(imgb->cs);
444-
int w_shift = (chroma_format == OAPV_CF_YCBCR420) || (chroma_format == OAPV_CF_YCBCR422) ? 1 : 0;
445-
int h_shift = chroma_format == OAPV_CF_YCBCR420 ? 1 : 0;
446-
447-
int w = imgb->w[0];
448-
int h = imgb->h[0];
449444

450445
fp = fopen(fname, "ab");
451446
if(fp == NULL)

‎app/oapv_app_y4m.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
* POSSIBILITY OF SUCH DAMAGE.
3030
*/
31+
#ifndef _OAPV_APP_Y4M_H_
32+
#define _OAPV_APP_Y4M_H_
3133

3234
typedef struct _Y4M_PARAMS
3335
{
@@ -211,7 +213,7 @@ int y4m_header_parser(FILE * ip_y4m, Y4M_INFO * y4m)
211213
return 0;
212214
}
213215

214-
static void y4m_update_param(ARGS_PARSER * args, Y4M_INFO * y4m, oapve_param_t * param)
216+
static void y4m_update_param(ARGS_PARSER * args, Y4M_INFO * y4m)
215217
{
216218
args->set_int(args, "width", y4m->w);
217219
args->set_int(args, "height", y4m->h);
@@ -295,3 +297,4 @@ static int write_y4m_frame_header(char * fname)
295297

296298
}
297299

300+
#endif /* _OAPV_APP_Y4M_H_ */

‎inc/oapv.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ extern "C"
6868
#define OAPV_ERR_UNSUPPORTED_COLORSPACE (-201)
6969
#define OAPV_ERR_MALFORMED_BITSTREAM (-202)
7070
#define OAPV_ERR_OUT_OF_BS_BUF (-203) /* too small bitstream buffer */
71+
#define OAPV_ERR_NOT_FOUND (-204)
7172
#define OAPV_ERR_FAILED_SYSCALL (-301) /* failed system call */
7273
#define OAPV_ERR_UNKNOWN (-32767) /* unknown error */
7374

0 commit comments

Comments
 (0)