Skip to content

Restrict odd width #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tuzm24 merged 3 commits into from
May 12, 2025
Merged

Restrict odd width #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1643516
restrict odd width encoding
kpchoi May 12, 2025
2305fc9
restrict odd width with 422 subsampling
neergil May 12, 2025
46d0036
added new error code to restrict width in decoder
neergil May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion inc/oapv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ extern "C" {
#define OAPV_ERR_MALFORMED_BITSTREAM (-202)
#define OAPV_ERR_OUT_OF_BS_BUF (-203) /* too small bitstream buffer */
#define OAPV_ERR_NOT_FOUND (-204)
#define OAPV_ERR_FAILED_SYSCALL (-301) /* failed system call */
#define OAPV_ERR_FAILED_SYSCALL (-301) /* failed system call */
#define OAPV_ERR_INVALID_LEVEL (-401)
#define OAPV_ERR_INVALID_WIDTH (-405) /* invalid width (like odd) */
#define OAPV_ERR_UNKNOWN (-32767) /* unknown error */

/* return value checking */
Expand Down
3 changes: 3 additions & 0 deletions src/oapv_param.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,9 @@ int oapve_param_update(oapve_ctx_t* ctx)
int ret = OAPV_OK;
int min_num_tiles = OAPV_MAX_TILES;
for (int i = 0; i < ctx->cdesc.max_num_frms; i++) {
if(ctx->cdesc.param[i].csp == 2 && ctx->cdesc.param[i].w & 0x1) { // check width restriction for 422
return OAPV_ERR_INVALID_WIDTH; // odd width is not spec-out
}
ret = enc_update_param_tile(ctx, &ctx->cdesc.param[i]);
oapv_assert_rv(ret == OAPV_OK, ret);
int num_tiles = oapv_div_round_up(ctx->w, ctx->cdesc.param[i].tile_w) * oapv_div_round_up(ctx->h, ctx->cdesc.param[i].tile_h);
Expand Down
2 changes: 1 addition & 1 deletion src/oapv_vlc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ int oapvd_vlc_frame_info(oapv_bs_t *bs, oapv_fi_t *fi)
// check frame width in case of 422 format.
if(fi->chroma_format_idc == 2) {
// frame_width should be multiple of 2
oapv_assert_rv((fi->frame_width & 0x1) == 0, OAPV_ERR_MALFORMED_BITSTREAM);
oapv_assert_rv((fi->frame_width & 0x1) == 0, OAPV_ERR_INVALID_WIDTH);
}

return OAPV_OK;
Expand Down