diff options
author | Cheng Chen <chengchen@google.com> | 2020-02-11 20:30:50 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-11 20:30:50 +0000 |
commit | 6ca77eb7ca4d3ef580f8e2df584b28322ef23ce1 (patch) | |
tree | f3faa605d8fdacf2f90ab7bf4ade7905777e87cf /vp9/encoder/vp9_encodeframe.c | |
parent | b7075bc90b54e0f7787c68d5de5e909bad84fee9 (diff) | |
parent | 9d5bc18b099ea9115fde340e1db49536fa621318 (diff) | |
download | libvpx-6ca77eb7ca4d3ef580f8e2df584b28322ef23ce1.tar libvpx-6ca77eb7ca4d3ef580f8e2df584b28322ef23ce1.tar.gz libvpx-6ca77eb7ca4d3ef580f8e2df584b28322ef23ce1.tar.bz2 libvpx-6ca77eb7ca4d3ef580f8e2df584b28322ef23ce1.zip |
Merge "Set mv to zero if the second ref does not exist"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 1004b83c4..0bac753ad 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3847,6 +3847,9 @@ static void assign_motion_vector_info(const int block_width_4x4, const int col_4x4 = col_start_4x4 + j; const int unit_index = row_4x4 * num_unit_cols + col_4x4; if (row_4x4 >= num_unit_rows || col_4x4 >= num_unit_cols) continue; + if (source_ref_frame[1] == NONE) { + assert(source_mv[1]->row == 0 && source_mv[1]->col == 0); + } motion_vector_info[unit_index].ref_frame[0] = source_ref_frame[0]; motion_vector_info[unit_index].ref_frame[1] = source_ref_frame[1]; motion_vector_info[unit_index].mv[0].as_mv.row = source_mv[0]->row; |