Changeset 34906 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 9, 2010 4:29:49 PM (14 years ago)

Author:

vboxsync

Message:

Initial audio filter implementation, which is used for audio input via remote desktop server.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (1 diff)
• ConsoleVRDPServer.h (modified) (5 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -168 +168 @@
     Display *getDisplay() const { return mDisplay; }
     MachineDebugger *getMachineDebugger() const { return mDebugger; }
+    AudioSniffer *getAudioSniffer() const { return mAudioSniffer; }
 
     const ComPtr<IMachine> &machine() const { return mMachine; }

trunk/src/VBox/Main/include/ConsoleVRDPServer.h

@@ -128 +128 @@
     void QueryInfo (uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) const;
 
+    int SendAudioInputBegin(void **ppvUserCtx,
+                            void *pvContext,
+                            uint32_t cSamples,
+                            uint32_t iSampleHz,
+                            uint32_t cChannels,
+                            uint32_t cBits);
+
+    void SendAudioInputEnd(void *pvUserCtx);
+
 private:
     /* Note: This is not a ComObjPtr here, because the ConsoleVRDPServer object
@@ -135 +144 @@
 
     HVRDESERVER mhServer;
+    int mServerInterfaceVersion;
 
     static int loadVRDPLibrary (const char *pszLibraryName);
@@ -143 +153 @@
     static PFNVRDECREATESERVER mpfnVRDECreateServer;
 
-    static VRDEENTRYPOINTS_1 *mpEntryPoints;
-    static VRDECALLBACKS_1 mCallbacks;
+    static VRDEENTRYPOINTS_3 mEntryPoints;
+    static VRDEENTRYPOINTS_3 *mpEntryPoints;
+    static VRDECALLBACKS_3 mCallbacks;
 
     static DECLCALLBACK(int)  VRDPCallbackQueryProperty     (void *pvCallback, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut);
@@ -158 +169 @@
     static DECLCALLBACK(void) VRDPCallbackInput             (void *pvCallback, int type, const void *pvInput, unsigned cbInput);
     static DECLCALLBACK(void) VRDPCallbackVideoModeHint     (void *pvCallback, unsigned cWidth, unsigned cHeight,  unsigned cBitsPerPixel, unsigned uScreenId);
+    static DECLCALLBACK(void) VRDECallbackAudioIn           (void *pvCallback, void *pvCtx, uint32_t u32ClientId, uint32_t u32Event, const void *pvData, uint32_t cbData);
 
     bool m_fGuestWantsAbsolute;
@@ -212 +224 @@
     PAUTHENTRY2 mpfnAuthEntry2;
     PAUTHENTRY3 mpfnAuthEntry3;
+
+    uint32_t volatile mu32AudioInputClientId;
 };