scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 03:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

AJA: use aligned allocator (regression)

Browse Source 
Removed with dcdd7d1a by mistake. Caused DMAReadFrame fail for eg. 1080p
with UYVY.
This commit is contained in:
Martin Pulec
2021-03-09 14:57:14 +01:00
parent ee4bdbf34a
commit c36faddfb4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_capture/aja.cpp
View File

@@ -127,13 +127,16 @@ volatile bool *aja_should_exit = &should_exit;
using namespace std;
struct aligned_data_allocator {
void *allocate(size_t size) {
struct aligned_data_allocator : public video_frame_pool_allocator {
void *allocate(size_t size) override {
return aligned_malloc(size, AJA_PAGE_SIZE);
}
void deallocate(void *ptr) {
void deallocate(void *ptr) override {
aligned_free(ptr);
}
video_frame_pool_allocator *clone() const override {
return new aligned_data_allocator(*this);
}
};
static const ULWord app = AJA_FOURCC ('U','L','G','R');
@@ -161,7 +164,7 @@ class vidcap_state_aja {
uint32_t mVideoBufferSize{}; /// My video buffer size, in bytes
uint32_t mAudioBufferSize{}; /// My audio buffer size, in bytes
thread mProducerThread; /// My producer thread object -- does the frame capturing
video_frame_pool mPool;
video_frame_pool mPool{0, aligned_data_allocator()};
shared_ptr<video_frame> mOutputFrame;
shared_ptr<uint32_t> mOutputAudioFrame;
size_t mOutputAudioFrameSize{};