ExternalClearKey: remove row-by-row copy code from libvpx wrapper.

webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc

 // Copyright (c) 2012 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 "webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
@@ skipping 10 matching lines @@
 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to
 // copy video frame data.
 // #define USE_COPYPLANE_WITH_LIBVPX 1
 
 namespace webkit_media {
 
 static const int kDecodeThreads = 2;
 
-#if defined(USE_COPYPLANE_WITH_LIBVPX)
-static void CopyPlane(const uint8_t* source,
-                      int32_t source_stride,
-                      int32_t target_stride,
-                      int32_t rows,
-                      int32_t copy_bytes_per_row,
-                      uint8_t* target) {
-  DCHECK(source);
-  DCHECK(target);
-  DCHECK_LE(copy_bytes_per_row, source_stride);
-  DCHECK_LE(copy_bytes_per_row, target_stride);
-
-  for (int i = 0; i < rows; ++i) {
-    const int source_offset = i * source_stride;
-    const int target_offset = i * target_stride;
-    memcpy(target + target_offset,
-           source + source_offset,
-           copy_bytes_per_row);
-  }
-}
-#endif  // USE_COPYPLANE_WITH_LIBVPX
-
 LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Host* host)
     : is_initialized_(false),
       host_(host),
       vpx_codec_(NULL),
       vpx_image_(NULL) {
 }
 
 LibvpxCdmVideoDecoder::~LibvpxCdmVideoDecoder() {
   Deinitialize();
 }
@@ skipping 99 matching lines @@
 
   return cdm::kSuccess;
 }
 
 bool LibvpxCdmVideoDecoder::CopyVpxImageTo(cdm::VideoFrame* cdm_video_frame) {
   DCHECK(cdm_video_frame);
   DCHECK_EQ(vpx_image_->fmt, VPX_IMG_FMT_I420);
   DCHECK_EQ(vpx_image_->d_w % 2, 0U);
   DCHECK_EQ(vpx_image_->d_h % 2, 0U);
 
-#if defined(USE_COPYPLANE_WITH_LIBVPX)
-  const int y_size = vpx_image_->d_w * vpx_image_->d_h;
-  const int uv_size = y_size / 2;
-  const int space_required = y_size + (uv_size * 2);
-
-  DCHECK(!cdm_video_frame->FrameBuffer());
-  cdm_video_frame->SetFrameBuffer(host_->Allocate(space_required));
-  if (!cdm_video_frame->FrameBuffer()) {
-    LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
-    return false;
-  }
-  cdm_video_frame->FrameBuffer()->SetSize(space_required);
-
-  CopyPlane(vpx_image_->planes[VPX_PLANE_Y],
-            vpx_image_->stride[VPX_PLANE_Y],
-            vpx_image_->d_w,
-            vpx_image_->d_h,
-            vpx_image_->d_w,
-            cdm_video_frame->FrameBuffer()->Data());
-
-  const int uv_stride = vpx_image_->d_w / 2;
-  const int uv_rows = vpx_image_->d_h / 2;
-  CopyPlane(vpx_image_->planes[VPX_PLANE_U],
-            vpx_image_->stride[VPX_PLANE_U],
-            uv_stride,
-            uv_rows,
-            uv_stride,
-            cdm_video_frame->FrameBuffer()->Data() + y_size);
-
-  CopyPlane(vpx_image_->planes[VPX_PLANE_V],
-            vpx_image_->stride[VPX_PLANE_V],
-            uv_stride,
-            uv_rows,
-            uv_stride,
-            cdm_video_frame->FrameBuffer()->Data() + y_size + uv_size);
-
-  cdm_video_frame->SetFormat(cdm::kYv12);
-
-  cdm::Size video_frame_size;
-  video_frame_size.width = vpx_image_->d_w;
-  video_frame_size.height = vpx_image_->d_h;
-  cdm_video_frame->SetSize(video_frame_size);
-
-  cdm_video_frame->SetPlaneOffset(cdm::VideoFrame::kYPlane, 0);
-  cdm_video_frame->SetPlaneOffset(cdm::VideoFrame::kUPlane, y_size);
-  cdm_video_frame->SetPlaneOffset(cdm::VideoFrame::kVPlane,
-                                    y_size + uv_size);
-
-  cdm_video_frame->SetStride(cdm::VideoFrame::kYPlane, vpx_image_->d_w);
-  cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane, uv_stride);
-  cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane, uv_stride);
-#else
   const int y_size = vpx_image_->stride[VPX_PLANE_Y] * vpx_image_->d_h;
   const int uv_rows = vpx_image_->d_h / 2;
   const int u_size = vpx_image_->stride[VPX_PLANE_U] * uv_rows;
   const int v_size = vpx_image_->stride[VPX_PLANE_V] * uv_rows;
   const int space_required = y_size + u_size + v_size;
 
   DCHECK(!cdm_video_frame->FrameBuffer());
   cdm_video_frame->SetFrameBuffer(host_->Allocate(space_required));
   if (!cdm_video_frame->FrameBuffer()) {
     LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
@@ skipping 22 matching lines @@
   cdm_video_frame->SetPlaneOffset(cdm::VideoFrame::kUPlane, y_size);
   cdm_video_frame->SetPlaneOffset(cdm::VideoFrame::kVPlane,
                                     y_size + u_size);
 
   cdm_video_frame->SetStride(cdm::VideoFrame::kYPlane,
                               vpx_image_->stride[VPX_PLANE_Y]);
   cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane,
                               vpx_image_->stride[VPX_PLANE_U]);
   cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane,
                               vpx_image_->stride[VPX_PLANE_V]);
-#endif  // USE_COPYPLANE_WITH_LIBVPX
 
   return true;
 }
 
 }  // namespace webkit_media