diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 04:17:09 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 04:17:09 +0000 |
commit | 14fd1a60acdd439f80bdfc0aeb86761ba649db79 (patch) | |
tree | 5bfbcefbd8776ca6a4d810a75601d8bf62d91a7c /remoting/base | |
parent | 07f1ceeabc0cf63ed8d7ae7aa8d1ff04dda02584 (diff) | |
download | chromium_src-14fd1a60acdd439f80bdfc0aeb86761ba649db79.zip chromium_src-14fd1a60acdd439f80bdfc0aeb86761ba649db79.tar.gz chromium_src-14fd1a60acdd439f80bdfc0aeb86761ba649db79.tar.bz2 |
Add VideoReader and VideoWriter interfaces.
Implemented VideoReader and VideoWriter for RTP and Protobuf.
BUG=53986
TEST=None
Review URL: http://codereview.chromium.org/4229003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
-rw-r--r-- | remoting/base/decoder_vp8.cc | 4 | ||||
-rw-r--r-- | remoting/base/encoder_vp8.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/remoting/base/decoder_vp8.cc b/remoting/base/decoder_vp8.cc index a8d5245..46a6d31 100644 --- a/remoting/base/decoder_vp8.cc +++ b/remoting/base/decoder_vp8.cc @@ -63,8 +63,6 @@ void DecoderVp8::DecodeBytes(const std::string& encoded_bytes) { } } - LOG(WARNING) << "Decoding " << encoded_bytes.size(); - // Do the actual decoding. vpx_codec_err_t ret = vpx_codec_decode( codec_, reinterpret_cast<const uint8*>(encoded_bytes.data()), @@ -73,6 +71,7 @@ void DecoderVp8::DecodeBytes(const std::string& encoded_bytes) { LOG(INFO) << "Decoding failed:" << vpx_codec_err_to_string(ret) << "\n" << "Details: " << vpx_codec_error(codec_) << "\n" << vpx_codec_error_detail(codec_); + return; } // Gets the decoded data. @@ -80,6 +79,7 @@ void DecoderVp8::DecodeBytes(const std::string& encoded_bytes) { vpx_image_t* image = vpx_codec_get_frame(codec_, &iter); if (!image) { LOG(INFO) << "No video frame decoded"; + return; } // Perform YUV conversion. diff --git a/remoting/base/encoder_vp8.cc b/remoting/base/encoder_vp8.cc index 7a58f7b..3a0f75b 100644 --- a/remoting/base/encoder_vp8.cc +++ b/remoting/base/encoder_vp8.cc @@ -188,8 +188,7 @@ void EncoderVp8::Encode(scoped_refptr<CaptureData> capture_data, switch (packet->kind) { case VPX_CODEC_CX_FRAME_PKT: got_data = true; - message->set_data( - packet->data.frame.buf, packet->data.frame.sz); + message->set_data(packet->data.frame.buf, packet->data.frame.sz); break; default: break; |