From a8ecf3368a164289e12f271474ddbd2898442521 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 21 Mar 2011 20:50:35 +0100 Subject: [PATCH 1/4] Fix --- util/MP4/interface.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/util/MP4/interface.cpp b/util/MP4/interface.cpp index a7bbd58f..666e9632 100644 --- a/util/MP4/interface.cpp +++ b/util/MP4/interface.cpp @@ -578,10 +578,9 @@ std::string Interface::GenerateLiveBootstrap( uint32_t CurMediaTime ) { } std::string Interface::mdatFold(std::string data){ - static Box_mdat * mdat = new Box_mdat; + static Box * mdat = new Box(0x6D646174); std::string Result; - mdat->SetContent((uint8_t*)data.c_str(), data.size()); - Result.append((char*)mdat->GetBox()->GetBoxedData(), (int)mdat->GetBox()->GetBoxedDataSize()); - delete mdat; + mdat->SetPayload((uint8_t*)data.c_str(), data.size()); + Result.append((char*)mdat->GetBoxedData(), (int)mdat->GetBoxedDataSize()); return Result; } From 108efec41ab0c809ed31ef8e9f46ce2a44afebd8 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 21 Mar 2011 20:52:25 +0100 Subject: [PATCH 2/4] Fix --- util/MP4/interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/MP4/interface.cpp b/util/MP4/interface.cpp index 666e9632..971279af 100644 --- a/util/MP4/interface.cpp +++ b/util/MP4/interface.cpp @@ -580,7 +580,7 @@ std::string Interface::GenerateLiveBootstrap( uint32_t CurMediaTime ) { std::string Interface::mdatFold(std::string data){ static Box * mdat = new Box(0x6D646174); std::string Result; - mdat->SetPayload((uint8_t*)data.c_str(), data.size()); + mdat->SetPayload(data.size(), (uint8_t*)data.c_str()); Result.append((char*)mdat->GetBoxedData(), (int)mdat->GetBoxedDataSize()); return Result; } From 9e5949d61542a3707ea132081fbaa61a0321cc65 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 21 Mar 2011 21:07:00 +0100 Subject: [PATCH 3/4] Fix --- util/MP4/interface.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/util/MP4/interface.cpp b/util/MP4/interface.cpp index 971279af..69f6aac8 100644 --- a/util/MP4/interface.cpp +++ b/util/MP4/interface.cpp @@ -578,9 +578,12 @@ std::string Interface::GenerateLiveBootstrap( uint32_t CurMediaTime ) { } std::string Interface::mdatFold(std::string data){ - static Box * mdat = new Box(0x6D646174); std::string Result; - mdat->SetPayload(data.size(), (uint8_t*)data.c_str()); - Result.append((char*)mdat->GetBoxedData(), (int)mdat->GetBoxedDataSize()); + unsigned int t_int; + t_int = htonl(data.size()+8); + Result.append(t_int, 4); + t_int = htonl(0x6D646174); + Result.append(t_int, 4); + Result.append(data); return Result; } From 1fd2c6b7b7f5700e25f3f3796bbd4f94a5477094 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 21 Mar 2011 21:09:01 +0100 Subject: [PATCH 4/4] Fix --- util/MP4/interface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/MP4/interface.cpp b/util/MP4/interface.cpp index 69f6aac8..3f8f96a6 100644 --- a/util/MP4/interface.cpp +++ b/util/MP4/interface.cpp @@ -581,9 +581,9 @@ std::string Interface::mdatFold(std::string data){ std::string Result; unsigned int t_int; t_int = htonl(data.size()+8); - Result.append(t_int, 4); + Result.append((char*)&t_int, 4); t_int = htonl(0x6D646174); - Result.append(t_int, 4); + Result.append((char*)&t_int, 4); Result.append(data); return Result; }