[Read Only]Sfx sounds #420

ghost · 2018-04-16T15:08:54Z

A lot of changes after #372.
To do:

To do (after?)

updating listener position,
RE calculating sound volume,
some continuous sounds have break time (how long?),
resampling sfx.

As always feedback and criticism are welcome.

#edit1 implemented hardcoded table for translating between script and sfx numeration.
#edit2 plugged leaks.
#edit3 fixed build system.

darkf · 2018-05-06T15:34:54Z

rwlib/source/loaders/LoaderSDT.cpp

@@ -116,6 +117,46 @@ char* LoaderSDT::loadToMemory(size_t index, bool asWave) {
        return nullptr;
 }

+static int read_packet(void *opaque, uint8_t *buf, int buf_size) {


Can you make opaque a more useful name? Also, buf_size should be a size_t.

Api forces buf_size to to be int.

About upaque, I don't have better idea.

is it a 'handle'?

If this is a callback the way it's implemented is already a good choice.
There should probably be a comment stating that this is an // ffmpeg XYZ callback (whatever XYZ is).

However, when casting the opaque you could give a more descriptive name than bd (although it's somewhat self documenting due to the cast)

darkf · 2018-05-06T15:46:55Z

You don't use loadSound yet so I'm assuming this is still majorly WIP, but make sure its returned context is freed -- I wonder if it would not be better to use an RAII wrapper anyway.

Also needs a rebase ATM.

ghost · 2018-05-06T16:51:42Z

Please check: https://github.com/rwengine/openrw/pull/420/files#diff-e9cc6b7c0e9b40ae49ea18ed92518bfcR205
Using RAII is quite hard, all code of ffmpeg is written in C. So it's hard to balance between transparency and convenience of using. I mean AVFormatContext or custom RAII class.

Lihis · 2018-05-14T19:02:12Z

rwlib/source/loaders/LoaderSDT.cpp

+    ioBuffer = reinterpret_cast<uint8_t*>(av_malloc(ioBufferSize)); /// Will be freeded in SoundManager after buffering
+
+    bd = std::make_unique<bufferData>();
+    av_register_all();


av_register_all() is deprecated?

Yes (in ffmpeg 4.0), it's also unneeded. To remove.

Lihis · 2018-05-15T06:45:02Z

rwengine/src/audio/Sound.hpp

+    std::vector<int16_t> data;
+
+    size_t channels;
+    size_t sampleRate;


Why these two are type of size_t?

WaveHeader is using uint.

You're right, I missed that.

ghost · 2018-05-15T08:51:58Z

Two questions:
Should this pull also handle synchronization?

Should I prepare high level function for each opcode in SoundManager, without grabbing reference of sound? (Example of that high level function is playSound for 018c)

ghost · 2018-05-26T16:02:39Z

rwengine/src/audio/Sound.hpp

+
+    bool isPlaying() const;
+    bool isPaused() const;
+    bool isStoped() const;


Misspelled?

darkf · 2018-06-12T18:03:54Z

Synchronization of what, exactly?

Please leave opcode stuff to a follow-up PR as this is already large.

ghost · 2018-06-12T18:10:57Z

Yeah, pull is huge I'll try to extract/backport refactoring of code.

About synchronization, I was thinking about preparing ground for future resource manager. But it looks there's no need for now.

Function loadSound returns AVFormatContext with custom AVIOContext.

Most important changes: - SoundManager manage all avaible types of sounds, - each sound contains "direct" methods, (so we reduce duplicated searches on map by grabbing ref and calling all needed methods on it (additionally for most opcodes there high level wrapping methods)), - binaural sound(although graabing parameters of listener should be improved), - implementation all staff needed for handling sfx sounds.

Signed-off-by: Filip Gawin <filip.gawin@zoho.com>

Better, but there're some artifacts in case of wav files.

ghost · 2018-06-20T22:36:52Z

rwengine/src/script/modules/GTA3ModuleImpl.inl

@@ -17,6 +17,8 @@
 #include <data/CutsceneData.hpp>

 #include <boost/algorithm/string/predicate.hpp>
+#include <string>


ghost · 2018-06-20T22:38:26Z

rwengine/src/audio/SoundManager.hpp

+#include "audio/Sound.hpp"
+
+/// Script is using different numeration of sounds
+/// than postion index in sfx file.


ghost · 2018-06-20T22:39:04Z

rwengine/src/audio/SoundManager.hpp

+    int sfx;
+    int range;
+};
+/// Hardcoded array for translation script index into sfx index


translating

ghost · 2018-06-20T22:40:14Z

rwengine/src/audio/SoundManager.hpp


-    private:
-        std::vector<int16_t> data;
+    /// Setting velocity of velocity for openAL.


of listener

madebr · 2018-06-21T01:16:55Z

rwengine/src/audio/SoundManager.hpp

@@ -1,6 +1,7 @@
 #ifndef _RWENGINE_SOUNDMANAGER_HPP_
 #define _RWENGINE_SOUNDMANAGER_HPP_

+#include <algorithm>


You should include only what you use in that file. So algorithm is better included in the cpp file.

IIRC some small function in headers are using it.

ghost · 2018-08-13T14:18:18Z

Everything useful has been extracted. ;)

ghost mentioned this pull request Apr 16, 2018

FFmpeg sdt sound #372

Closed

4 tasks

ghost mentioned this pull request Apr 30, 2018

Update targeted FFmpeg version #427

Closed

darkf reviewed May 6, 2018

View reviewed changes

Lihis reviewed May 14, 2018

View reviewed changes

Lihis reviewed May 15, 2018

View reviewed changes

ghost reviewed May 26, 2018

View reviewed changes

ghost mentioned this pull request Jun 1, 2018

Fix ffmpeg deprecated warning: ‘void av_free_packet(AVPacket*)’ #497

Closed

Filip Gawin added 8 commits June 20, 2018 19:23

Use LoaderSDT to feed ffmpeg using sfx sounds

555fea0

Function loadSound returns AVFormatContext with custom AVIOContext.

Drop deprecated av_register_all

de935e4

Signed-off-by: Filip Gawin <filip.gawin@zoho.com>

More stl usage

2e7d868

Implement opcode 03d7

29f1412

Try to use libswresample

62077a5

Better, but there're some artifacts in case of wav files.

Fix sampling

9b844f0

Remove mutexes

f3f095d

ghost commented Jun 20, 2018

View reviewed changes

rwengine/src/audio/SoundManager.hpp

private:

std::vector<int16_t> data;

/// Setting velocity of velocity for openAL.

Copy link

Author

ghost Jun 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

of listener

madebr and others added 2 commits June 21, 2018 02:23

use rwfs::path in sound loader

73c635f

Cleanup 2

7603c4b

madebr reviewed Jun 21, 2018

View reviewed changes

ghost mentioned this pull request Jun 21, 2018

Prepare sdt loader for ffmpeg #522

Merged

ghost mentioned this pull request Jul 26, 2018

Implement methods for sfx, and refactor Sound system #558

Merged

ghost changed the title ~~[Wip]Sfx sounds~~ [Read Only]Sfx sounds Aug 4, 2018

ghost closed this Aug 13, 2018

ghost deleted the sfxSounds branch August 16, 2018 11:50

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Read Only]Sfx sounds #420

[Read Only]Sfx sounds #420

ghost commented Apr 16, 2018 •

edited by ghost

Loading

darkf May 6, 2018 •

edited

Loading

ghost May 14, 2018

ghost May 15, 2018

madebr Jun 20, 2018

ghost Jun 20, 2018

JayFoxRox Jun 20, 2018

darkf commented May 6, 2018 •

edited

Loading

ghost commented May 6, 2018

Lihis May 14, 2018 •

edited

Loading

ghost May 14, 2018

Lihis May 15, 2018

ghost May 15, 2018

Lihis May 15, 2018

ghost commented May 15, 2018

ghost May 26, 2018

ghost May 26, 2018

darkf commented Jun 12, 2018

ghost commented Jun 12, 2018

ghost Jun 20, 2018

ghost Jun 20, 2018

ghost Jun 20, 2018

ghost Jun 20, 2018

madebr Jun 21, 2018

ghost Jun 21, 2018

ghost commented Aug 13, 2018

[Read Only]Sfx sounds #420

[Read Only]Sfx sounds #420

Conversation

ghost commented Apr 16, 2018 • edited by ghost Loading

darkf May 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

darkf commented May 6, 2018 • edited Loading

ghost commented May 6, 2018

Lihis May 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented May 15, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

darkf commented Jun 12, 2018

ghost commented Jun 12, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Aug 13, 2018

ghost commented Apr 16, 2018 •

edited by ghost

Loading

darkf May 6, 2018 •

edited

Loading

darkf commented May 6, 2018 •

edited

Loading

Lihis May 14, 2018 •

edited

Loading