Clean up video frame sizes, types in Video Decode API

webkit/plugins/ppapi/ppb_video_decoder_impl.cc

 // Copyright (c) 2011 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/plugins/ppapi/ppb_video_decoder_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "media/video/picture.h"
@@ skipping 123 matching lines @@
   &Flush,
   &Abort,
 };
 
 // Utility methods to convert data to and from the ppapi C-types and their
 // C++ media-namespace equivalents.
 void CopyToPictureDev(const media::Picture& input, PP_Picture_Dev* output) {
   DCHECK(output);
   output->picture_buffer_id = input.picture_buffer_id();
   output->bitstream_buffer_id = input.bitstream_buffer_id();
-  output->visible_size =
-      PP_MakeSize(input.visible_size().width(), input.visible_size().height());
-  output->decoded_size =
-      PP_MakeSize(input.decoded_size().width(), input.decoded_size().height());
 }
 
 void CopyToConfigList(
     const PP_VideoConfigElement* configs, std::vector<uint32>* output) {
   DCHECK(configs);
   DCHECK(output);
   // TODO(vrk): This is assuming PP_VideoAttributeDictionary and
   // VideoAttributeKey have identical enum values. There is no compiler
   // assert to guarantee this. We either need to add such asserts or
   // merge PP_VideoAttributeDictionary and VideoAttributeKey.
@@ skipping 141 matching lines @@
     return false;
 
   // Store the callback to be called when Abort() is done.
   // TODO(vmr): Check for current flush/abort operations.
   abort_callback_ = callback;
 
   return platform_video_decoder_->Abort();
 }
 
 void PPB_VideoDecoder_Impl::ProvidePictureBuffers(
-    uint32 requested_num_of_buffers,
-    const gfx::Size& dimensions,
-    media::VideoDecodeAccelerator::MemoryType type) {
+    uint32 requested_num_of_buffers, const gfx::Size& dimensions) {
   if (!ppp_videodecoder_)
     return;
 
-  // TODO(vrk): Compiler assert or use switch statement instead of making
-  // a blind cast.
-  PP_PictureBufferType_Dev out_type =
-      static_cast<PP_PictureBufferType_Dev>(type);
   PP_Size out_dim = PP_MakeSize(dimensions.width(), dimensions.height());
   ScopedResourceId resource(this);
   ppp_videodecoder_->ProvidePictureBuffers(
-      resource.id, requested_num_of_buffers, out_dim, out_type);
+      resource.id, requested_num_of_buffers, out_dim);
 }
 
 void PPB_VideoDecoder_Impl::PictureReady(const media::Picture& picture) {
   if (!ppp_videodecoder_)
     return;
 
   ScopedResourceId resource(this);
   PP_Picture_Dev out_pic;
   CopyToPictureDev(picture, &out_pic);
   ppp_videodecoder_->PictureReady(resource.id, out_pic);
@@ skipping 84 matching lines @@
     : info_(buffer.info) {
   scoped_refptr<webkit::ppapi::PPB_Buffer_Impl> pepper_buffer =
       webkit::ppapi::Resource::GetAs<webkit::ppapi::PPB_Buffer_Impl>(
           buffer.data);
   assert(pepper_buffer->is_mapped());
   data_ = pepper_buffer->mapped_buffer();
 }
 
 Picture::Picture(const PP_Picture_Dev& picture)
     : picture_buffer_id_(picture.picture_buffer_id),
-      bitstream_buffer_id_(picture.bitstream_buffer_id),
-      visible_size_(picture.visible_size.width, picture.visible_size.height),
-      decoded_size_(picture.decoded_size.width, picture.decoded_size.height) {
+      bitstream_buffer_id_(picture.bitstream_buffer_id) {
 }
 
 }  // namespace media