sfan5
/
BlockPlanet-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added compression of media

master
Joel Leclerc 2012-05-04 12:24:56 -06:00
parent fa3a0911cf
commit c869685488
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/client.cpp
View File

@ -1463,7 +1463,11 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
else if(command == TOCLIENT_ANNOUNCE_MEDIA) else if(command == TOCLIENT_ANNOUNCE_MEDIA)
{ {
std::string datastring((char*)&data[2], datasize-2); std::string datastring((char*)&data[2], datasize-2);
std::istringstream is(datastring, std::ios_base::binary); std::istringstream is2(datastring, std::ios_base::binary);
std::istringstream tmp_is(deSerializeLongString(is2), std::ios::binary);
std::ostringstream tmp_os;
decompressZlib(tmp_is, tmp_os);
std::istringstream is(tmp_os.str());
// Mesh update thread must be stopped while // Mesh update thread must be stopped while
// updating content definitions // updating content definitions
@ -1546,7 +1550,11 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
else if(command == TOCLIENT_MEDIA) else if(command == TOCLIENT_MEDIA)
{ {
std::string datastring((char*)&data[2], datasize-2); std::string datastring((char*)&data[2], datasize-2);
std::istringstream is(datastring, std::ios_base::binary); std::istringstream is2(datastring, std::ios_base::binary);
std::istringstream tmp_is(deSerializeLongString(is2), std::ios::binary);
std::ostringstream tmp_os;
decompressZlib(tmp_is, tmp_os);
std::istringstream is(tmp_os.str());
// Mesh update thread must be stopped while // Mesh update thread must be stopped while
// updating content definitions // updating content definitions

24
src/server.cpp
View File

@ -4205,6 +4205,7 @@ void Server::sendMediaAnnouncement(u16 peer_id)
// Make packet // Make packet
std::ostringstream os(std::ios_base::binary); std::ostringstream os(std::ios_base::binary);
std::ostringstream tmp_os(std::ios_base::binary);
/* /*
u16 command u16 command
@ -4218,16 +4219,19 @@ void Server::sendMediaAnnouncement(u16 peer_id)
*/ */
writeU16(os, TOCLIENT_ANNOUNCE_MEDIA); writeU16(os, TOCLIENT_ANNOUNCE_MEDIA);
writeU16(os, file_announcements.size()); writeU16(tmp_os, file_announcements.size());
for(core::list<SendableMediaAnnouncement>::Iterator for(core::list<SendableMediaAnnouncement>::Iterator
j = file_announcements.begin(); j = file_announcements.begin();
j != file_announcements.end(); j++){ j != file_announcements.end(); j++){
os<<serializeString(j->name); tmp_os<<serializeString(j->name);
os<<serializeString(j->sha1_digest); tmp_os<<serializeString(j->sha1_digest);
} }
// Make data buffer // Make data buffer
std::ostringstream tmp_os2(std::ios::binary);
compressZlib(tmp_os.str(), tmp_os2);
os<<serializeLongString(tmp_os2.str());
std::string s = os.str(); std::string s = os.str();
SharedBuffer<u8> data((u8*)s.c_str(), s.size()); SharedBuffer<u8> data((u8*)s.c_str(), s.size());
@ -4327,6 +4331,7 @@ void Server::sendRequestedMedia(u16 peer_id,
for(u32 i=0; i<num_bunches; i++) for(u32 i=0; i<num_bunches; i++)
{ {
std::ostringstream os(std::ios_base::binary); std::ostringstream os(std::ios_base::binary);
std::ostringstream tmp_os(std::ios_base::binary);
/* /*
u16 command u16 command
@ -4342,18 +4347,21 @@ void Server::sendRequestedMedia(u16 peer_id,
*/ */
writeU16(os, TOCLIENT_MEDIA); writeU16(os, TOCLIENT_MEDIA);
writeU16(os, num_bunches); writeU16(tmp_os, num_bunches);
writeU16(os, i); writeU16(tmp_os, i);
writeU32(os, file_bunches[i].size()); writeU32(tmp_os, file_bunches[i].size());
for(core::list<SendableMedia>::Iterator for(core::list<SendableMedia>::Iterator
j = file_bunches[i].begin(); j = file_bunches[i].begin();
j != file_bunches[i].end(); j++){ j != file_bunches[i].end(); j++){
os<<serializeString(j->name); tmp_os<<serializeString(j->name);
os<<serializeLongString(j->data); tmp_os<<serializeLongString(j->data);
} }
// Make data buffer // Make data buffer
std::ostringstream tmp_os2(std::ios::binary);
compressZlib(tmp_os.str(), tmp_os2);
os<<serializeLongString(tmp_os2.str());
std::string s = os.str(); std::string s = os.str();
verbosestream<<"Server::sendRequestedMedia(): bunch " verbosestream<<"Server::sendRequestedMedia(): bunch "
<<i<<"/"<<num_bunches <<i<<"/"<<num_bunches