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

Migrating tr1 to std, adding C++11 support to build scripts, fixing crash in FFmpegReader (caused by shared_ptr, buffer, and last_video_frame corruption). Much improved stability with this change. Thanks to Craig and Peter for the help!

Browse Source
This commit is contained in:
Jonathan Thomas
2017-08-20 17:37:39 -05:00
parent 564664737a
commit f12ffe692b
84 changed files with 605 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/CacheDisk.cpp
View File

@@ -163,7 +163,7 @@ CacheDisk::~CacheDisk()
}
// Add a Frame to the cache
void CacheDisk::Add(tr1::shared_ptr<Frame> frame)
void CacheDisk::Add(std::shared_ptr<Frame> frame)
{
// Create a scoped lock, to protect the cache from multiple threads
const GenericScopedLock<CriticalSection> lock(*cacheCriticalSection);
@@ -222,7 +222,7 @@ void CacheDisk::Add(tr1::shared_ptr<Frame> frame)
}
// Get a frame from the cache (or NULL shared_ptr if no frame is found)
tr1::shared_ptr<Frame> CacheDisk::GetFrame(long int frame_number)
std::shared_ptr<Frame> CacheDisk::GetFrame(long int frame_number)
{
// Create a scoped lock, to protect the cache from multiple threads
const GenericScopedLock<CriticalSection> lock(*cacheCriticalSection);
@@ -234,14 +234,14 @@ tr1::shared_ptr<Frame> CacheDisk::GetFrame(long int frame_number)
if (path.exists(frame_path)) {
// Load image file
tr1::shared_ptr<QImage> image = tr1::shared_ptr<QImage>(new QImage());
std::shared_ptr<QImage> image = std::shared_ptr<QImage>(new QImage());
bool success = image->load(QString::fromStdString(frame_path.toStdString()));
// Set pixel formatimage->
image = tr1::shared_ptr<QImage>(new QImage(image->convertToFormat(QImage::Format_RGBA8888)));
image = std::shared_ptr<QImage>(new QImage(image->convertToFormat(QImage::Format_RGBA8888)));
// Create frame object
tr1::shared_ptr<Frame> frame(new Frame());
std::shared_ptr<Frame> frame(new Frame());
frame->number = frame_number;
frame->AddImage(image);
@@ -288,15 +288,15 @@ tr1::shared_ptr<Frame> CacheDisk::GetFrame(long int frame_number)
}
// no Frame found
return tr1::shared_ptr<Frame>();
return std::shared_ptr<Frame>();
}
// Get the smallest frame number (or NULL shared_ptr if no frame is found)
tr1::shared_ptr<Frame> CacheDisk::GetSmallestFrame()
std::shared_ptr<Frame> CacheDisk::GetSmallestFrame()
{
// Create a scoped lock, to protect the cache from multiple threads
const GenericScopedLock<CriticalSection> lock(*cacheCriticalSection);
tr1::shared_ptr<openshot::Frame> f;
std::shared_ptr<openshot::Frame> f;
// Loop through frame numbers
deque<long int>::iterator itr;