[asterisk-scf-commits] asterisk-scf/integration/file_media_service.git branch "initial_development" updated.

[Commits to the Asterisk SCF project code repositories]

branch "initial_development" has been updated
       via  4741733d1c0eb93737a3d62cea8baf774ab97b32 (commit)
      from  95eb8295f1d07626fe29c86dc6b47bcd26b9e6f4 (commit)

Summary of changes:
 src/MatroskaUtils.cpp |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 4741733d1c0eb93737a3d62cea8baf774ab97b32
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Sep 30 11:57:42 2011 -0230

    - Use basic buffer on the off chance that the "simple buffer" messes things up.
    - Found out that while mkvalidator wants cue lists, libmatroska doesn't like
      writing empty cue lists.

diff --git a/src/MatroskaUtils.cpp b/src/MatroskaUtils.cpp
index 812470a..59a2726 100755
--- a/src/MatroskaUtils.cpp
+++ b/src/MatroskaUtils.cpp
@@ -363,7 +363,7 @@ void TrackImpl::write(uint64 timeCode, uint32 duration, const unsigned char* dat
     block.SetParent(*cluster->kax());
     binary* copiedData = new binary[len];
     memcpy(copiedData, data, len);
-    SimpleDataBuffer* buf = new SimpleDataBuffer(copiedData, static_cast<uint32>(len), 0);
+    DataBuffer* buf = new DataBuffer(copiedData, static_cast<uint32>(len));
     bool blockWantsMore = block.AddFrame(*mTrack, mLastTimeCode * mSegment->globalTimeScale(), *buf);
     cluster->increaseSize(buf->Size());
     mDuration += duration;
@@ -426,7 +426,6 @@ SegmentImpl::SegmentImpl() :
     mIndexSpace = &GetChild<EbmlVoid>(mSegment);
     mTracks = &GetChild<KaxTracks>(mSegment);
     mLeftOverSeek = &GetChild<KaxSeekHead>(mSegment);
-    mCues = 0;
 }
 
 void SegmentImpl::addTo(const OpaqueContainerDataPtr& data)
@@ -541,7 +540,7 @@ void SegmentImpl::close()
     }
     cerr << "Cluster count : " << mClusterCount << endl;
 
-    if (mCues && mCues->ListSize() != 0)
+    if (mCues && mCues->ElementSize() != 0)
     {
         mCues->Render(*mContainer->getIO());
         if (mSeekHead)
@@ -629,11 +628,6 @@ void SegmentImpl::close()
         mSeekHead->IndexThis(tags, mSegment);
     }
 
-    if (mCues)
-    {
-        mCues->Render(*mContainer->getIO());
-        mSeekHead->IndexThis(*mCues, mSegment);
-    }
     if (mIndexSpace)
     {
         metaSeekSize = mIndexSpace->ReplaceWith(*mSeekHead, *mContainer->getIO());

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/file_media_service.git