From 5e640c09b9a1f71d4ee80053a3467fb1f07a0179 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 24 Aug 2012 12:09:46 +0200 Subject: [PATCH] Remove bootstrap generator from MP4 - this is now part of DMS. --- lib/mp4.cpp | 40 ---------------------------------------- lib/mp4.h | 1 - 2 files changed, 41 deletions(-) diff --git a/lib/mp4.cpp b/lib/mp4.cpp index 736acbd4..1753b0f8 100644 --- a/lib/mp4.cpp +++ b/lib/mp4.cpp @@ -364,46 +364,6 @@ void ASRT::WriteContent( ) { SetPayload((uint32_t)4,Box::uint32_to_uint8((isUpdate ? 1 : 0))); } -std::string GenerateLiveBootstrap( JSON::Value & metadata ) { - AFRT afrt; - afrt.SetUpdate(false); - afrt.SetTimeScale(1000); - afrt.AddQualityEntry(""); - if (!metadata.isMember("video") || !metadata["video"].isMember("keyms")){ - afrt.AddFragmentRunEntry(1, 0, 1000); //FirstFragment, FirstFragmentTimestamp,Fragment Duration in milliseconds - }else{ - afrt.AddFragmentRunEntry(1, 0, metadata["video"]["keyms"].asInt()); //FirstFragment, FirstFragmentTimestamp,Fragment Duration in milliseconds - } - afrt.WriteContent(); - - ASRT asrt; - asrt.SetUpdate(false); - asrt.AddQualityEntry(""); - asrt.AddSegmentRunEntry(1, 199);//1 Segment, 199 Fragments - asrt.WriteContent(); - - ABST abst; - abst.AddFragmentRunTable(&afrt); - abst.AddSegmentRunTable(&asrt); - abst.SetBootstrapVersion(1); - abst.SetProfile(0); - abst.SetLive(true); - abst.SetUpdate(false); - abst.SetTimeScale(1000); - abst.SetMediaTime(0xFFFFFFFF); - abst.SetSMPTE(0); - abst.SetMovieIdentifier("fifa"); - abst.SetDRM(""); - abst.SetMetaData(""); - abst.AddServerEntry(""); - abst.AddQualityEntry(""); - abst.WriteContent(); - - std::string Result; - Result.append((char*)abst.GetBoxedData(), (int)abst.GetBoxedDataSize()); - return Result; -} - std::string mdatFold(std::string data){ std::string Result; unsigned int t_int; diff --git a/lib/mp4.h b/lib/mp4.h index 2543fed0..50cad77f 100644 --- a/lib/mp4.h +++ b/lib/mp4.h @@ -126,7 +126,6 @@ namespace MP4{ Box * Container; };//ASRT Box - std::string GenerateLiveBootstrap( JSON::Value & metadata ); std::string mdatFold(std::string data); };