Skip to content

Commit 3890dae

Browse files
authored
Merge pull request #90 from mpeg5/xeve_stabilization_nbr_fix
Encoder intra right nbr access fix based on ETM spec, code cleanup
2 parents a7425e3 + 9ed193b commit 3890dae

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src_main/xevem_ipred.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void xevem_get_nbr(int x, int y, int cuw, int cuh, pel *src, int s_src, u16 avai
132132
for (i = 0; i < (scuh + scuw); i++)
133133
{
134134
/*Check if right neighbours are available */
135-
int is_avail = (x_scu + scuw + i < w_scu) && (y_scu + i < h_scu);
135+
int is_avail = (x_scu + scuw < w_scu) && (y_scu + i < h_scu);
136136
if (is_avail && MCU_GET_COD(map_scu[scup + scuw + i * w_scu]) && (!constrained_intra_pred || MCU_GET_IF(map_scu[scup + scuw + i * w_scu])) &&
137137
(map_tidx[scup] == map_tidx[scup + scuw + i * w_scu]))
138138
{

src_main/xevem_util.c

-2
Original file line numberDiff line numberDiff line change
@@ -3796,8 +3796,6 @@ void xevem_flush(XEVE_CTX * ctx)
37963796
xeve_mfree_fast(mctx->ats_inter_num_pred[i]);
37973797
}
37983798

3799-
xeve_mfree_fast(ctx->map_tidx);
3800-
38013799
if (ctx->param.tool_dra)
38023800
{
38033801
xeve_mfree(mctx->dra_array);

0 commit comments

Comments
 (0)