From d02b56021773b1eb0038b3bf39d3154cd8f4f332 Mon Sep 17 00:00:00 2001 From: kyxlx550 Date: Sat, 25 Jul 2020 11:23:08 +0800 Subject: [PATCH] remove 28181 is_aac define --- trunk/src/app/srs_app_gb28181.cpp | 13 ------------- trunk/src/app/srs_app_gb28181.hpp | 1 - 2 files changed, 14 deletions(-) diff --git a/trunk/src/app/srs_app_gb28181.cpp b/trunk/src/app/srs_app_gb28181.cpp index 2d56ab67e..ec0b7022b 100644 --- a/trunk/src/app/srs_app_gb28181.cpp +++ b/trunk/src/app/srs_app_gb28181.cpp @@ -593,19 +593,6 @@ int64_t SrsPsStreamDemixer::parse_ps_timestamp(const uint8_t* p) return val; } -bool SrsPsStreamDemixer::is_aac(){ - // SrsBuffer *avs = new SrsBuffer(stream->bytes(), stream->length()); - // SrsAutoFree(SrsBuffer, avs); - // if (!avs->empty()) { - // char* frame = NULL; - // int frame_size = 0; - // SrsRawAacStreamCodec codec; - // if ((err = aac->adts_demux(avs, &frame, &frame_size, codec)) != srs_success) { - // return srs_error_wrap(err, "demux adts"); - // } - return true; -} - srs_error_t SrsPsStreamDemixer::on_ps_stream(char* ps_data, int ps_size, uint32_t timestamp, uint32_t ssrc) { srs_error_t err = srs_success; diff --git a/trunk/src/app/srs_app_gb28181.hpp b/trunk/src/app/srs_app_gb28181.hpp index a68fde27d..b50685070 100644 --- a/trunk/src/app/srs_app_gb28181.hpp +++ b/trunk/src/app/srs_app_gb28181.hpp @@ -260,7 +260,6 @@ private: public: int64_t parse_ps_timestamp(const uint8_t* p); std::string get_ps_map_type_str(uint8_t); - bool is_aac(); virtual srs_error_t on_ps_stream(char* ps_data, int ps_size, uint32_t timestamp, uint32_t ssrc); };