Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

content/browser/renderer_host/media/video_capture_controller.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 "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 280 matching lines @@
     for (const auto& client : controller_clients_) {
       if (client->session_closed || client->paused)
         continue;
 
       scoped_ptr<base::DictionaryValue> copy_of_metadata;
       if (client == controller_clients_.back())
         copy_of_metadata = metadata.Pass();
       else
         copy_of_metadata.reset(metadata->DeepCopy());
 
-      if (frame->format() == VideoFrame::NATIVE_TEXTURE) {
+      if (frame->storage_type() == VideoFrame::STORAGE_TEXTURE) {
         DCHECK(frame->coded_size() == frame->visible_rect().size())
             << "Textures are always supposed to be tightly packed.";
-        DCHECK_EQ(1u, VideoFrame::NumTextures(frame->texture_format()));
+        DCHECK_EQ(1u, VideoFrame::NumPlanes(frame->format()));
         client->event_handler->OnMailboxBufferReady(
             client->controller_id, buffer_id, frame->mailbox_holder(0),
             frame->coded_size(), timestamp, copy_of_metadata.Pass());
       } else if (frame->format() == media::VideoFrame::I420) {
         bool is_new_buffer = client->known_buffers.insert(buffer_id).second;
         if (is_new_buffer) {
           // On the first use of a buffer on a client, share the memory handle.
           size_t memory_size = 0;
           base::SharedMemoryHandle remote_handle = buffer_pool_->ShareToProcess(
               buffer_id, client->render_process_handle, &memory_size);
@@ skipping 98 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   int active_client_count = 0;
   for (ControllerClient* client : controller_clients_) {
     if (!client->paused)
       ++active_client_count;
   }
   return active_client_count;
 }
 
 }  // namespace content