diff options
| author | Angie Chiang <angiebird@google.com> | 2019-03-14 17:22:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-14 17:22:09 +0000 |
| commit | 0fdc9af7b2b3445ba72a8d9ae68383d0bbc1b929 (patch) | |
| tree | d7dc171e40eac108aa95dcd79026897523e2aa93 /vp9/encoder/vp9_encoder.c | |
| parent | 181631ac16af6e58a11f228bb137d61e23ddc253 (diff) | |
| parent | 316e7f62dbd13ff6de6df2e82376f4033a9ff4d5 (diff) | |
| download | libvpx-0fdc9af7b2b3445ba72a8d9ae68383d0bbc1b929.tar libvpx-0fdc9af7b2b3445ba72a8d9ae68383d0bbc1b929.tar.gz libvpx-0fdc9af7b2b3445ba72a8d9ae68383d0bbc1b929.tar.bz2 libvpx-0fdc9af7b2b3445ba72a8d9ae68383d0bbc1b929.zip | |
Merge changes Ifc006890,I753920a6
* changes:
Apply kmeans on log of wiener_variance
Add vp9_kmeans()
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 3c9ae1bb1..edad53d31 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2388,6 +2388,7 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf, sizeof(*cpi->mb_wiener_variance))); } + cpi->kmeans_data_arr_alloc = 0; #if CONFIG_NON_GREEDY_MV cpi->feature_score_loc_alloc = 0; cpi->tpl_ready = 0; @@ -2591,6 +2592,10 @@ void vp9_remove_compressor(VP9_COMP *cpi) { vp9_denoiser_free(&(cpi->denoiser)); #endif + if (cpi->kmeans_data_arr_alloc) { + vpx_free(cpi->kmeans_data_arr); + } + #if CONFIG_NON_GREEDY_MV vpx_free(cpi->feature_score_loc_arr); vpx_free(cpi->feature_score_loc_sort); @@ -7250,6 +7255,16 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, for (i = 0; i < REFS_PER_FRAME; ++i) cpi->scaled_ref_idx[i] = INVALID_IDX; } + if (cpi->kmeans_data_arr_alloc == 0) { + const int mi_cols = mi_cols_aligned_to_sb(cm->mi_cols); + const int mi_rows = mi_cols_aligned_to_sb(cm->mi_rows); + CHECK_MEM_ERROR( + cm, cpi->kmeans_data_arr, + vpx_calloc(mi_rows * mi_cols, sizeof(*cpi->kmeans_data_arr))); + cpi->kmeans_data_stride = mi_cols; + cpi->kmeans_data_arr_alloc = 1; + } + if (gf_group_index == 1 && cpi->twopass.gf_group.update_type[gf_group_index] == ARF_UPDATE && cpi->sf.enable_tpl_model) { |