Fix fps info

tsMuxer/hevc.cpp

@@ -773,10 +773,11 @@ string HevcSpsUnit::getDescription() const
 {
     string result = getProfileString();
     result += string(" Resolution: ") + int32ToStr(pic_width_in_luma_samples) + string(":") + int32ToStr(pic_height_in_luma_samples);
-    if (interlaced_source_flag)
-        result += string("i");
-    else
-        result += string("p");
+    result += (interlaced_source_flag ? string("i") : string("p"));
+
+    double fps = getFPS();
+    result += "  Frame rate: ";
+    result += (fps ? doubleToStr(fps) : string("not found"));
     return result;
 }
 

tsMuxer/hevcStreamReader.cpp

@@ -106,7 +106,10 @@ CheckStreamRez HEVCStreamReader::checkStream(uint8_t* buffer, int len)
     if (m_vps && m_sps && m_pps && m_sps->vps_id == m_vps->vps_id && m_pps->sps_id == m_sps->sps_id)
     {
         rez.codecInfo = hevcCodecInfo;
-        rez.streamDescr = m_sps->getDescription() + string(" ") + m_vps->getDescription();
+        rez.streamDescr = m_sps->getDescription();
+        size_t frSpsPos = rez.streamDescr.find("Frame rate: not found");
+        if (frSpsPos != string::npos)
+            rez.streamDescr = rez.streamDescr.substr(0, frSpsPos) + string(" ") + m_vps->getDescription();
     }
 
     return rez;

tsMuxer/metaDemuxer.cpp

@@ -623,23 +623,9 @@ DetectStreamRez METADemuxer::DetectStreamReader(BufferedReaderManager& readManag
 				trackRez.codecInfo.programName == "V_MPEG4/ISO/MVC" ||
 				trackRez.codecInfo.programName == "V_MPEGH/ISO/HEVC"
 				)
-			{
-				size_t frPos = trackRez.streamDescr.find("Frame rate: not found");
-				if (frPos != string::npos) 
-				{
-					double fps = demuxer->getTrackFps(itr->first);
-					if (fps != 0.0) 
-					{
-						trackRez.streamDescr = trackRez.streamDescr.substr(0,frPos);
-						trackRez.streamDescr += "Frame rate: ";
-						trackRez.streamDescr += doubleToStr(fps);
-					}
-				}
                 addTrack(streams, trackRez, true);
-			}
 			else
 				addTrack(streams, trackRez, false);
-			//}
 		}
 		chapters = demuxer->getChapters();
         if (calcDuration)

tsMuxerGUI/tsmuxerwindow.cpp

@@ -159,9 +159,6 @@ QString toNativeDecPoint(QString str) {
 }
 
 float myStrToFloat(QString str) {
-  for (int i = 0; i < str.length(); ++i)
-    if (str[i] == ',' || str[i] == '.')
-      str[i] = locale.decimalPoint();
   return str.toFloat();
 }