Merge pull request #458 from Mystler/webm

WebM Movie Player (VP9/Opus)

Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt

@@ -23,6 +23,7 @@ set(plAudio_SOURCES
     plWin32StaticSound.cpp
     plWin32StreamingSound.cpp
     plWinMicLevel.cpp
+    plWin32VideoSound.cpp
 )
 
 set(plAudio_HEADERS
@@ -40,6 +41,7 @@ set(plAudio_HEADERS
     plWin32StaticSound.h
     plWin32StreamingSound.h
     plWinMicLevel.h
+    plWin32VideoSound.h
 )
 
 add_library(plAudio STATIC ${plAudio_SOURCES} ${plAudio_HEADERS})

Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp

@@ -619,6 +619,16 @@ void    plDSoundBuffer::Play( void )
 
 }
 
+//// Pause ///////////////////////////////////////////////////////////////////
+
+void plDSoundBuffer::Pause()
+{
+    if (!source)
+        return;
+    alSourcePause(source);
+    alGetError();
+}
+
 //// Stop ////////////////////////////////////////////////////////////////////
 
 void    plDSoundBuffer::Stop( void )

Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h

@@ -73,8 +73,9 @@ public:
 
     void        Play( void );
     void        Stop( void );
-    void        Rewind() ;
-    
+    void        Rewind();
+    void        Pause();
+
     uint32_t      GetLengthInBytes( void ) const;
     void        SetScalarVolume( float volume ); // Sets the volume, but on a range from 0 to 1
 

Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp

@@ -435,7 +435,7 @@ bool plVoiceSound::LoadSound( bool is3D )
     header.fBitsPerSample  = 16;
     header.fNumChannels = 1;
     header.fNumSamplesPerSec = FREQUENCY;
-    header.fBlockAlign = header.fNumChannels * header.fBitsPerSample / 2;
+    header.fBlockAlign = header.fNumChannels * header.fBitsPerSample / 8;
     header.fAvgBytesPerSec = header.fNumSamplesPerSec * header.fBlockAlign;
 
     fDSoundBuffer = new plDSoundBuffer(0, header, true, false, false, true);

Sources/Plasma/PubUtilLib/plAudio/plWin32VideoSound.cpp

@@ -0,0 +1,119 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+      Cyan Worlds, Inc.
+      14617 N Newport Hwy
+      Mead, WA   99021
+
+*==LICENSE==*/
+
+#include "plWin32VideoSound.h"
+
+#include "hsResMgr.h"
+#include "plFormat.h"
+#include "plDSoundBuffer.h"
+
+static int uniqueID = 0;
+plWin32VideoSound::plWin32VideoSound(const plWAVHeader& header) : plWin32Sound()
+{
+    fCurrVolume = 1.0f;
+    fDesiredVol = 1.0f;
+    fSoftVolume = 1.0f;
+    fType = kGUISound;
+
+    fWAVHeader = header;
+    fDSoundBuffer = new plDSoundBuffer(0, fWAVHeader, false, false);
+
+    uniqueID++;
+    hsgResMgr::ResMgr()->NewKey(plFormat("videosound#{}", uniqueID), this, plLocation::kGlobalFixedLoc);
+}
+
+plWin32VideoSound::~plWin32VideoSound()
+{
+    if (fDSoundBuffer)
+        delete fDSoundBuffer;
+}
+
+void plWin32VideoSound::Play()
+{
+    IActuallyPlay();
+}
+
+void plWin32VideoSound::Pause(bool on)
+{
+    if (on)
+        fDSoundBuffer->Pause();
+    else if (!fReallyPlaying)
+        fDSoundBuffer->Play();
+    fReallyPlaying = !on;
+}
+
+void plWin32VideoSound::FillSoundBuffer(void* buffer, size_t size)
+{
+    fDSoundBuffer->FillBuffer(buffer, size, &fWAVHeader);
+    fDSoundBuffer->SetScalarVolume(1.0f);
+}
+
+void plWin32VideoSound::IDerivedActuallyPlay()
+{
+    if (!fReallyPlaying) {
+        fDSoundBuffer->Play();
+        fReallyPlaying = true;
+    }
+}
+
+bool plWin32VideoSound::LoadSound(bool is3D)
+{
+    hsAssert(false, "unimplemented cause unnecessary for this class");
+    return false;
+}
+
+void plWin32VideoSound::SetStartPos(unsigned bytes)
+{
+    //do nothing
+    hsAssert(false, "unimplemented cause unnecessary for this class");
+}
+
+float plWin32VideoSound::GetActualTimeSec()
+{
+    hsAssert(false, "unimplemented cause unnecessary for this class");
+    return 0;
+}
+
+void plWin32VideoSound::ISetActualTime(double t)
+{
+    hsAssert(false, "unimplemented cause unnecessary for this class");
+}

Sources/Plasma/PubUtilLib/plAudio/plWin32VideoSound.h

@@ -0,0 +1,67 @@
+/*==LICENSE==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011  Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+      Cyan Worlds, Inc.
+      14617 N Newport Hwy
+      Mead, WA   99021
+
+*==LICENSE==*/
+
+#ifndef plWin32VideoSound_h
+#define plWin32VideoSound_h
+
+#include "plWin32Sound.h"
+
+class plWin32VideoSound : public plWin32Sound
+{
+public:
+    plWin32VideoSound(const plWAVHeader& header);
+    virtual ~plWin32VideoSound();
+
+    virtual void Play();
+    virtual void Pause(bool on);
+    void FillSoundBuffer(void* buffer, size_t size);
+
+protected:
+    void IDerivedActuallyPlay(void);
+    bool LoadSound(bool is3D);
+    void SetStartPos(unsigned bytes);
+    float GetActualTimeSec();
+    void  ISetActualTime(double t);
+
+    plWAVHeader fWAVHeader;
+};
+#endif