external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/rtc

Browse source
This commit is contained in:
winlin 2020-04-05 21:59:46 +08:00
commit 6f7ebbdc5f
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
trunk/src/kernel/srs_kernel_mp4.cpp
View file

@ -2744,10 +2744,12 @@ SrsMp4DataEntryBox* SrsMp4DataReferenceBox::entry_at(int index)
return entries.at(index); return entries.at(index);
} }
SrsMp4DataReferenceBox* SrsMp4DataReferenceBox::append2(SrsMp4DataEntryBox* v) void SrsMp4DataReferenceBox::append(SrsMp4Box* v)
{ {
entries.push_back(v); SrsMp4DataEntryBox* pv = dynamic_cast<SrsMp4DataEntryBox*>(v);
return this; if (pv) {
entries.push_back(pv);
}
} }
int SrsMp4DataReferenceBox::nb_header() int SrsMp4DataReferenceBox::nb_header()
@ -3765,10 +3767,12 @@ SrsMp4SampleEntry* SrsMp4SampleDescriptionBox::entrie_at(int index)
return entries.at(index); return entries.at(index);
} }
SrsMp4SampleDescriptionBox* SrsMp4SampleDescriptionBox::append2(SrsMp4SampleEntry* v) void SrsMp4SampleDescriptionBox::append(SrsMp4Box* v)
{ {
entries.push_back(v); SrsMp4SampleEntry* pv = dynamic_cast<SrsMp4SampleEntry*>(v);
return this; if (pv) {
entries.push_back(pv);
}
} }
int SrsMp4SampleDescriptionBox::nb_header() int SrsMp4SampleDescriptionBox::nb_header()

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

@ -1173,7 +1173,7 @@ public:
public: public:
virtual uint32_t entry_count(); virtual uint32_t entry_count();
virtual SrsMp4DataEntryBox* entry_at(int index); virtual SrsMp4DataEntryBox* entry_at(int index);
virtual SrsMp4DataReferenceBox* append2(SrsMp4DataEntryBox* v); virtual void append(SrsMp4Box* v);
protected: protected:
virtual int nb_header(); virtual int nb_header();
virtual srs_error_t encode_header(SrsBuffer* buf); virtual srs_error_t encode_header(SrsBuffer* buf);
@ -1520,7 +1520,7 @@ public:
public: public:
virtual uint32_t entry_count(); virtual uint32_t entry_count();
virtual SrsMp4SampleEntry* entrie_at(int index); virtual SrsMp4SampleEntry* entrie_at(int index);
virtual SrsMp4SampleDescriptionBox* append2(SrsMp4SampleEntry* v); virtual void append(SrsMp4Box* v);
protected: protected:
virtual int nb_header(); virtual int nb_header();
virtual srs_error_t encode_header(SrsBuffer* buf); virtual srs_error_t encode_header(SrsBuffer* buf);

8
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -4865,7 +4865,7 @@ VOID TEST(KernelMP4Test, CoverMP4CodecSingleFrame)
MockSrsFileReader fr((const char*)f.data(), f.filesize()); MockSrsFileReader fr((const char*)f.data(), f.filesize());
SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr)); SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr));
SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample; SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample = NULL;
// Sequence header. // Sequence header.
HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample)); HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample));
@ -4980,7 +4980,7 @@ VOID TEST(KernelMP4Test, CoverMP4MultipleVideos)
MockSrsFileReader fr((const char*)f.data(), f.filesize()); MockSrsFileReader fr((const char*)f.data(), f.filesize());
SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr)); SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr));
SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample; SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample = NULL;
// Sequence header. // Sequence header.
HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample)); HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample));
@ -5078,7 +5078,7 @@ VOID TEST(KernelMP4Test, CoverMP4MultipleCTTs)
MockSrsFileReader fr((const char*)f.data(), f.filesize()); MockSrsFileReader fr((const char*)f.data(), f.filesize());
SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr)); SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr));
SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample; SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample = NULL;
// Sequence header. // Sequence header.
HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample)); HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample));
@ -5190,7 +5190,7 @@ VOID TEST(KernelMP4Test, CoverMP4MultipleAVs)
MockSrsFileReader fr((const char*)f.data(), f.filesize()); MockSrsFileReader fr((const char*)f.data(), f.filesize());
SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr)); SrsMp4Decoder dec; HELPER_EXPECT_SUCCESS(dec.initialize(&fr));
SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample; SrsMp4HandlerType ht; uint16_t ft, ct; uint32_t dts, pts, nb_sample; uint8_t* sample = NULL;
// Sequence header. // Sequence header.
HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample)); HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample));