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

AVC/HEVC/VVC serialize()/deserialize() are not virtual

Browse Source
This commit is contained in:
jcdr428 2022-01-23 13:49:44 +01:00
parent 518151ea21
commit 93e21e6324
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tsMuxer/hevc.h
View File

@ -49,7 +49,7 @@ struct HevcUnit
};
void decodeBuffer(const uint8_t* buffer, const uint8_t* end);
virtual int deserialize();
int deserialize();
int serializeBuffer(uint8_t* dstBuffer, uint8_t* dstEnd) const;
int nalBufferLen() const { return m_nalBufferLen; }
@ -87,7 +87,7 @@ struct HevcUnitWithProfile : public HevcUnit
struct HevcVpsUnit : public HevcUnitWithProfile
{
HevcVpsUnit();
int deserialize() override;
int deserialize();
double getFPS() const;
void setFPS(double value);
std::string getDescription() const;
@ -102,7 +102,7 @@ struct HevcVpsUnit : public HevcUnitWithProfile
struct HevcSpsUnit : public HevcUnitWithProfile
{
HevcSpsUnit();
int deserialize() override;
int deserialize();
double getFPS() const;
std::string getDescription() const;
@ -145,7 +145,7 @@ struct HevcSpsUnit : public HevcUnitWithProfile
struct HevcPpsUnit : public HevcUnit
{
HevcPpsUnit();
int deserialize() override;
int deserialize();
public:
unsigned pps_id;
@ -158,7 +158,7 @@ struct HevcPpsUnit : public HevcUnit
struct HevcHdrUnit : public HevcUnit
{
HevcHdrUnit();
int deserialize() override;
int deserialize();
public:
bool isHDR10;

2
tsMuxer/movDemuxer.cpp
View File

@ -242,7 +242,7 @@ class MovParsedH264TrackData : public ParsedTrackPrivData
{
public:
MovParsedH264TrackData(MovDemuxer* demuxer, MOVStreamContext* sc)
: ParsedTrackPrivData(), m_demuxer(demuxer), m_sc(sc), nal_length_size(4)
: ParsedTrackPrivData(), m_sc(sc), m_demuxer(demuxer), nal_length_size(4)
{
}
void setPrivData(uint8_t* buff, int size) override

8
tsMuxer/nalUnits.h
View File

@ -81,9 +81,9 @@ class NALUnit
static int decodeNAL(const uint8_t* srcBuffer, const uint8_t* srcEnd, uint8_t* dstBuffer, size_t dstBufferSize);
int decodeNAL2(uint8_t* srcBuffer, uint8_t* srcEnd, uint8_t* dstBuffer, size_t dstBufferSize,
bool* keepSrcBuffer); // do not copy buffer if nothink to decode
virtual int deserialize(uint8_t* buffer, uint8_t* end);
int deserialize(uint8_t* buffer, uint8_t* end);
virtual int serializeBuffer(uint8_t* dstBuffer, uint8_t* dstEnd, bool writeStartCode) const;
virtual int serialize(uint8_t* dstBuffer);
int serialize(uint8_t* dstBuffer);
// void setBuffer(uint8_t* buffer, uint8_t* end);
void decodeBuffer(const uint8_t* buffer, const uint8_t* end);
static uint8_t* addStartCode(uint8_t* buffer, uint8_t* boundStart);
@ -119,8 +119,8 @@ class NALDelimiter : public NALUnit
const static int PCT_I_SI_P_SP_B_FRAMES = 7;
int primary_pic_type;
NALDelimiter() : NALUnit(), primary_pic_type(0) {}
int deserialize(uint8_t* buffer, uint8_t* end) override;
int serialize(uint8_t* dstBuffer) override;
int deserialize(uint8_t* buffer, uint8_t* end);
int serialize(uint8_t* dstBuffer);
};
class PPSUnit : public NALUnit

8
tsMuxer/vvc.h
View File

@ -50,7 +50,7 @@ struct VvcUnit
};
void decodeBuffer(const uint8_t* buffer, const uint8_t* end);
virtual int deserialize();
int deserialize();
int serializeBuffer(uint8_t* dstBuffer, uint8_t* dstEnd) const;
int nalBufferLen() const { return m_nalBufferLen; }
@ -95,7 +95,7 @@ struct VvcUnitWithProfile : public VvcUnit
struct VvcVpsUnit : public VvcUnitWithProfile
{
VvcVpsUnit();
int deserialize() override;
int deserialize();
double getFPS() const;
void setFPS(double value);
std::string getDescription() const;
@ -113,7 +113,7 @@ struct VvcVpsUnit : public VvcUnitWithProfile
struct VvcSpsUnit : public VvcUnitWithProfile
{
VvcSpsUnit();
int deserialize() override;
int deserialize();
double getFPS() const;
std::string getDescription() const;
@ -152,7 +152,7 @@ struct VvcSpsUnit : public VvcUnitWithProfile
struct VvcPpsUnit : public VvcUnit
{
VvcPpsUnit();
int deserialize() override;
int deserialize();
public:
int pps_id;