Handle odd width and height in the MediaSource renderer.

remoting/client/plugin/media_source_video_renderer.cc

 // Copyright 2014 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/client/plugin/media_source_video_renderer.h"
 
 #include <string.h>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 47 matching lines @@
   base::Time::Exploded millennium_exploded;
   memset(&millennium_exploded, 0, sizeof(millennium_exploded));
   millennium_exploded.year = 2001;
   millennium_exploded.month = 1;
   millennium_exploded.day_of_month = 1;
   segment_->GetSegmentInfo()->set_date_utc(
       (base::Time::Now() - base::Time::FromUTCExploded(millennium_exploded))
           .InMicroseconds() *
       base::Time::kNanosecondsPerMicrosecond);
 
-  segment_->AddVideoTrack(frame_size_.width(), frame_size_.height(), 1);
+  uint64 crop_right = 0;
+  int width = frame_size_.width();
+  if (width % 2 == 1) {
+    ++width;
+    crop_right = 1;
+  }
+
+  uint64 crop_bottom = 0;
+  int height = frame_size_.height();
+  if (height % 2 == 1) {
+    ++height;
+    crop_bottom = 1;
+  }
+
+  segment_->AddVideoTrack(width, height, 1);
   mkvmuxer::VideoTrack* video_track =
       reinterpret_cast<mkvmuxer::VideoTrack*>(segment_->GetTrackByNumber(1));
+  video_track->set_crop_right(crop_right);
+  video_track->set_crop_bottom(crop_bottom);
   video_track->set_frame_rate(base::Time::kNanosecondsPerSecond /
                               kFrameIntervalNs);
   video_track->set_default_duration(base::Time::kNanosecondsPerSecond);
   mkvmuxer::SegmentInfo* const info = segment_->GetSegmentInfo();
   info->set_writing_app("ChromotingViewer");
   info->set_muxing_app("ChromotingViewer");
 }
 
 MediaSourceVideoRenderer::VideoWriter::~VideoWriter() {}
 
@@ skipping 117 matching lines @@
     desktop_shape_.Swap(&desktop_shape);
     delegate_->OnMediaSourceShape(desktop_shape_);
   }
 
   scoped_ptr<VideoWriter::DataBuffer> buffer =
       writer_->OnVideoFrame(packet->data());
   delegate_->OnMediaSourceData(&(*(buffer->begin())), buffer->size());
 }
 
 }  // namespace remoting