Merge "Swap order of affine parameters" into nextgenv2
This commit is contained in:
@@ -3411,12 +3411,12 @@ static void read_global_motion_params(Global_Motion_Params *params,
|
||||
case GLOBAL_ZERO: break;
|
||||
case GLOBAL_AFFINE:
|
||||
params->motion_params.wmmat[2].as_mv.row =
|
||||
(aom_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
|
||||
GM_ALPHA_DECODE_FACTOR);
|
||||
params->motion_params.wmmat[2].as_mv.col =
|
||||
aom_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
|
||||
GM_ALPHA_DECODE_FACTOR +
|
||||
(1 << WARPEDMODEL_PREC_BITS);
|
||||
params->motion_params.wmmat[2].as_mv.col =
|
||||
(aom_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
|
||||
GM_ALPHA_DECODE_FACTOR);
|
||||
// fallthrough intended
|
||||
case GLOBAL_ROTZOOM:
|
||||
params->motion_params.wmmat[1].as_mv.row =
|
||||
|
Reference in New Issue
Block a user