From 968455e316cb268734ecd89aad7297f86c6466f4 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Thu, 17 Feb 2011 08:09:25 +0100 Subject: [PATCH] Bugfix abst --- util/MP4/box_abst.cpp | 2 +- util/MP4/box_asrt.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/MP4/box_abst.cpp b/util/MP4/box_abst.cpp index be97f99a..7043f0f4 100644 --- a/util/MP4/box_abst.cpp +++ b/util/MP4/box_abst.cpp @@ -195,7 +195,7 @@ void Box_abst::WriteContent( ) { uint32_t OffsetSegmentRuntableCount = OffsetMetaData + curMetaData.size() + 1; uint32_t OffsetFragmentRuntableCount = OffsetSegmentRuntableCount + 4 + serializedSegments.size(); - temp[0] = 0 & ( curProfile << 6 ) & ( (uint8_t)isLive << 7 ) & ( (uint8_t)isUpdate << 7 ); + temp[0] = 0 + ( curProfile << 6 ) + ( (uint8_t)isLive << 7 ) + ( (uint8_t)isUpdate << 7 ); Container->SetPayload((uint32_t)serializedFragments.size(),(uint8_t*)serializedFragments.c_str(),OffsetFragmentRuntableCount+4); Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(FragmentAmount),OffsetFragmentRuntableCount); diff --git a/util/MP4/box_asrt.cpp b/util/MP4/box_asrt.cpp index a6ba2fbb..23553037 100644 --- a/util/MP4/box_asrt.cpp +++ b/util/MP4/box_asrt.cpp @@ -69,12 +69,12 @@ void Box_asrt::WriteContent( ) { } uint32_t OffsetSegmentRunEntryCount = 5 + serializedQualities.size(); - + for( uint32_t i = 0; i < SegmentRunEntryTable.size(); i ++ ) { Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(SegmentRunEntryTable[i].FragmentsPerSegment),(8*i)+OffsetSegmentRunEntryCount+8); Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(SegmentRunEntryTable[i].FirstSegment),(8*i)+OffsetSegmentRunEntryCount+4); } - Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(SegmentRunEntryTable.size()),OffsetSegmentRunEntryCount); + Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(SegmentRunEntryTable.size()),OffsetSegmentRunEntryCount); Container->SetPayload((uint32_t)serializedQualities.size(),(uint8_t*)serializedQualities.c_str(),5); Container->SetPayload((uint32_t)1,Box::uint8_to_uint8(QualitySegmentUrlModifiers.size()),4); Container->SetPayload((uint32_t)4,Box::uint32_to_uint8((isUpdate ? 1 : 0)));