Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1019)

Unified Diff: remoting/base/decompressor_zlib.cc

Issue 2815043: zlib decompression for chromoting (Closed)
Patch Set: git try Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/decompressor_zlib.h ('k') | remoting/base/decompressor_zlib_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/decompressor_zlib.cc
diff --git a/remoting/base/decompressor_zlib.cc b/remoting/base/decompressor_zlib.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e3060bd8d38e425c4418926772375ea2d48d1afc
--- /dev/null
+++ b/remoting/base/decompressor_zlib.cc
@@ -0,0 +1,63 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "remoting/base/decompressor_zlib.h"
+
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+// The code below uses the MOZ_Z_ forms of these functions in order that things
+// should work on Windows. In order to make this code cross platform, we map
+// back to the normal functions here in the case that we are using the system
+// zlib.
+#define MOZ_Z_inflate inflate
+#define MOZ_Z_inflateEnd inflateEnd
+#define MOZ_Z_inflateInit_ inflateInit_
+#else
+#include "third_party/zlib/zlib.h"
+#endif
+#include "base/logging.h"
+
+namespace remoting {
+
+DecompressorZlib::DecompressorZlib() {
+ stream_.reset(new z_stream());
+
+ stream_->next_in = Z_NULL;
+ stream_->zalloc = Z_NULL;
+ stream_->zfree = Z_NULL;
+ stream_->opaque = Z_NULL;
+
+ inflateInit(stream_.get());
+}
+
+DecompressorZlib::~DecompressorZlib() {
+ inflateEnd(stream_.get());
+}
+
+bool DecompressorZlib::Process(const uint8* input_data, int input_size,
+ uint8* output_data, int output_size,
+ int* consumed, int* written) {
+ DCHECK_GT(output_size, 0);
+
+ // Setup I/O parameters.
+ stream_->avail_in = input_size;
+ stream_->next_in = (Bytef*)input_data;
+ stream_->avail_out = output_size;
+ stream_->next_out = (Bytef*)output_data;
+
+ int ret = inflate(stream_.get(), Z_NO_FLUSH);
+ if (ret == Z_STREAM_ERROR) {
+ NOTREACHED() << "zlib compression failed";
+ }
+
+ *consumed = input_size - stream_->avail_in;
+ *written = output_size - stream_->avail_out;
+
+ // Since we check that output is always greater than 0, the only
+ // reason for us to get Z_BUF_ERROR is when zlib requires more input
+ // data.
+ return ret == Z_OK || ret == Z_BUF_ERROR;
+}
+
+} // namespace remoting
« no previous file with comments | « remoting/base/decompressor_zlib.h ('k') | remoting/base/decompressor_zlib_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698