diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-06 15:01:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-06 15:01:54 -0800 |
| commit | 29199efd57ad748f683200cc3381f664539f3d2a (patch) | |
| tree | 5090d949b75302957006506e694362008d92ac14 | |
| parent | bbb25e6a394720cbf682b5b009f30b86c78c372c (diff) | |
| parent | 4603f31d025ac11ba8712763ba4c3d2d930abee1 (diff) | |
| download | libvpx-29199efd57ad748f683200cc3381f664539f3d2a.tar libvpx-29199efd57ad748f683200cc3381f664539f3d2a.tar.gz libvpx-29199efd57ad748f683200cc3381f664539f3d2a.tar.bz2 libvpx-29199efd57ad748f683200cc3381f664539f3d2a.zip | |
Merge "Moving reset_segment_features() to encoder/vp9_segmentation.h."
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 15 | ||||
| -rw-r--r-- | vp9/encoder/vp9_segmentation.c | 9 | ||||
| -rw-r--r-- | vp9/encoder/vp9_segmentation.h | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 871176b79..9ead57e69 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -170,17 +170,6 @@ void vp9_initialize_enc() { } } -static void reset_segment_features(VP9_COMMON *cm) { - struct segmentation *const seg = &cm->seg; - - // Set up default state for MB feature flags - seg->enabled = 0; - seg->update_map = 0; - seg->update_data = 0; - vpx_memset(seg->tree_probs, 255, sizeof(seg->tree_probs)); - vp9_clearall_segfeatures(seg); -} - static void dealloc_compressor_data(VP9_COMP *cpi) { // Delete sementation map vpx_free(cpi->segmentation_map); @@ -1192,7 +1181,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { cm->refresh_frame_context = 1; cm->reset_frame_context = 0; - reset_segment_features(cm); + vp9_reset_segment_features(&cm->seg); set_high_precision_mv(cpi, 0); { @@ -2939,7 +2928,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, if (frame_is_intra_only(cm)) { vp9_setup_key_frame(cpi); // Reset the loop filter deltas and segmentation map. - reset_segment_features(cm); + vp9_reset_segment_features(&cm->seg); // If segmentation is enabled force a map update for key frames. if (seg->enabled) { diff --git a/vp9/encoder/vp9_segmentation.c b/vp9/encoder/vp9_segmentation.c index 4568e7a4c..509717e0a 100644 --- a/vp9/encoder/vp9_segmentation.c +++ b/vp9/encoder/vp9_segmentation.c @@ -296,3 +296,12 @@ void vp9_choose_segmap_coding_method(VP9_COMP *cpi) { vpx_memcpy(seg->tree_probs, no_pred_tree, sizeof(no_pred_tree)); } } + +void vp9_reset_segment_features(struct segmentation *seg) { + // Set up default state for MB feature flags + seg->enabled = 0; + seg->update_map = 0; + seg->update_data = 0; + vpx_memset(seg->tree_probs, 255, sizeof(seg->tree_probs)); + vp9_clearall_segfeatures(seg); +} diff --git a/vp9/encoder/vp9_segmentation.h b/vp9/encoder/vp9_segmentation.h index 03f14ea06..3c6eb7038 100644 --- a/vp9/encoder/vp9_segmentation.h +++ b/vp9/encoder/vp9_segmentation.h @@ -43,4 +43,6 @@ void vp9_set_segment_data(VP9_PTR ptr, signed char *feature_data, void vp9_choose_segmap_coding_method(VP9_COMP *cpi); +void vp9_reset_segment_features(struct segmentation *seg); + #endif // VP9_ENCODER_VP9_SEGMENTATION_H_ |