Commit 80d5234f authored by RogerZhou's avatar RogerZhou Committed by Roger Zhou

Fix build break by hash_me

BUG=aomedia:1031

Change-Id: I44007d418dba65cda9bd5fe44f8bfa66c080c7bc
parent b8822d61
...@@ -113,9 +113,6 @@ void av1_free_ref_frame_buffers(BufferPool *pool) { ...@@ -113,9 +113,6 @@ void av1_free_ref_frame_buffers(BufferPool *pool) {
pool->frame_bufs[i].seg_map = NULL; pool->frame_bufs[i].seg_map = NULL;
#endif #endif
aom_free_frame_buffer(&pool->frame_bufs[i].buf); aom_free_frame_buffer(&pool->frame_bufs[i].buf);
#if CONFIG_HASH_ME
av1_hash_table_destroy(&pool->frame_bufs[i].hash_table);
#endif
} }
} }
......
...@@ -3311,6 +3311,11 @@ void av1_remove_compressor(AV1_COMP *cpi) { ...@@ -3311,6 +3311,11 @@ void av1_remove_compressor(AV1_COMP *cpi) {
#endif // CONFIG_INTERNAL_STATS #endif // CONFIG_INTERNAL_STATS
av1_remove_common(cm); av1_remove_common(cm);
#if CONFIG_HASH_ME
for (i = 0; i < FRAME_BUFFERS; ++i) {
av1_hash_table_destroy(&cm->buffer_pool->frame_bufs[i].hash_table);
}
#endif // CONFIG_HASH_ME
av1_free_ref_frame_buffers(cm->buffer_pool); av1_free_ref_frame_buffers(cm->buffer_pool);
aom_free(cpi); aom_free(cpi);
......
...@@ -586,8 +586,8 @@ post_process_cmdline() { ...@@ -586,8 +586,8 @@ post_process_cmdline() {
soft_enable inspection soft_enable inspection
fi fi
# Enable hash_me if amvr is enabled # Enable hash_me if amvr is enabled
if enabled amvr; then if enabled amvr && enabled av1_encoder; then
log_echo "amvr requires hash_me" log_echo "encoder side amvr requires hash_me"
enable_feature hash_me enable_feature hash_me
fi fi
if enabled lpf_sb; then if enabled lpf_sb; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment