external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge SRS3

Browse source
This commit is contained in:
winlin 2020-12-17 12:27:47 +08:00
commit c97e943b07
4 changed files with 43 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
trunk/src/kernel/srs_kernel_mp4.hpp
View file

@ -71,6 +71,8 @@ class SrsMp4TrackFragmentBox;
class SrsMp4TrackFragmentHeaderBox;
class SrsMp4TrackFragmentDecodeTimeBox;
class SrsMp4TrackFragmentRunBox;
class SrsMp4EditBox;
class SrsMp4EditListBox;
// 4.2 Object Structure
// ISO_IEC_14496-12-base-format-2012.pdf, page 16
@ -766,6 +768,8 @@ public:
// Get the track header box.
virtual SrsMp4TrackHeaderBox* tkhd();
virtual void set_tkhd(SrsMp4TrackHeaderBox* v);
// Set the EDTS box.
virtual void set_edts(SrsMp4EditBox* v);
public:
// Get the chunk offset box.
virtual SrsMp4ChunkOffsetBox* stco();
@ -874,6 +878,8 @@ class SrsMp4EditBox : public SrsMp4Box
public:
SrsMp4EditBox();
virtual ~SrsMp4EditBox();
public:
virtual void set_elst(SrsMp4EditListBox* v);
};
// 8.6.6 Edit List Box
@ -1173,7 +1179,8 @@ public:
public:
virtual uint32_t entry_count();
virtual SrsMp4DataEntryBox* entry_at(int index);
virtual void append(SrsMp4Box* v);
// Note that box must be SrsMp4DataEntryBox*
virtual void append(SrsMp4Box* box);
protected:
virtual int nb_header();
virtual srs_error_t encode_header(SrsBuffer* buf);
@ -1520,7 +1527,8 @@ public:
public:
virtual uint32_t entry_count();
virtual SrsMp4SampleEntry* entrie_at(int index);
virtual void append(SrsMp4Box* v);
// Note that box must be SrsMp4SampleEntry*
virtual void append(SrsMp4Box* box);
protected:
virtual int nb_header();
virtual srs_error_t encode_header(SrsBuffer* buf);