Skip to content

Commit b7daef2

Browse files
kpchoimss-park
kpchoi
and
mss-park
authored
Add APV family definition (#113)
* adding APV family (not finished) * adding APV family (not finished) * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * clarfy list of family Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com> * clarfy list of family Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com> * clarfy resolution info Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: kpchoi <kp5.choi@samsung.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * Update apv_family.md Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> * added code for calculation of family bitrate Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com> * supports family settings Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com> * Update apv_family.md Fix wrong values in family table in case of 120p and LQ/SQ/444. Signed-off-by: kpchoi <kp5.choi@samsung.com> * normalize line feed Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com> --------- Signed-off-by: mss-park <76668072+mss-park@users.noreply.github.com> Signed-off-by: kp5.choi@samsung.com <kp5.choi@samsung.com> Signed-off-by: kpchoi <kp5.choi@samsung.com> Co-authored-by: mss-park <76668072+mss-park@users.noreply.github.com>
1 parent 5afd655 commit b7daef2

File tree

6 files changed

+297
-63
lines changed

6 files changed

+297
-63
lines changed

‎app/oapv_app_dec.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -392,34 +392,34 @@ int main(int argc, const char **argv)
392392
/* parse command line */
393393
args = args_create(dec_args_opts, NUM_ARGS_OPT);
394394
if(args == NULL) {
395-
logerr("cannot create argument parser\n");
395+
logerr("ERR: cannot create argument parser\n");
396396
ret = -1;
397397
goto ERR;
398398
}
399399
args_var = args_init_vars(args);
400400
if(args_var == NULL) {
401-
logerr("cannot initialize argument parser\n");
401+
logerr("ERR: cannot initialize argument parser\n");
402402
ret = -1;
403403
goto ERR;
404404
}
405405
if(args->parse(args, argc, argv, &errstr)) {
406-
logerr("command parsing error (%s)\n", errstr);
406+
logerr("ERR: command parsing error (%s)\n", errstr);
407407
ret = -1;
408408
goto ERR;
409409
}
410410
// print command line string for information
411411
print_commandline(argc, argv);
412412

413413
if(args->check_mandatory(args, &errstr)) {
414-
logerr("'--%s' argument is mandatory\n", errstr);
414+
logerr("ERR: '--%s' argument is mandatory\n", errstr);
415415
ret = -1;
416416
goto ERR;
417417
}
418418

419419
/* open input file */
420420
fp_bs = fopen(args_var->fname_inp, "rb");
421421
if(fp_bs == NULL) {
422-
logerr("ERROR: cannot open bitstream file = %s\n", args_var->fname_inp);
422+
logerr("ERR: cannot open bitstream file = %s\n", args_var->fname_inp);
423423
print_usage(argv);
424424
ret = -1; goto ERR;
425425
}
@@ -433,7 +433,7 @@ int main(int argc, const char **argv)
433433
is_y4m = 0;
434434
}
435435
else { // invalid or unknown file name type
436-
logerr("unknown file type name for decoded video\n");
436+
logerr("ERR: unknown file type name for decoded video\n");
437437
ret = -1; goto ERR;
438438
}
439439
clear_data(args_var->fname_out); /* remove decoded file contents if exists */
@@ -442,7 +442,7 @@ int main(int argc, const char **argv)
442442
// create bitstream buffer
443443
bs_buf = malloc(MAX_BS_BUF);
444444
if(bs_buf == NULL) {
445-
logerr("ERROR: cannot allocate bitstream buffer, size=%d\n", MAX_BS_BUF);
445+
logerr("ERR: cannot allocate bitstream buffer, size=%d\n", MAX_BS_BUF);
446446
ret = -1;
447447
goto ERR;
448448
}
@@ -455,12 +455,12 @@ int main(int argc, const char **argv)
455455
}
456456
did = oapvd_create(&cdesc, &ret);
457457
if(did == NULL) {
458-
logerr("ERROR: cannot create OAPV decoder (err=%d)\n", ret);
458+
logerr("ERR: cannot create OAPV decoder (err=%d)\n", ret);
459459
ret = -1;
460460
goto ERR;
461461
}
462462
if(set_extra_config(did, args_var)) {
463-
logerr("ERROR: cannot set extra configurations\n");
463+
logerr("ERR: cannot set extra configurations\n");
464464
ret = -1;
465465
goto ERR;
466466
}
@@ -471,7 +471,7 @@ int main(int argc, const char **argv)
471471
/* create metadata container */
472472
mid = oapvm_create(&ret);
473473
if(OAPV_FAILED(ret)) {
474-
logerr("ERROR: cannot create OAPV metadata container (err=%d)\n", ret);
474+
logerr("ERR: cannot create OAPV metadata container (err=%d)\n", ret);
475475
ret = -1;
476476
goto ERR;
477477
}
@@ -490,7 +490,7 @@ int main(int argc, const char **argv)
490490
}
491491

492492
if(OAPV_FAILED(oapvd_info(bs_buf, bs_buf_size, &aui))) {
493-
logerr("cannot get information from bitstream\n");
493+
logerr("ERR: cannot get information from bitstream\n");
494494
ret = -1;
495495
goto ERR;
496496
}
@@ -514,7 +514,7 @@ int main(int argc, const char **argv)
514514
frm->imgb = imgb_create(finfo->w, finfo->h, finfo->cs);
515515
}
516516
if(frm->imgb == NULL) {
517-
logerr("cannot allocate image buffer (w:%d, h:%d, cs:%d)\n",
517+
logerr("ERR: cannot allocate image buffer (w:%d, h:%d, cs:%d)\n",
518518
finfo->w, finfo->h, finfo->cs);
519519
ret = -1;
520520
goto ERR;
@@ -539,7 +539,7 @@ int main(int argc, const char **argv)
539539
clk_tot += clk_end;
540540

541541
if(OAPV_FAILED(ret)) {
542-
logerr("failed to decode bitstream\n");
542+
logerr("ERR: failed to decode bitstream\n");
543543
ret = -1;
544544
goto END;
545545
}
@@ -557,14 +557,14 @@ int main(int argc, const char **argv)
557557
ret = oapvm_get_all(mid, NULL, &num_plds);
558558

559559
if(OAPV_FAILED(ret)) {
560-
logerr("failed to read metadata\n");
560+
logerr("ERR: failed to read metadata\n");
561561
goto END;
562562
}
563563
if(num_plds > 0) {
564564
pld = malloc(sizeof(oapvm_payload_t) * num_plds);
565565
ret = oapvm_get_all(mid, pld, &num_plds);
566566
if(OAPV_FAILED(ret)) {
567-
logerr("failed to read metadata\n");
567+
logerr("ERR: failed to read metadata\n");
568568
free(pld);
569569
goto END;
570570
}
@@ -586,7 +586,7 @@ int main(int argc, const char **argv)
586586
imgb_w = imgb_create(frm->imgb->w[0], frm->imgb->h[0],
587587
OAPV_CS_SET(OAPV_CS_GET_FORMAT(frm->imgb->cs), args_var->output_depth, 0));
588588
if(imgb_w == NULL) {
589-
logerr("cannot allocate image buffer (w:%d, h:%d, cs:%d)\n",
589+
logerr("ERR: cannot allocate image buffer (w:%d, h:%d, cs:%d)\n",
590590
frm->imgb->w[0], frm->imgb->h[0], frm->imgb->cs);
591591
ret = -1;
592592
goto ERR;
@@ -602,13 +602,13 @@ int main(int argc, const char **argv)
602602
if(strlen(args_var->fname_out)) {
603603
if(frm_cnt[i] == 0 && is_y4m) {
604604
if(write_y4m_header(args_var->fname_out, imgb_o)) {
605-
logerr("cannot write Y4M header\n");
605+
logerr("ERR: cannot write Y4M header\n");
606606
ret = -1;
607607
goto ERR;
608608
}
609609
}
610610
if(write_dec_img(args_var->fname_out, imgb_o, is_y4m)) {
611-
logerr("cannot write decoded video\n");
611+
logerr("ERR: cannot write decoded video\n");
612612
ret = -1;
613613
goto ERR;
614614
}

0 commit comments

Comments
 (0)