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

Side by Side Diff: remoting/codec/video_encoder_vpx.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/codec/video_encoder_vpx.h" 5 #include "remoting/codec/video_encoder_vpx.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 if (use_vp9_) { 396 if (use_vp9_) {
397 SetVp9CodecParameters(&config, size, lossless_color_, lossless_encode_); 397 SetVp9CodecParameters(&config, size, lossless_color_, lossless_encode_);
398 } else { 398 } else {
399 SetVp8CodecParameters(&config, size); 399 SetVp8CodecParameters(&config, size);
400 } 400 }
401 401
402 // Initialize or re-configure the codec with the custom configuration. 402 // Initialize or re-configure the codec with the custom configuration.
403 if (!codec_) { 403 if (!codec_) {
404 codec_.reset(new vpx_codec_ctx_t); 404 codec_.reset(new vpx_codec_ctx_t);
405 ret = vpx_codec_enc_init(codec_.get(), interface, &config, 0); 405 ret = vpx_codec_enc_init(codec_.get(), interface, &config, 0);
406 CHECK_EQ(VPX_CODEC_OK, ret) << "Failed to initialize codec"; 406 // Failed to initialize codec
407 CHECK_EQ(VPX_CODEC_OK, ret);
407 } else { 408 } else {
408 ret = vpx_codec_enc_config_set(codec_.get(), &config); 409 ret = vpx_codec_enc_config_set(codec_.get(), &config);
409 CHECK_EQ(VPX_CODEC_OK, ret) << "Failed to reconfigure codec"; 410 // Failed to reconfigure codec
411 CHECK_EQ(VPX_CODEC_OK, ret);
410 } 412 }
411 413
412 // Apply further customizations to the codec now it's initialized. 414 // Apply further customizations to the codec now it's initialized.
413 if (use_vp9_) { 415 if (use_vp9_) {
414 SetVp9CodecOptions(codec_.get(), lossless_encode_); 416 SetVp9CodecOptions(codec_.get(), lossless_encode_);
415 } else { 417 } else {
416 SetVp8CodecOptions(codec_.get()); 418 SetVp8CodecOptions(codec_.get());
417 } 419 }
418 } 420 }
419 421
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 kMacroBlockSize * (y + 1))); 544 kMacroBlockSize * (y + 1)));
543 } 545 }
544 x0 = x1 + 1; 546 x0 = x1 + 1;
545 } 547 }
546 } 548 }
547 updated_region->IntersectWith( 549 updated_region->IntersectWith(
548 webrtc::DesktopRect::MakeWH(image_->w, image_->h)); 550 webrtc::DesktopRect::MakeWH(image_->w, image_->h));
549 } 551 }
550 552
551 } // namespace remoting 553 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698