From 203f4da42cda0db91928bb8a131f445251b5ca53 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Sun, 6 Feb 2011 12:39:07 +0100 Subject: [PATCH] AMHP box completed --- MP4/box_amhp.cpp | 14 ++++++++------ MP4/box_amhp.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/MP4/box_amhp.cpp b/MP4/box_amhp.cpp index a6329436..a2f040c3 100644 --- a/MP4/box_amhp.cpp +++ b/MP4/box_amhp.cpp @@ -17,22 +17,24 @@ void Box_amhp::SetReserved( ) { Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(0)); } -void Box_stts::AddEntry( uint32_t SampleCount, uint32_t SampleDelta, uint32_t Offset ) { +void Box_amhp::AddEntry( uint8_t HintTrackMode, uint8_t Settings, uint8_t TrailerDefaultSize, uint32_t Offset = 0 ) { if(Offset >= Entries.size()) { Entries.resize(Offset+1); } - Entries[Offset].SampleCount = SampleCount; - Entries[Offset].SampleDelta = SampleDelta; + Entries[Offset].HintTrackMode = HintTrackMode; + Entries[Offset].Settings = Settings; + Entries[Offset].TrailerDefaultSize = TrailerDefaultSize; } -void Box_stts::WriteContent( ) { +void Box_amhp::WriteContent( ) { Container->ResetPayload(); SetReserved( ); if(!Entries.empty()) { for(int32_t i = Entries.size() -1; i >= 0; i--) { - Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(Entries[i].SampleDelta),(i*8)+12); - Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(Entries[i].SampleCount),(i*8)+8); + Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(Entries[i].TrailerDefaultSize),(i*12)+16); + Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(Entries[i].Settings),(i*12)+12); + Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(Entries[i].HintTrackMode),(i*12)+8); } } Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(Entries.size()),4); diff --git a/MP4/box_amhp.h b/MP4/box_amhp.h index fd5b3518..c96fad11 100644 --- a/MP4/box_amhp.h +++ b/MP4/box_amhp.h @@ -14,7 +14,7 @@ class Box_amhp { ~Box_amhp(); Box * GetBox(); void SetReserved( ); - void AddEntry( uint8_t NewHintTrackMode, uint8_t NewSettings, uint8_t NewTrailerDefaultSize, uint32_t Offset = 0 ); + void AddEntry( uint8_t HintTrackMode, uint8_t Settings, uint8_t TrailerDefaultSize, uint32_t Offset = 0 ); void WriteContent( ); private: Box * Container;