Update to version 2
This commit is contained in:
@@ -31,8 +31,8 @@ namespace CAPS {
|
||||
//*****************************************************************************
|
||||
|
||||
struct Steim2Frame {
|
||||
u_int32_t nibble_word;
|
||||
u_int32_t sample_word[15];
|
||||
u_int32_t nibbleWord;
|
||||
u_int32_t sampleWord[15];
|
||||
};
|
||||
|
||||
//*****************************************************************************
|
||||
@@ -43,8 +43,8 @@ template<typename T>
|
||||
class Steim2Encoder : public Encoder {
|
||||
public:
|
||||
Steim2Encoder(MSEEDFormat *format, int freqn, int freqd)
|
||||
: Encoder(freqn, freqd), format(format), frame_count(0),
|
||||
bp(0), fp(0), spw(4), last_sample(0), nibble_word(0) {
|
||||
: Encoder(freqn, freqd), _format(format), _frameCount(0)
|
||||
, _bp(0), _fp(0), _spw(4), _lastSample(0), _nibbleWord(0) {
|
||||
}
|
||||
virtual ~Steim2Encoder();
|
||||
virtual void flush();
|
||||
@@ -53,34 +53,34 @@ class Steim2Encoder : public Encoder {
|
||||
virtual int type() const { return DE_STEIM2; }
|
||||
|
||||
private:
|
||||
void update_spw(int bp);
|
||||
void updateSpw(int bp);
|
||||
void store(int32_t value);
|
||||
void init_packet();
|
||||
void finish_packet();
|
||||
void update_packet();
|
||||
void initPacket();
|
||||
void updatePacket();
|
||||
void finishPacket();
|
||||
|
||||
MSEEDEncoderPacket<Steim2Frame> get_packet() {
|
||||
return format->get_packet<Steim2Frame>(_clk.get_time(bp),
|
||||
MSEEDEncoderPacket<Steim2Frame> getPacket() {
|
||||
return _format->getPacket<Steim2Frame>(_clk.getTime(_bp),
|
||||
_clk.correction(), _timingQuality);
|
||||
}
|
||||
|
||||
void queue_packet(MSEEDEncoderPacket<Steim2Frame> &pckt);
|
||||
void queuePacket(MSEEDEncoderPacket<Steim2Frame> &pckt);
|
||||
|
||||
int number_of_frames(const MSEEDEncoderPacket<Steim2Frame> &packet) {
|
||||
int numberOfFrames(const MSEEDEncoderPacket<Steim2Frame> &packet) const {
|
||||
return (packet.datalen >> 6);
|
||||
}
|
||||
|
||||
private:
|
||||
MSEEDFormat *format;
|
||||
int frame_count;
|
||||
int bp;
|
||||
int fp;
|
||||
int32_t last_s;
|
||||
int spw;
|
||||
int32_t last_sample;
|
||||
int32_t buf[8];
|
||||
u_int32_t nibble_word;
|
||||
MSEEDEncoderPacket<Steim2Frame> current_packet;
|
||||
MSEEDFormat *_format;
|
||||
int _frameCount;
|
||||
int _bp;
|
||||
int _fp;
|
||||
int32_t _last_s;
|
||||
int _spw;
|
||||
int32_t _lastSample;
|
||||
int32_t _buf[8];
|
||||
u_int32_t _nibbleWord;
|
||||
MSEEDEncoderPacket<Steim2Frame> _currentPacket;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user