From f228b3809a06f51dde2d5f8791aa28f5ed9b5e65 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 5 Apr 2020 21:22:50 +0800 Subject: [PATCH] Fix utest failed. --- trunk/src/kernel/srs_kernel_mp4.cpp | 16 ++++++++++------ trunk/src/kernel/srs_kernel_mp4.hpp | 4 ++-- trunk/src/utest/srs_utest_kernel.cpp | 8 ++++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_mp4.cpp b/trunk/src/kernel/srs_kernel_mp4.cpp index 93d7bb544..5f83d0e47 100644 --- a/trunk/src/kernel/srs_kernel_mp4.cpp +++ b/trunk/src/kernel/srs_kernel_mp4.cpp @@ -2744,10 +2744,12 @@ SrsMp4DataEntryBox* SrsMp4DataReferenceBox::entry_at(int index) return entries.at(index); } -SrsMp4DataReferenceBox* SrsMp4DataReferenceBox::append2(SrsMp4DataEntryBox* v) +void SrsMp4DataReferenceBox::append(SrsMp4Box* v) { - entries.push_back(v); - return this; + SrsMp4DataEntryBox* pv = dynamic_cast(v); + if (pv) { + entries.push_back(pv); + } } int SrsMp4DataReferenceBox::nb_header() @@ -3765,10 +3767,12 @@ SrsMp4SampleEntry* SrsMp4SampleDescriptionBox::entrie_at(int index) return entries.at(index); } -SrsMp4SampleDescriptionBox* SrsMp4SampleDescriptionBox::append2(SrsMp4SampleEntry* v) +void SrsMp4SampleDescriptionBox::append(SrsMp4Box* v) { - entries.push_back(v); - return this; + SrsMp4SampleEntry* pv = dynamic_cast(v); + if (pv) { + entries.push_back(pv); + } } int SrsMp4SampleDescriptionBox::nb_header() diff --git a/trunk/src/kernel/srs_kernel_mp4.hpp b/trunk/src/kernel/srs_kernel_mp4.hpp index 3b9ceefa7..ea12508b6 100644 --- a/trunk/src/kernel/srs_kernel_mp4.hpp +++ b/trunk/src/kernel/srs_kernel_mp4.hpp @@ -1173,7 +1173,7 @@ public: public: virtual uint32_t entry_count(); virtual SrsMp4DataEntryBox* entry_at(int index); - virtual SrsMp4DataReferenceBox* append2(SrsMp4DataEntryBox* v); + virtual void append(SrsMp4Box* v); protected: virtual int nb_header(); virtual srs_error_t encode_header(SrsBuffer* buf); @@ -1520,7 +1520,7 @@ public: public: virtual uint32_t entry_count(); virtual SrsMp4SampleEntry* entrie_at(int index); - virtual SrsMp4SampleDescriptionBox* append2(SrsMp4SampleEntry* v); + virtual void append(SrsMp4Box* v); protected: virtual int nb_header(); virtual srs_error_t encode_header(SrsBuffer* buf); diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index 9f1c6cf18..98a7a9b89 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -4865,7 +4865,7 @@ VOID TEST(KernelMP4Test, CoverMP4CodecSingleFrame) MockSrsFileReader fr((const char*)f.data(), f.filesize()); 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. 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()); 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. 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()); 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. 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()); 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. HELPER_EXPECT_SUCCESS(dec.read_sample(&ht, &ft, &ct, &dts, &pts, &sample, &nb_sample));