Skip to content

Commit aa8972f

Browse files
PrevterPrevter
committed
pimpl everything, speed up writeFrame method
1 parent 73e3230 commit aa8972f

File tree

6 files changed

+164
-111
lines changed

6 files changed

+164
-111
lines changed

‎include/events.hpp‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,17 @@ namespace impl {
5353
void* m_ptr;
5454
};
5555

56-
class WriteFrameRecorderEvent : public geode::Event {
57-
public:
58-
WriteFrameRecorderEvent(void* ptr, const std::vector<uint8_t>& frameData) {
59-
m_ptr = ptr;
60-
m_frameData = &frameData;
61-
}
62-
63-
void setResult(geode::Result<>&& result) {m_result = std::move(result);}
64-
geode::Result<> getResult() {return m_result;}
56+
struct Dummy {};
6557

66-
void* getPtr() const {return m_ptr;}
67-
68-
const std::vector<uint8_t>& getFrameData() const {return *m_frameData;}
58+
class GetWriteFrameFunctionEvent : public geode::Event {
59+
public:
60+
using writeFrame_t = geode::Result<>(Dummy::*)(std::vector<uint8_t> const&);
61+
GetWriteFrameFunctionEvent() = default;
6962

63+
void setFunction(writeFrame_t function) {m_function = function;}
64+
writeFrame_t getFunction() const {return m_function;}
7065
private:
71-
const std::vector<uint8_t>* m_frameData;
72-
void* m_ptr;
73-
geode::Result<> m_result = DEFAULT_RESULT_ERROR;
66+
writeFrame_t m_function;
7467
};
7568

7669
class CodecRecorderEvent : public geode::Event {
@@ -134,7 +127,7 @@ class Recorder {
134127
Recorder() {
135128
impl::CreateRecorderEvent createEvent;
136129
createEvent.post();
137-
m_ptr = createEvent.getPtr();
130+
m_ptr = static_cast<impl::Dummy*>(createEvent.getPtr());
138131
}
139132

140133
~Recorder() {
@@ -184,9 +177,13 @@ class Recorder {
184177
* @warning Ensure that the frameData size matches the expected dimensions of the frame.
185178
*/
186179
geode::Result<> writeFrame(const std::vector<uint8_t>& frameData) {
187-
impl::WriteFrameRecorderEvent writeFrameEvent(m_ptr, frameData);
188-
writeFrameEvent.post();
189-
return writeFrameEvent.getResult();
180+
static auto writeFrame = []{
181+
impl::GetWriteFrameFunctionEvent event;
182+
event.post();
183+
return event.getFunction();
184+
}();
185+
if (!writeFrame) return geode::Err("Failed to call writeFrame function.");
186+
return std::invoke(writeFrame, m_ptr, frameData);
190187
}
191188

192189
/**
@@ -203,7 +200,7 @@ class Recorder {
203200
return codecEvent.getCodecs();
204201
}
205202
private:
206-
void* m_ptr = nullptr;
203+
impl::Dummy* m_ptr = nullptr;
207204
};
208205

209206
class AudioMixer {

‎include/recorder.hpp‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class FFMPEG_API_DLL Recorder {
3838
* @return true if initialization is successful, false otherwise.
3939
*/
4040
geode::Result<> init(const RenderSettings& settings);
41+
4142
/**
4243
* @brief Stops the recording process and finalizes the output file.
4344
*
@@ -75,24 +76,29 @@ class FFMPEG_API_DLL Recorder {
7576
geode::Result<> filterFrame(AVFrame* inputFrame, AVFrame* outputFrame);
7677

7778
private:
78-
AVFormatContext* m_formatContext = nullptr;
79-
const AVCodec* m_codec = nullptr;
80-
AVStream* m_videoStream = nullptr;
81-
AVCodecContext* m_codecContext = nullptr;
82-
AVBufferRef* m_hwDevice = nullptr;
83-
AVFrame* m_frame = nullptr;
84-
AVFrame* m_convertedFrame = nullptr;
85-
AVFrame* m_filteredFrame = nullptr;
86-
AVPacket* m_packet = nullptr;
87-
SwsContext* m_swsCtx = nullptr;
88-
AVFilterGraph* m_filterGraph = nullptr;
89-
AVFilterContext* m_buffersrcCtx = nullptr;
90-
AVFilterContext* m_buffersinkCtx = nullptr;
91-
AVFilterContext* m_colorspaceCtx = nullptr;
92-
AVFilterContext* m_vflipCtx = nullptr;
79+
class Impl {
80+
public:
81+
AVFormatContext* m_formatContext = nullptr;
82+
const AVCodec* m_codec = nullptr;
83+
AVStream* m_videoStream = nullptr;
84+
AVCodecContext* m_codecContext = nullptr;
85+
AVBufferRef* m_hwDevice = nullptr;
86+
AVFrame* m_frame = nullptr;
87+
AVFrame* m_convertedFrame = nullptr;
88+
AVFrame* m_filteredFrame = nullptr;
89+
AVPacket* m_packet = nullptr;
90+
SwsContext* m_swsCtx = nullptr;
91+
AVFilterGraph* m_filterGraph = nullptr;
92+
AVFilterContext* m_buffersrcCtx = nullptr;
93+
AVFilterContext* m_buffersinkCtx = nullptr;
94+
AVFilterContext* m_colorspaceCtx = nullptr;
95+
AVFilterContext* m_vflipCtx = nullptr;
96+
97+
size_t m_frameCount = 0;
98+
bool m_init = false;
99+
};
93100

94-
size_t m_frameCount = 0;
95-
bool m_init = false;
101+
std::unique_ptr<Impl> m_impl = nullptr;
96102
};
97103

98104
END_FFMPEG_NAMESPACE_V

‎include/render_settings.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
#include <string>
44
#include <filesystem>
5+
#include "export.hpp"
56

6-
namespace ffmpeg {
7+
BEGIN_FFMPEG_NAMESPACE_V
78

89
enum class PixelFormat : int {
910
NONE = -1,
@@ -321,4 +322,4 @@ struct RenderSettings {
321322
std::filesystem::path m_outputFile;
322323
};
323324

324-
}
325+
END_FFMPEG_NAMESPACE_V

‎src/compat.cpp‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,38 @@ namespace ffmpeg {
1919
}
2020
};
2121

22+
typedef struct RenderSettings {
23+
HardwareAccelerationType m_hardwareAccelerationType;
24+
PixelFormat m_pixelFormat;
25+
std::string m_codec;
26+
std::string m_colorspaceFilters;
27+
int64_t m_bitrate;
28+
uint32_t m_width;
29+
uint32_t m_height;
30+
uint16_t m_fps;
31+
std::filesystem::path m_outputFile;
32+
33+
v2::RenderSettings toV2() const {
34+
return v2::RenderSettings {
35+
.m_hardwareAccelerationType = m_hardwareAccelerationType,
36+
.m_pixelFormat = m_pixelFormat,
37+
.m_codec = m_codec,
38+
.m_colorspaceFilters = m_colorspaceFilters,
39+
.m_doVerticalFlip = false,
40+
.m_bitrate = m_bitrate,
41+
.m_width = m_width,
42+
.m_height = m_height,
43+
.m_fps = m_fps,
44+
.m_outputFile = m_outputFile
45+
};
46+
}
47+
} RenderSettingsV1;
48+
2249
class FFMPEG_API_DLL Recorder {
2350
#define self reinterpret_cast<FFMPEG_API_VERSION_NS::Recorder*>(this)
2451
public:
25-
bool init(const RenderSettings& settings) {
26-
auto res = self->init(settings);
52+
bool init(const RenderSettingsV1& settings) {
53+
auto res = self->init(settings.toV2());
2754
return res.isOk();
2855
}
2956

‎src/event-api/events.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ using namespace geode::prelude;
2929
return ListenerResult::Stop;
3030
});
3131

32-
new EventListener<EventFilter<WriteFrameRecorderEvent>>(+[](WriteFrameRecorderEvent* e) {
33-
ffmpeg::Recorder* ptr = (ffmpeg::Recorder*)e->getPtr();
34-
e->setResult(ptr->writeFrame(e->getFrameData()));
32+
new EventListener<EventFilter<GetWriteFrameFunctionEvent>>(+[](GetWriteFrameFunctionEvent* e) {
33+
// this function is getting called a lot, so it would be better to cache the pointer
34+
auto ptr = &ffmpeg::Recorder::writeFrame;
35+
e->setFunction(reinterpret_cast<GetWriteFrameFunctionEvent::writeFrame_t>(ptr));
3536
return ListenerResult::Stop;
3637
});
3738

0 commit comments

Comments
 (0)