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

Unified Diff: remoting/base/decoder_zlib.cc

Issue 3034035: [chromoting] Use zlib as the default encoder and decoder (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 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 | « chrome/service/service_process.cc ('k') | remoting/client/plugin/pepper_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/decoder_zlib.cc
diff --git a/remoting/base/decoder_zlib.cc b/remoting/base/decoder_zlib.cc
index 59f985214bee538e31e4199c66d9bbfd85c0a4dc..3e23f95bc76023f24bfddcf4249fff9b76201468 100644
--- a/remoting/base/decoder_zlib.cc
+++ b/remoting/base/decoder_zlib.cc
@@ -22,15 +22,18 @@ DecoderZlib::DecoderZlib()
}
bool DecoderZlib::BeginDecode(scoped_refptr<media::VideoFrame> frame,
- UpdatedRects* updated_rects,
- Task* partial_decode_done,
- Task* decode_done) {
+ UpdatedRects* updated_rects,
+ Task* partial_decode_done,
+ Task* decode_done) {
DCHECK(!partial_decode_done_.get());
DCHECK(!decode_done_.get());
DCHECK(!updated_rects_);
DCHECK_EQ(kWaitingForBeginRect, state_);
- CHECK(static_cast<PixelFormat>(frame->format()) == PixelFormatRgb32)
- << "Only RGB32 is supported";
+
+ if (static_cast<PixelFormat>(frame->format()) != PixelFormatRgb32) {
+ LOG(INFO) << "DecoderZlib only supports RGB32.";
+ return false;
+ }
partial_decode_done_.reset(partial_decode_done);
decode_done_.reset(decode_done);
« no previous file with comments | « chrome/service/service_process.cc ('k') | remoting/client/plugin/pepper_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698