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 srs2, use srs_freepa for array

Browse source
This commit is contained in:
winlin 2015-11-02 11:05:39 +08:00
parent cef1ae5a8e
commit 8cec06e898
16 changed files with 69 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -419,12 +419,12 @@ SrsAvcAacCodec::SrsAvcAacCodec()
SrsAvcAacCodec::~SrsAvcAacCodec()
{
srs_freep(avc_extra_data);
srs_freep(aac_extra_data);
srs_freepa(avc_extra_data);
srs_freepa(aac_extra_data);
srs_freep(stream);
srs_freep(sequenceParameterSetNALUnit);
srs_freep(pictureParameterSetNALUnit);
srs_freepa(sequenceParameterSetNALUnit);
srs_freepa(pictureParameterSetNALUnit);
}
bool SrsAvcAacCodec::is_avc_codec_ok()
@ -500,7 +500,7 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample
// 1.6.2.1 AudioSpecificConfig, in aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 33.
aac_extra_size = stream->size() - stream->pos();
if (aac_extra_size > 0) {
srs_freep(aac_extra_data);
srs_freepa(aac_extra_data);
aac_extra_data = new char[aac_extra_size];
memcpy(aac_extra_data, stream->data() + stream->pos(), aac_extra_size);
@ -764,7 +764,7 @@ int SrsAvcAacCodec::avc_demux_sps_pps(SrsBuffer* stream)
// 5.2.4.1.1 Syntax, H.264-AVC-ISO_IEC_14496-15.pdf, page 16
avc_extra_size = stream->size() - stream->pos();
if (avc_extra_size > 0) {
srs_freep(avc_extra_data);
srs_freepa(avc_extra_data);
avc_extra_data = new char[avc_extra_size];
memcpy(avc_extra_data, stream->data() + stream->pos(), avc_extra_size);
}
@ -825,7 +825,7 @@ int SrsAvcAacCodec::avc_demux_sps_pps(SrsBuffer* stream)
return ret;
}
if (sequenceParameterSetLength > 0) {
srs_freep(sequenceParameterSetNALUnit);
srs_freepa(sequenceParameterSetNALUnit);
sequenceParameterSetNALUnit = new char[sequenceParameterSetLength];
stream->read_bytes(sequenceParameterSetNALUnit, sequenceParameterSetLength);
}
@ -854,7 +854,7 @@ int SrsAvcAacCodec::avc_demux_sps_pps(SrsBuffer* stream)
return ret;
}
if (pictureParameterSetLength > 0) {
srs_freep(pictureParameterSetNALUnit);
srs_freepa(pictureParameterSetNALUnit);
pictureParameterSetNALUnit = new char[pictureParameterSetLength];
stream->read_bytes(pictureParameterSetNALUnit, pictureParameterSetLength);
}

18
trunk/src/kernel/srs_kernel_flv.cpp
View file

@ -163,12 +163,12 @@ SrsCommonMessage::~SrsCommonMessage()
#ifdef SRS_AUTO_MEM_WATCH
srs_memory_unwatch(payload);
#endif
srs_freep(payload);
srs_freepa(payload);
}
void SrsCommonMessage::create_payload(int size)
{
srs_freep(payload);
srs_freepa(payload);
payload = new char[size];
srs_verbose("create payload for RTMP message. size=%d", size);
@ -190,7 +190,7 @@ SrsSharedPtrMessage::SrsSharedPtrPayload::~SrsSharedPtrPayload()
#ifdef SRS_AUTO_MEM_WATCH
srs_memory_unwatch(payload);
#endif
srs_freep(payload);
srs_freepa(payload);
}
SrsSharedPtrMessage::SrsSharedPtrMessage()
@ -350,9 +350,9 @@ SrsFlvEncoder::~SrsFlvEncoder()
srs_freep(tag_stream);
#ifdef SRS_PERF_FAST_FLV_ENCODER
srs_freep(tag_headers);
srs_freep(iovss_cache);
srs_freep(ppts);
srs_freepa(tag_headers);
srs_freepa(iovss_cache);
srs_freepa(ppts);
#endif
}
@ -489,7 +489,7 @@ int SrsFlvEncoder::write_tags(SrsSharedPtrMessage** msgs, int count)
int nb_iovss = 3 * count;
iovec* iovss = iovss_cache;
if (nb_iovss_cache < nb_iovss) {
srs_freep(iovss_cache);
srs_freepa(iovss_cache);
nb_iovss_cache = nb_iovss;
iovss = iovss_cache = new iovec[nb_iovss];
@ -498,7 +498,7 @@ int SrsFlvEncoder::write_tags(SrsSharedPtrMessage** msgs, int count)
// realloc the tag headers.
char* cache = tag_headers;
if (nb_tag_headers < count) {
srs_freep(tag_headers);
srs_freepa(tag_headers);
nb_tag_headers = count;
cache = tag_headers = new char[SRS_FLV_TAG_HEADER_SIZE * count];
@ -507,7 +507,7 @@ int SrsFlvEncoder::write_tags(SrsSharedPtrMessage** msgs, int count)
// realloc the pts.
char* pts = ppts;
if (nb_ppts < count) {
srs_freep(ppts);
srs_freepa(ppts);
nb_ppts = count;
pts = ppts = new char[SRS_FLV_PREVIOUS_TAG_SIZE * count];

24
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -927,7 +927,7 @@ SrsTsAdaptationField::SrsTsAdaptationField(SrsTsPacket* pkt)
SrsTsAdaptationField::~SrsTsAdaptationField()
{
srs_freep(transport_private_data);
srs_freepa(transport_private_data);
}
int SrsTsAdaptationField::decode(SrsBuffer* stream)
@ -1052,7 +1052,7 @@ int SrsTsAdaptationField::decode(SrsBuffer* stream)
srs_error("ts: demux af transport_private_data_flag failed. ret=%d", ret);
return ret;
}
srs_freep(transport_private_data);
srs_freepa(transport_private_data);
transport_private_data = new char[transport_private_data_length];
stream->read_bytes(transport_private_data, transport_private_data_length);
}
@ -1337,9 +1337,9 @@ SrsTsPayloadPES::SrsTsPayloadPES(SrsTsPacket* p) : SrsTsPayload(p)
SrsTsPayloadPES::~SrsTsPayloadPES()
{
srs_freep(PES_private_data);
srs_freep(pack_field);
srs_freep(PES_extension_field);
srs_freepa(PES_private_data);
srs_freepa(pack_field);
srs_freepa(PES_extension_field);
}
int SrsTsPayloadPES::decode(SrsBuffer* stream, SrsTsMessage** ppmsg)
@ -1616,7 +1616,7 @@ int SrsTsPayloadPES::decode(SrsBuffer* stream, SrsTsMessage** ppmsg)
// 16B
if (PES_private_data_flag) {
srs_freep(PES_private_data);
srs_freepa(PES_private_data);
PES_private_data = new char[16];
stream->read_bytes(PES_private_data, 16);
}
@ -1632,7 +1632,7 @@ int SrsTsPayloadPES::decode(SrsBuffer* stream, SrsTsMessage** ppmsg)
srs_error("ts: demux PSE ext pack failed. ret=%d", ret);
return ret;
}
srs_freep(pack_field);
srs_freepa(pack_field);
pack_field = new char[pack_field_length];
stream->read_bytes(pack_field, pack_field_length);
}
@ -1670,7 +1670,7 @@ int SrsTsPayloadPES::decode(SrsBuffer* stream, SrsTsMessage** ppmsg)
srs_error("ts: demux PSE ext field failed. ret=%d", ret);
return ret;
}
srs_freep(PES_extension_field);
srs_freepa(PES_extension_field);
PES_extension_field = new char[PES_extension_field_length];
stream->read_bytes(PES_extension_field, PES_extension_field_length);
}
@ -2433,7 +2433,7 @@ SrsTsPayloadPMTESInfo::SrsTsPayloadPMTESInfo(SrsTsStream st, int16_t epid)
SrsTsPayloadPMTESInfo::~SrsTsPayloadPMTESInfo()
{
srs_freep(ES_info);
srs_freepa(ES_info);
}
int SrsTsPayloadPMTESInfo::decode(SrsBuffer* stream)
@ -2463,7 +2463,7 @@ int SrsTsPayloadPMTESInfo::decode(SrsBuffer* stream)
srs_error("ts: demux PMT es info data failed. ret=%d", ret);
return ret;
}
srs_freep(ES_info);
srs_freepa(ES_info);
ES_info = new char[ES_info_length];
stream->read_bytes(ES_info, ES_info_length);
}
@ -2520,7 +2520,7 @@ SrsTsPayloadPMT::SrsTsPayloadPMT(SrsTsPacket* p) : SrsTsPayloadPSI(p)
SrsTsPayloadPMT::~SrsTsPayloadPMT()
{
srs_freep(program_info_desc);
srs_freepa(program_info_desc);
std::vector<SrsTsPayloadPMTESInfo*>::iterator it;
for (it = infos.begin(); it != infos.end(); ++it) {
@ -2574,7 +2574,7 @@ int SrsTsPayloadPMT::psi_decode(SrsBuffer* stream)
return ret;
}
srs_freep(program_info_desc);
srs_freepa(program_info_desc);
program_info_desc = new char[program_info_length];
stream->read_bytes(program_info_desc, program_info_length);
}