Commit a4d308a4 authored by Paul Wilkins's avatar Paul Wilkins Committed by Gerrit Code Review
Browse files

Merge "segmentation: make local symbols static." into experimental

parents dd2e43c3 7f6f0703
...@@ -1929,7 +1929,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) ...@@ -1929,7 +1929,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
// If it is, then indicate the method that will be used. // If it is, then indicate the method that will be used.
if (xd->update_mb_segmentation_map) { if (xd->update_mb_segmentation_map) {
// Select the coding strategy (temporal or spatial) // Select the coding strategy (temporal or spatial)
choose_segmap_coding_method(cpi); vp9_choose_segmap_coding_method(cpi);
// Send the tree probabilities used to decode unpredicted // Send the tree probabilities used to decode unpredicted
// macro-block segments // macro-block segments
for (i = 0; i < MB_FEATURE_TREE_PROBS; i++) { for (i = 0; i < MB_FEATURE_TREE_PROBS; i++) {
......
...@@ -160,7 +160,7 @@ static int cost_segmap(MACROBLOCKD *xd, ...@@ -160,7 +160,7 @@ static int cost_segmap(MACROBLOCKD *xd,
} }
void choose_segmap_coding_method(VP8_COMP *cpi) { void vp9_choose_segmap_coding_method(VP8_COMP *cpi) {
VP8_COMMON *const cm = &cpi->common; VP8_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &cpi->mb.e_mbd; MACROBLOCKD *const xd = &cpi->mb.e_mbd;
......
...@@ -38,6 +38,6 @@ extern void vp8_set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_ma ...@@ -38,6 +38,6 @@ extern void vp8_set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_ma
// //
extern void vp8_set_segment_data(VP8_PTR ptr, signed char *feature_data, unsigned char abs_delta); extern void vp8_set_segment_data(VP8_PTR ptr, signed char *feature_data, unsigned char abs_delta);
extern void choose_segmap_coding_method(VP8_COMP *cpi); extern void vp9_choose_segmap_coding_method(VP8_COMP *cpi);
#endif /* __INC_SEGMENTATION_H__ */ #endif /* __INC_SEGMENTATION_H__ */
Supports Markdown
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