Archives/v4l2rtspserver
2
0
Fork 0
mirror of https://github.com/mpromonet/v4l2rtspserver synced 2024-11-06 03:20:22 +00:00
Code Issues Projects Releases Wiki Activity

update auxline

Browse Source
This commit is contained in:
mpromonet 2017-10-15 16:55:10 +02:00
parent 9d81304778
commit 941f68e776
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/H264_V4l2DeviceSource.cpp
View File

@ -48,7 +48,7 @@ std::list< std::pair<unsigned char*,size_t> > H264_V4L2DeviceSource::splitFrames
break; break;
} }
if (m_auxLine.empty() && !m_sps.empty() && !m_pps.empty()) if (!m_sps.empty() && !m_pps.empty())
{ {
u_int32_t profile_level_id = 0; u_int32_t profile_level_id = 0;
if (m_sps.size() >= 4) profile_level_id = (m_sps[1]<<16)|(m_sps[2]<<8)|m_sps[3]; if (m_sps.size() >= 4) profile_level_id = (m_sps[1]<<16)|(m_sps[2]<<8)|m_sps[3];
@ -60,7 +60,6 @@ std::list< std::pair<unsigned char*,size_t> > H264_V4L2DeviceSource::splitFrames
os << "profile-level-id=" << std::hex << std::setw(6) << std::setfill('0') << profile_level_id; os << "profile-level-id=" << std::hex << std::setw(6) << std::setfill('0') << profile_level_id;
os << ";sprop-parameter-sets=" << sps_base64 <<"," << pps_base64; os << ";sprop-parameter-sets=" << sps_base64 <<"," << pps_base64;
m_auxLine.assign(os.str()); m_auxLine.assign(os.str());
LOG(NOTICE) << m_auxLine;
delete [] sps_base64; delete [] sps_base64;
delete [] pps_base64; delete [] pps_base64;
@ -99,7 +98,7 @@ std::list< std::pair<unsigned char*,size_t> > H265_V4L2DeviceSource::splitFrames
default: break; default: break;
} }
if (m_auxLine.empty() && !m_vps.empty() && !m_sps.empty() && !m_pps.empty()) if (!m_vps.empty() && !m_sps.empty() && !m_pps.empty())
{ {
char* vps_base64 = base64Encode(m_vps.c_str(), m_vps.size()); char* vps_base64 = base64Encode(m_vps.c_str(), m_vps.size());
char* sps_base64 = base64Encode(m_sps.c_str(), m_sps.size()); char* sps_base64 = base64Encode(m_sps.c_str(), m_sps.size());
@ -110,7 +109,6 @@ std::list< std::pair<unsigned char*,size_t> > H265_V4L2DeviceSource::splitFrames
os << ";sprop-sps=" << sps_base64; os << ";sprop-sps=" << sps_base64;
os << ";sprop-pps=" << pps_base64; os << ";sprop-pps=" << pps_base64;
m_auxLine.assign(os.str()); m_auxLine.assign(os.str());
LOG(NOTICE) << m_auxLine;
delete [] vps_base64; delete [] vps_base64;
delete [] sps_base64; delete [] sps_base64;