justdan96/tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FPS info read from VPS and SPS

Browse Source 
fps info can be either in VPS or SPS nal, or both, or none.
tsMuxer reads fps from VPS nal only.
This patch allows tsMuxer to find fps in SPS when not present in VPS.
Plus bug sorted out in flags reading (8 bits in lieu of 1 bit)
This commit is contained in:
Jean Christophe DE RYCK 2020-01-06 19:52:57 +02:00
parent c3c7f6c7c4
commit 2ef8fd6187
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tsMuxer/hevc.cpp
View File

@ -237,10 +237,7 @@ void HevcVpsUnit::setFPS(double fps)
double HevcVpsUnit::getFPS() const double HevcVpsUnit::getFPS() const
{ {
if (num_units_in_tick != 0) return num_units_in_tick ? time_scale / (float)num_units_in_tick : 0;
return time_scale/(float)num_units_in_tick;
else
return 0;
} }
string HevcVpsUnit::getDescription() const string HevcVpsUnit::getDescription() const
@ -372,9 +369,9 @@ void HevcSpsUnit::vui_parameters()
extractUEGolombCode(); // chroma_sample_loc_type_bottom_field ue(v) extractUEGolombCode(); // chroma_sample_loc_type_bottom_field ue(v)
} }
m_reader.skipBits(8); // neutral_chroma_indication_flag u(1) m_reader.skipBit(); // neutral_chroma_indication_flag u(1)
m_reader.skipBits(8); // field_seq_flag u(1) m_reader.skipBit(); // field_seq_flag u(1)
m_reader.skipBits(8); // frame_field_info_present_flag u(1) m_reader.skipBit(); // frame_field_info_present_flag u(1)
bool default_display_window_flag = m_reader.getBit(); bool default_display_window_flag = m_reader.getBit();
if( default_display_window_flag ) { if( default_display_window_flag ) {
extractUEGolombCode(); // def_disp_win_left_offset ue(v) extractUEGolombCode(); // def_disp_win_left_offset ue(v)
@ -767,6 +764,11 @@ int HevcSpsUnit::deserialize()
} }
} }
double HevcSpsUnit::getFPS() const
{
return num_units_in_tick ? time_scale / (float)num_units_in_tick : 0;
}
string HevcSpsUnit::getDescription() const string HevcSpsUnit::getDescription() const
{ {
string result = getProfileString(); string result = getProfileString();

2
tsMuxer/hevc.h
View File

@ -121,7 +121,7 @@ struct HevcSpsUnit: public HevcUnitWithProfile
{ {
HevcSpsUnit(); HevcSpsUnit();
int deserialize() override; int deserialize() override;
double getFPS() const;
std::string getDescription() const; std::string getDescription() const;
public: public:
int vps_id; int vps_id;

14
tsMuxer/hevcStreamReader.cpp
View File

@ -60,7 +60,8 @@ CheckStreamRez HEVCStreamReader::checkStream(uint8_t* buffer, int len)
m_vps->decodeBuffer(nal, nextNal); m_vps->decodeBuffer(nal, nextNal);
if (m_vps->deserialize()) if (m_vps->deserialize())
return rez; return rez;
updateFPS(m_vps, nal, nextNal, 0); m_spsPpsFound = true;
if (m_vps->num_units_in_tick) updateFPS(m_vps, nal, nextNal, 0);
break; break;
} }
case NAL_SPS: { case NAL_SPS: {
@ -69,6 +70,8 @@ CheckStreamRez HEVCStreamReader::checkStream(uint8_t* buffer, int len)
m_sps->decodeBuffer(nal, nextNal); m_sps->decodeBuffer(nal, nextNal);
if (m_sps->deserialize() != 0) if (m_sps->deserialize() != 0)
return rez; return rez;
m_spsPpsFound = true;
updateFPS(m_sps, nal, nextNal, 0);
break; break;
} }
case NAL_PPS: { case NAL_PPS: {
@ -171,8 +174,10 @@ int HEVCStreamReader::getStreamHDR() const
double HEVCStreamReader::getStreamFPS(void * curNalUnit) double HEVCStreamReader::getStreamFPS(void * curNalUnit)
{ {
HevcVpsUnit* vps = (HevcVpsUnit*) curNalUnit; double fps = 0;
return vps->getFPS(); if (m_vps) fps = m_vps->getFPS();
if (fps == 0 && m_sps) fps = m_sps->getFPS();
return fps;
} }
bool HEVCStreamReader::isSlice(int nalType) const bool HEVCStreamReader::isSlice(int nalType) const
@ -302,7 +307,7 @@ int HEVCStreamReader::intDecodeNAL(uint8_t* buff)
m_spsPpsFound = true; m_spsPpsFound = true;
m_vpsCounter++; m_vpsCounter++;
m_vpsSizeDiff = 0; m_vpsSizeDiff = 0;
updateFPS(m_vps, curPos, nextNalWithStartCode, 0); if (m_vps->num_units_in_tick) updateFPS(m_vps, curPos, nextNalWithStartCode, 0);
nextNal += m_vpsSizeDiff; nextNal += m_vpsSizeDiff;
storeBuffer(m_vpsBuffer, curPos, nextNalWithStartCode); storeBuffer(m_vpsBuffer, curPos, nextNalWithStartCode);
break; break;
@ -314,6 +319,7 @@ int HEVCStreamReader::intDecodeNAL(uint8_t* buff)
if (rez) if (rez)
return rez; return rez;
m_spsPpsFound = true; m_spsPpsFound = true;
updateFPS(m_sps, curPos, nextNalWithStartCode, 0);
storeBuffer(m_spsBuffer, curPos, nextNalWithStartCode); storeBuffer(m_spsBuffer, curPos, nextNalWithStartCode);
break; break;
case NAL_PPS: case NAL_PPS: