Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added method to buffer current attachments

This commit is contained in:
Martchus 2015-11-26 14:33:08 +01:00
parent 1db83eeccd
commit 0d503e785b
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
matroska/matroskaattachment.cpp
View File

@ -81,21 +81,6 @@ void MatroskaAttachment::parse(EbmlElement *attachedFileElement)
}
}
/*!
* \brief Prepares making.
* \returns Returns a MatroskaAttachmentMaker object which can be used to actually make the attachment.
* \remarks The attachment must NOT be mutated after making is prepared when it is intended to actually
* make the attachment using the make method of the returned object.
* \throws Throws Media::Failure or a derived exception when a making error occurs.
*
* This method might be useful when it is necessary to know the size of the attachment before making it.
* \sa make()
*/
MatroskaAttachmentMaker MatroskaAttachment::prepareMaking()
{
return MatroskaAttachmentMaker(*this);
}
/*!
* \brief Writes the attachment to the specified \a stream (makes an "AttachedFile"-element).
* \throws Throws std::ios_base::failure when an IO error occurs.
@ -171,7 +156,11 @@ void MatroskaAttachmentMaker::make(ostream &stream) const
EbmlElement *child;
for(auto id : initializer_list<EbmlElement::identifierType>{MatroskaIds::FileReferral, MatroskaIds::FileUsedStartTime, MatroskaIds::FileUsedEndTime}) {
if((child = attachment().attachedFileElement()->childById(id))) {
child->copyEntirely(stream);
if(child->buffer()) {
child->copyBuffer(stream);
} else {
child->copyEntirely(stream);
}
}
}
}
@ -181,9 +170,29 @@ void MatroskaAttachmentMaker::make(ostream &stream) const
len = EbmlElement::makeSizeDenotation(attachment().data()->size(), buff);
stream.write(buff, len);
// copy data
CopyHelper<0x2000> copyHelper;
attachment().data()->stream().seekg(attachment().data()->startOffset());
copyHelper.copy(attachment().data()->stream(), stream, attachment().data()->size());
if(attachment().data()->buffer()) {
stream.write(attachment().data()->buffer().get(), attachment().data()->size());
} else {
CopyHelper<0x2000> copyHelper;
attachment().data()->stream().seekg(attachment().data()->startOffset());
copyHelper.copy(attachment().data()->stream(), stream, attachment().data()->size());
}
}
}
void MatroskaAttachmentMaker::bufferCurrentAttachments()
{
EbmlElement *child;
if(attachment().attachedFileElement()) {
for(auto id : initializer_list<EbmlElement::identifierType>{MatroskaIds::FileReferral, MatroskaIds::FileUsedStartTime, MatroskaIds::FileUsedEndTime}) {
if((child = attachment().attachedFileElement()->childById(id))) {
child->makeBuffer();
}
}
}
if(attachment().data() && attachment().data()->size() && !attachment().isDataFromFile()) {
attachment().data()->makeBuffer();
}
}

16
matroska/matroskaattachment.h
View File

@ -16,6 +16,7 @@ public:
void make(std::ostream &stream) const;
const MatroskaAttachment &attachment() const;
uint64 requiredSize() const;
void bufferCurrentAttachments();
private:
MatroskaAttachmentMaker(MatroskaAttachment &attachment);
@ -72,6 +73,21 @@ inline EbmlElement *MatroskaAttachment::attachedFileElement() const
return m_attachedFileElement;
}
/*!
* \brief Prepares making.
* \returns Returns a MatroskaAttachmentMaker object which can be used to actually make the attachment.
* \remarks The attachment must NOT be mutated after making is prepared when it is intended to actually
* make the attachment using the make method of the returned object.
* \throws Throws Media::Failure or a derived exception when a making error occurs.
*
* This method might be useful when it is necessary to know the size of the attachment before making it.
* \sa make()
*/
inline MatroskaAttachmentMaker MatroskaAttachment::prepareMaking()
{
return MatroskaAttachmentMaker(*this);
}
} // namespace Media
#endif // MEDIA_MATROSKAATTACHMENT_H