atria-soft/zeus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] remove some log not needed anymore (use to find the ARM bug)

Browse Source
This commit is contained in:
Edouard DUPIN 2017-06-07 01:02:52 +02:00
parent e7d0f634b5
commit 62c1cf74c2
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/player-video/appl/MediaDecoder.cpp
View File

@ -390,20 +390,16 @@ void appl::MediaDecoder::init(ememory::SharedPtr<ClientProperty> _property, uint
APPL_ERROR("get media error"); APPL_ERROR("get media error");
return; return;
} }
APPL_WARNING("Get File"); APPL_DEBUG("Get File");
media.getFile().andThen( media.getFile().andThen(
[=](const zeus::ProxyFile& _proxy) mutable { [=](const zeus::ProxyFile& _proxy) mutable {
APPL_WARNING("Receive ProxyFile"); APPL_DEBUG("Receive ProxyFile");
m_remote->m_fileHandle = _proxy; m_remote->m_fileHandle = _proxy;
APPL_WARNING("We have handle");
m_remote->m_fileHandle.getSize().andThen( m_remote->m_fileHandle.getSize().andThen(
[=](uint64_t _value) mutable { [=](uint64_t _value) mutable {
APPL_WARNING("Receive FileSize to index property"); APPL_DEBUG("Receive FileSize to index property" << _value);
APPL_WARNING("pppllloooppp " << _value); m_remote->m_buffer.resize(_value, 0);
//m_remote->m_buffer.resize(_value, 0); m_remote->checkIfWeNeedMoreDataFromNetwork();
APPL_WARNING("pppllloooppp");
//m_remote->checkIfWeNeedMoreDataFromNetwork();
APPL_WARNING("pppppplllllloooooopppppp");
return true; return true;
}); });
return true; return true;

19
zeus/message/Parameter.cpp
View File

@ -16,9 +16,6 @@ zeus::message::Parameter::Parameter(ememory::SharedPtr<zeus::WebServer> _iface):
Message(_iface) { Message(_iface) {
} }
zeus::message::Parameter::~Parameter() {
ZEUS_ERROR("remove MESSAGE parameter ...");
}
bool zeus::message::Parameter::writeOn(enet::WebSocket& _interface) { bool zeus::message::Parameter::writeOn(enet::WebSocket& _interface) {
uint8_t* data = nullptr; uint8_t* data = nullptr;
@ -34,7 +31,6 @@ bool zeus::message::Parameter::writeOn(enet::WebSocket& _interface) {
} }
void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _lenght) { void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _lenght) {
ZEUS_ERROR("MESSAGE parameter ... ==> clear() ...");
m_parameter.clear(); m_parameter.clear();
uint16_t nbParameters = 0; uint16_t nbParameters = 0;
if (_lenght < sizeof(uint16_t)) { if (_lenght < sizeof(uint16_t)) {
@ -44,7 +40,6 @@ void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _len
uint32_t offset = 0; uint32_t offset = 0;
memcpy(&nbParameters, &_buffer[offset], sizeof(uint16_t)); memcpy(&nbParameters, &_buffer[offset], sizeof(uint16_t));
offset += sizeof(uint16_t); offset += sizeof(uint16_t);
ZEUS_ERROR("MESSAGE parameter ... ==> resize() ...");
m_parameter.resize(nbParameters, std::make_pair(-1, std::vector<uint8_t>())); m_parameter.resize(nbParameters, std::make_pair(-1, std::vector<uint8_t>()));
// Load all Parameters // Load all Parameters
nbParameters = 0; nbParameters = 0;
@ -68,8 +63,7 @@ void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _len
} }
zeus::message::ParamType zeus::message::Parameter::getParameterType(int32_t _id) const { zeus::message::ParamType zeus::message::Parameter::getParameterType(int32_t _id) const {
if (m_parameter.size() <= _id if (m_parameter.size() <= _id) {
&& _id < 0) {
ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size()); ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size());
return createType<void>(); return createType<void>();
} }
@ -141,21 +135,14 @@ const uint8_t* zeus::message::Parameter::getParameterPointer(int32_t _id) const
ZEUS_ERROR("Second parameter have no size ... "); ZEUS_ERROR("Second parameter have no size ... ");
return out; return out;
} }
ZEUS_ERROR("Second parameter size=" << m_parameter[_id].second.size() << " first elem=" << m_parameter[_id].first); ZEUS_VERBOSE("Second parameter size=" << m_parameter[_id].second.size() << " first elem=" << m_parameter[_id].first);
out = static_cast<const uint8_t*>(&(m_parameter[_id].second[m_parameter[_id].first])); out = static_cast<const uint8_t*>(&(m_parameter[_id].second[m_parameter[_id].first]));
{
std::vector<int16_t> tmppppp;
for (auto &it:m_parameter[_id].second) {
tmppppp.push_back(it);
}
ZEUS_ERROR(" buffer=" << tmppppp);
}
return out; return out;
} }
uint32_t zeus::message::Parameter::getParameterSize(int32_t _id) const { uint32_t zeus::message::Parameter::getParameterSize(int32_t _id) const {
int32_t out = 0; int32_t out = 0;
if (m_parameter.size() <= _id if ( m_parameter.size() <= _id
&& _id < 0) { && _id < 0) {
ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size()); ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size());
return 0; return 0;

1
zeus/message/Parameter.hpp
View File

@ -18,7 +18,6 @@ namespace zeus {
mutable std::vector<std::pair<int32_t,std::vector<uint8_t>>> m_parameter; //!< list of the parameter (offset of start data and buffer of data (subprotocol...) mutable std::vector<std::pair<int32_t,std::vector<uint8_t>>> m_parameter; //!< list of the parameter (offset of start data and buffer of data (subprotocol...)
public: public:
Parameter(ememory::SharedPtr<zeus::WebServer> _iface); Parameter(ememory::SharedPtr<zeus::WebServer> _iface);
~Parameter();
/** /**
* @brief Template to get a parameter with a specific type * @brief Template to get a parameter with a specific type
* @param[in] _id Number of the parameter * @param[in] _id Number of the parameter