From d045ce5d74751c887b0e92f0809eb6d03fa051af Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 19:33:08 +0800 Subject: [PATCH] Refine kernel buffer API. --- trunk/src/kernel/srs_kernel_buffer.cpp | 9 --------- trunk/src/kernel/srs_kernel_buffer.hpp | 1 - trunk/src/kernel/srs_kernel_mp4.cpp | 2 -- trunk/src/kernel/srs_kernel_mp4.hpp | 1 - 4 files changed, 13 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp index be94d0bcb..9279a04ff 100644 --- a/trunk/src/kernel/srs_kernel_buffer.cpp +++ b/trunk/src/kernel/srs_kernel_buffer.cpp @@ -45,15 +45,6 @@ ISrsCodec::~ISrsCodec() { } -SrsBuffer::SrsBuffer() -{ - p = bytes = NULL; - nb_bytes = 0; - - // TODO: support both little and big endian. - srs_assert(srs_is_little_endian()); -} - SrsBuffer::SrsBuffer(char* b, int nb_b) { p = bytes = b; diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index 532375f8d..b46de136c 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -102,7 +102,6 @@ private: // the total number of bytes. int nb_bytes; public: - SrsBuffer(); // Initialize buffer with data b and size nb_b. // @remark User must free the data b. SrsBuffer(char* b, int nb_b); diff --git a/trunk/src/kernel/srs_kernel_mp4.cpp b/trunk/src/kernel/srs_kernel_mp4.cpp index a41f27f56..5f76caf37 100644 --- a/trunk/src/kernel/srs_kernel_mp4.cpp +++ b/trunk/src/kernel/srs_kernel_mp4.cpp @@ -6276,7 +6276,6 @@ SrsMp4M2tsSegmentEncoder::SrsMp4M2tsSegmentEncoder() writer = NULL; nb_audios = nb_videos = 0; samples = new SrsMp4SampleManager(); - buffer = new SrsBuffer(); sequence_number = 0; decode_basetime = 0; styp_bytes = 0; @@ -6286,7 +6285,6 @@ SrsMp4M2tsSegmentEncoder::SrsMp4M2tsSegmentEncoder() SrsMp4M2tsSegmentEncoder::~SrsMp4M2tsSegmentEncoder() { srs_freep(samples); - srs_freep(buffer); } srs_error_t SrsMp4M2tsSegmentEncoder::initialize(ISrsWriter* w, uint32_t sequence, srs_utime_t basetime, uint32_t tid) diff --git a/trunk/src/kernel/srs_kernel_mp4.hpp b/trunk/src/kernel/srs_kernel_mp4.hpp index ea12508b6..8f3142029 100644 --- a/trunk/src/kernel/srs_kernel_mp4.hpp +++ b/trunk/src/kernel/srs_kernel_mp4.hpp @@ -2105,7 +2105,6 @@ class SrsMp4M2tsSegmentEncoder { private: ISrsWriter* writer; - SrsBuffer* buffer; uint32_t sequence_number; srs_utime_t decode_basetime; uint32_t track_id;