FileRecord improvement: fixed header packing and CRC32 computation

plugins/samplesource/filesource/filesourceinput.cpp

@@ -86,24 +86,25 @@ void FileSourceInput::openFileStream()
 	if (fileSize > sizeof(FileRecord::Header))
 	{
         // TODO: add CRC
-	    m_ifstream.seekg(0,std::ios_base::beg);
 	    FileRecord::Header header;
+	    m_ifstream.seekg(0,std::ios_base::beg);
+		bool crcOK = FileRecord::readHeader(m_ifstream, header);
+		m_sampleRate = header.sampleRate;
+		m_centerFrequency = header.centerFrequency;
+		m_startingTimeStamp = header.startTimeStamp;
+		m_sampleSize = header.sampleSize;
+		QString crcHex = QString("%1").arg(header.crc32 , 0, 16);
 
-	    if (FileRecord::readHeader(m_ifstream, header)) // CRC OK
+	    if (crcOK)
 	    {
-	        m_sampleRate = header.sampleRate;
-	        m_centerFrequency = header.centerFrequency;
-	        m_startingTimeStamp = header.startTimeStamp;
-	        m_sampleSize = header.sampleSize;
-
+	        qDebug("FileSourceInput::openFileStream: CRC32 OK for header: %s", qPrintable(crcHex));
 	        m_recordLength = (fileSize - sizeof(FileRecord::Header)) / ((m_sampleSize == 24 ? 8 : 4) * m_sampleRate);
 	    }
 	    else
 	    {
-	        qCritical("FileSourceInput::openFileStream: bad CRC header");
+	        qCritical("FileSourceInput::openFileStream: bad CRC32 for header: %s", qPrintable(crcHex));
 	        m_recordLength = 0;
 	    }
-
 	}
 	else
 	{
@@ -111,8 +112,11 @@ void FileSourceInput::openFileStream()
 	}
 
 	qDebug() << "FileSourceInput::openFileStream: " << m_fileName.toStdString().c_str()
-			<< " fileSize: " << fileSize << "bytes"
-			<< " length: " << m_recordLength << " seconds";
+			<< " fileSize: " << fileSize << " bytes"
+			<< " length: " << m_recordLength << " seconds"
+			<< " sample rate: " << m_sampleRate << " S/s"
+			<< " center frequency: " << m_centerFrequency << " Hz"
+			<< " sample size: " << m_sampleSize << " bits";
 
 	if (getMessageQueueToGUI()) {
 	    MsgReportFileSourceStreamData *report = MsgReportFileSourceStreamData::create(m_sampleRate,

rescuesdriq/rescuesdriq.go

@@ -55,19 +55,28 @@ func writeHeader(writer *bufio.Writer, header *HeaderStd) {
 	fmt.Printf("Wrote %d bytes header\n", noh)
 }
 
+func setCRC(header *HeaderStd) {
+	var bin_buf bytes.Buffer
+	header.Filler = 0
+	binary.Write(&bin_buf, binary.LittleEndian, header)
+	header.CRC32 = crc32.ChecksumIEEE(bin_buf.Bytes()[0:28])
+}
+
+func getCRC(header *HeaderStd) uint32 {
+	var bin_buf bytes.Buffer
+	header.Filler = 0
+	binary.Write(&bin_buf, binary.LittleEndian, header)
+	return crc32.ChecksumIEEE(bin_buf.Bytes()[0:28])
+}
+
 func printHeader(header *HeaderStd) {
     fmt.Println("Sample rate:", header.SampleRate)
     fmt.Println("Frequency  :", header.CenterFrequency)
     fmt.Println("Sample Size:", header.SampleSize)
     tm := time.Unix(header.StartTimestamp, 0)
     fmt.Println("Start      :", tm)
-}
-
-func setCRC(header *HeaderStd) {
-	var bin_buf bytes.Buffer
-	header.Filler = 0
-	binary.Write(&bin_buf, binary.LittleEndian, header)
-	header.CRC32 = crc32.ChecksumIEEE(bin_buf.Bytes()[0:28])
+	fmt.Println("CRC32      :", header.CRC32)
+	fmt.Println("CRC32 OK   :", getCRC(header))
 }
 
 func copyContent(reader *bufio.Reader, writer *bufio.Writer, blockSize uint) {

sdrbase/dsp/filerecord.h

@@ -30,15 +30,17 @@ class Message;
 class SDRBASE_API FileRecord : public BasebandSampleSink {
 public:
 
+#pragma pack(push, 1)
     struct Header
     {
-    	quint32  sampleRate;
+    	quint32 sampleRate;
         quint64 centerFrequency;
         quint64 startTimeStamp;
         quint32 sampleSize;
         quint32 filler;
         quint32 crc32;
     };
+#pragma pack(pop)
 
 	FileRecord();
     FileRecord(const QString& filename);