Always re-encode the image in image_streamer
Makes it so we can change the compression
Change-Id: Ibbf4b7e25eb8a3bb70d3256fbc09bcf1a580ea40
diff --git a/y2019/image_streamer/image_streamer.cc b/y2019/image_streamer/image_streamer.cc
index ed581e2..ebcd0b2 100644
--- a/y2019/image_streamer/image_streamer.cc
+++ b/y2019/image_streamer/image_streamer.cc
@@ -280,15 +280,12 @@
sampling = 0;
}
- std::string image_out;
+ ::std::string image_out;
- if (flip_) {
- unsigned int out_size = image_buffer_out_.size();
- flip_image(data.data(), data.size(), &image_buffer_out_[0], &out_size);
- image_out.assign(&image_buffer_out_[0], &image_buffer_out_[out_size]);
- } else {
- image_out = std::string(data);
- }
+ unsigned int out_size = image_buffer_out_.size();
+ flip_image(data.data(), data.size(), &image_buffer_out_[0], &out_size,
+ flip_);
+ image_out.assign(&image_buffer_out_[0], &image_buffer_out_[out_size]);
if (active_) {
auto frame = std::make_shared<Frame>(Frame{image_out});