Revert 110602 - Revert 110587 - Microphone support for Pepper Flash.

webkit/plugins/ppapi/plugin_delegate.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 162 matching lines @@
 
     // Set an optional callback that will be invoked when the context is lost
     // (e.g. gpu process crash). Takes ownership of the callback.
     virtual void SetContextLostCallback(
         const base::Callback<void()>& callback) = 0;
 
     // Run the callback once the channel has been flushed.
     virtual bool Echo(const base::Callback<void()>& callback) = 0;
   };
 
+  // The (interface for the) client used by |PlatformAudio| and
+  // |PlatformAudioInput|.
+  class PlatformAudioCommonClient {
+   protected:
+    virtual ~PlatformAudioCommonClient() {}
+
+   public:
+    // Called when the stream is created.
+    virtual void StreamCreated(base::SharedMemoryHandle shared_memory_handle,
+                               size_t shared_memory_size,
+                               base::SyncSocket::Handle socket) = 0;
+  };
+
   class PlatformAudio {
    public:
-    class Client {
-     protected:
-      virtual ~Client() {}
-
-     public:
-      // Called when the stream is created.
-      virtual void StreamCreated(base::SharedMemoryHandle shared_memory_handle,
-                                 size_t shared_memory_size,
-                                 base::SyncSocket::Handle socket) = 0;
-    };
-
     // Starts the playback. Returns false on error or if called before the
     // stream is created or after the stream is closed.
     virtual bool StartPlayback() = 0;
 
     // Stops the playback. Returns false on error or if called before the stream
     // is created or after the stream is closed.
     virtual bool StopPlayback() = 0;
 
     // Closes the stream. Make sure to call this before the object is
     // destructed.
     virtual void ShutDown() = 0;
 
    protected:
     virtual ~PlatformAudio() {}
   };
 
+  class PlatformAudioInput {
+   public:
+    // Starts the playback. Returns false on error or if called before the
+    // stream is created or after the stream is closed.
+    virtual bool StartCapture() = 0;
+
+    // Stops the capture. Returns false on error or if called before the stream
+    // is created or after the stream is closed.
+    virtual bool StopCapture() = 0;
+
+    // Closes the stream. Make sure to call this before the object is
+    // destructed.
+    virtual void ShutDown() = 0;
+
+   protected:
+    virtual ~PlatformAudioInput() {}
+  };
+
   // Interface for PlatformVideoDecoder is directly inherited from general media
   // VideoDecodeAccelerator interface.
   class PlatformVideoDecoder : public media::VideoDecodeAccelerator {
    protected:
     virtual ~PlatformVideoDecoder() {}
   };
 
   class PlatformVideoCapture : public media::VideoCapture {
    public:
     virtual ~PlatformVideoCapture() {}
@@ skipping 56 matching lines @@
 
   // The caller will own the pointer returned from this.
   virtual PlatformVideoDecoder* CreateVideoDecoder(
       media::VideoDecodeAccelerator::Client* client,
       int32 command_buffer_route_id) = 0;
 
   // The caller is responsible for calling Shutdown() on the returned pointer
   // to clean up the corresponding resources allocated during this call.
   virtual PlatformAudio* CreateAudio(uint32_t sample_rate,
                                      uint32_t sample_count,
-                                     PlatformAudio::Client* client) = 0;
+                                     PlatformAudioCommonClient* client) = 0;
+
+  // The caller is responsible for calling Shutdown() on the returned pointer
+  // to clean up the corresponding resources allocated during this call.
+  virtual PlatformAudioInput* CreateAudioInput(uint32_t sample_rate,
+      uint32_t sample_count,
+      PlatformAudioCommonClient* client) = 0;
 
   // A pointer is returned immediately, but it is not ready to be used until
   // BrokerConnected has been called.
   // The caller is responsible for calling Release() on the returned pointer
   // to clean up the corresponding resources allocated during this call.
   virtual PpapiBroker* ConnectToPpapiBroker(
       webkit::ppapi::PPB_Broker_Impl* client) = 0;
 
   // Notifies that the number of find results has changed.
   virtual void NumberOfFindResultsChanged(int identifier,
@@ skipping 158 matching lines @@
   virtual void DidReceiveMouseEvent(PluginInstance* instance) = 0;
 
   // Determines if the browser entered fullscreen mode.
   virtual bool IsInFullscreenMode() = 0;
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_