openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #556 from ferdnyc/use-make-shared

Browse Source 
Use std::make_shared to allocate shared ptrs, instead of std::shared_ptr constructors
This commit is contained in:
Jonathan Thomas
2020-10-16 14:48:14 -05:00
committed by GitHub
parent ef80439b62 0bcf1e4924
commit 8f6c64215e
23 changed files with 200 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/FrameMapper.cpp
View File

@@ -450,7 +450,8 @@ std::shared_ptr<Frame> FrameMapper::GetFrame(int64_t requested_frame)
}
// Create a new frame
std::shared_ptr<Frame> frame = std::make_shared<Frame>(frame_number, 1, 1, "#000000", samples_in_frame, channels_in_frame);
auto frame = std::make_shared<Frame>(
frame_number, 1, 1, "#000000", samples_in_frame, channels_in_frame);
frame->SampleRate(mapped_frame->SampleRate());
frame->ChannelsLayout(mapped_frame->ChannelsLayout());
@@ -460,13 +461,14 @@ std::shared_ptr<Frame> FrameMapper::GetFrame(int64_t requested_frame)
odd_frame = GetOrCreateFrame(mapped.Odd.Frame);
if (odd_frame)
frame->AddImage(std::shared_ptr<QImage>(new QImage(*odd_frame->GetImage())), true);
frame->AddImage(std::make_shared<QImage>(*odd_frame->GetImage()), true);
if (mapped.Odd.Frame != mapped.Even.Frame) {
// Add even lines (if different than the previous image)
std::shared_ptr<Frame> even_frame;
even_frame = GetOrCreateFrame(mapped.Even.Frame);
if (even_frame)
frame->AddImage(std::shared_ptr<QImage>(new QImage(*even_frame->GetImage())), false);
frame->AddImage(
std::make_shared<QImage>(*even_frame->GetImage()), false);
}
// Resample audio on frame (if needed)