Reduce guetzli memory usage by 30% #156
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
robryk
approved these changes
Mar 31, 2017
guetzli/butteraugli_comparator.cc
Outdated
| @@ -31,6 +31,7 @@ ButteraugliComparator::ButteraugliComparator(const int width, const int height, | |||
| : width_(width), | |||
| height_(height), | |||
| target_distance_(target_distance), | |||
| rgb_orig_(rgb), | |||
There was a problem hiding this comment.
Please make the constructor parameter a const pointer if we now expect it be live as long as this class is live.
guetzli/comparator.h
Outdated
| @@ -36,6 +36,11 @@ class Comparator { | |||
| // baseline image. | |||
| virtual void Compare(const OutputImage& img) = 0; | |||
|
|
|||
| // Must be called before any CompareBlock() calls can be called. | |||
| virtual void StartBlockComparisons() = 0; | |||
| // No more CompareBlock() calls can be called after this. | |||
There was a problem hiding this comment.
Nit: unless you call Start... again.
guetzli/processor.cc
Outdated
| @@ -719,6 +719,8 @@ void Processor::SelectFrequencyMasking(const JPEGData& jpg, OutputImage* img, | |||
| break; | |||
| } | |||
| } | |||
| size_t global_order_size = global_order.size(); | |||
| global_order.clear(); | |||
There was a problem hiding this comment.
I was under the impression that this doesn't actually release the memory.
guetzli/processor.cc
Outdated
| @@ -709,7 +709,7 @@ void Processor::SelectFrequencyMasking(const JPEGData& jpg, OutputImage* img, | |||
| } | |||
| } | |||
| size_t global_order_size = global_order.size(); | |||
| global_order.clear(); | |||
| std::vector<std::pair<int, float>>().swap(global_order); | |||
There was a problem hiding this comment.
So maybe merge this with the commit that added the clear?
szabadka
force-pushed
the
master
branch
2 times, most recently
from
9713db1 to
f304c49
Compare
Instead, compute it and store it only for those blocks that are being processed in ComputeBlockZeroingOrder(). This saves about 12 bytes / pixel memory usage.
…mory. This saves about 12 bytes / pixel memory usage.
for block orders into three parts: * an std::vector<uint8_t> for coeff indexes within blocks * an std::vector<float> for block errors corresponding to above indexes * an std::vector<int> for offsets into the above two arrays for each block
Actual memory usage on a 1 MP image was 110 MiB.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR continues to address #11
Peak memory usage of the ~1MP station.png file from the test corpus went from 161 MiB to 110 MiB.