winlin

fix research bug, rename srs_freepa to srs_freep

@@ -640,7 +640,7 @@ TSContext::TSContext() @@ -640,7 +640,7 @@ TSContext::TSContext()
640 640
641 TSContext::~TSContext() 641 TSContext::~TSContext()
642 { 642 {
643 - srs_freepa(pids); 643 + srs_freep(pids);
644 644
645 std::map<TSPidTable, TSMessage*>::iterator it; 645 std::map<TSPidTable, TSMessage*>::iterator it;
646 for (it = msgs.begin(); it != msgs.end(); ++it) { 646 for (it = msgs.begin(); it != msgs.end(); ++it) {
@@ -683,7 +683,7 @@ void TSContext::push(TSPidTable pid, TSStreamType stream_type, TSPidType type, u @@ -683,7 +683,7 @@ void TSContext::push(TSPidTable pid, TSStreamType stream_type, TSPidType type, u
683 p[pid_size] = (TSPid){type, stream_type, pid, continuity_counter}; 683 p[pid_size] = (TSPid){type, stream_type, pid, continuity_counter};
684 pid_size++; 684 pid_size++;
685 685
686 - srs_freepa(pids); 686 + srs_freep(pids);
687 pids = p; 687 pids = p;
688 } 688 }
689 689
@@ -726,7 +726,7 @@ TSMessage::TSMessage() @@ -726,7 +726,7 @@ TSMessage::TSMessage()
726 726
727 TSMessage::~TSMessage() 727 TSMessage::~TSMessage()
728 { 728 {
729 - srs_freepa(packet_data); 729 + srs_freep(packet_data);
730 } 730 }
731 731
732 void TSMessage::append(u_int8_t*& p, int size) 732 void TSMessage::append(u_int8_t*& p, int size)
@@ -802,9 +802,9 @@ TSAdaptionField::TSAdaptionField() @@ -802,9 +802,9 @@ TSAdaptionField::TSAdaptionField()
802 802
803 TSAdaptionField::~TSAdaptionField() 803 TSAdaptionField::~TSAdaptionField()
804 { 804 {
805 - srs_freepa(transport_private_data);  
806 - srs_freepa(af_ext_reserved);  
807 - srs_freepa(af_reserved); 805 + srs_freep(transport_private_data);
  806 + srs_freep(af_ext_reserved);
  807 + srs_freep(af_reserved);
808 } 808 }
809 809
810 int TSAdaptionField::get_size() 810 int TSAdaptionField::get_size()
@@ -966,7 +966,7 @@ TSPayloadReserved::TSPayloadReserved() @@ -966,7 +966,7 @@ TSPayloadReserved::TSPayloadReserved()
966 966
967 TSPayloadReserved::~TSPayloadReserved() 967 TSPayloadReserved::~TSPayloadReserved()
968 { 968 {
969 - srs_freepa(bytes); 969 + srs_freep(bytes);
970 } 970 }
971 971
972 int TSPayloadReserved::demux(TSContext* ctx, TSPacket* pkt, u_int8_t* start, u_int8_t* last, u_int8_t*& p, TSMessage*& pmsg) 972 int TSPayloadReserved::demux(TSContext* ctx, TSPacket* pkt, u_int8_t* start, u_int8_t* last, u_int8_t*& p, TSMessage*& pmsg)
@@ -1003,7 +1003,7 @@ TSPayloadPAT::TSPayloadPAT() @@ -1003,7 +1003,7 @@ TSPayloadPAT::TSPayloadPAT()
1003 1003
1004 TSPayloadPAT::~TSPayloadPAT() 1004 TSPayloadPAT::~TSPayloadPAT()
1005 { 1005 {
1006 - srs_freepa(programs); 1006 + srs_freep(programs);
1007 } 1007 }
1008 1008
1009 int TSPayloadPAT::demux(TSContext* ctx, TSPacket* pkt, u_int8_t* start, u_int8_t* last, u_int8_t*& p, TSMessage*& pmsg) 1009 int TSPayloadPAT::demux(TSContext* ctx, TSPacket* pkt, u_int8_t* start, u_int8_t* last, u_int8_t*& p, TSMessage*& pmsg)
@@ -1068,7 +1068,7 @@ TSPMTESInfo::TSPMTESInfo() @@ -1068,7 +1068,7 @@ TSPMTESInfo::TSPMTESInfo()
1068 1068
1069 TSPMTESInfo::~TSPMTESInfo() 1069 TSPMTESInfo::~TSPMTESInfo()
1070 { 1070 {
1071 - srs_freepa(ES_info); 1071 + srs_freep(ES_info);
1072 } 1072 }
1073 1073
1074 TSPayloadPMT::TSPayloadPMT() 1074 TSPayloadPMT::TSPayloadPMT()
@@ -1090,7 +1090,7 @@ TSPayloadPMT::TSPayloadPMT() @@ -1090,7 +1090,7 @@ TSPayloadPMT::TSPayloadPMT()
1090 1090
1091 TSPayloadPMT::~TSPayloadPMT() 1091 TSPayloadPMT::~TSPayloadPMT()
1092 { 1092 {
1093 - srs_freepa(program_info_desc); 1093 + srs_freep(program_info_desc);
1094 1094
1095 for (std::vector<TSPMTESInfo*>::iterator it = ES_info.begin(); it != ES_info.end(); ++it) { 1095 for (std::vector<TSPMTESInfo*>::iterator it = ES_info.begin(); it != ES_info.end(); ++it) {
1096 TSPMTESInfo* info = *it; 1096 TSPMTESInfo* info = *it;
@@ -1251,10 +1251,10 @@ TSPayloadPES::TSPayloadPES() @@ -1251,10 +1251,10 @@ TSPayloadPES::TSPayloadPES()
1251 1251
1252 TSPayloadPES::~TSPayloadPES() 1252 TSPayloadPES::~TSPayloadPES()
1253 { 1253 {
1254 - srs_freepa(PES_private_data);  
1255 - srs_freepa(pack_field);  
1256 - srs_freepa(PES_extension_field);  
1257 - srs_freepa(stuffing_byte); 1254 + srs_freep(PES_private_data);
  1255 + srs_freep(pack_field);
  1256 + srs_freep(PES_extension_field);
  1257 + srs_freep(stuffing_byte);
1258 } 1258 }
1259 1259
1260 int64_t TSPayloadPES::decode_33bits_int(u_int8_t*& p, int64_t& temp) 1260 int64_t TSPayloadPES::decode_33bits_int(u_int8_t*& p, int64_t& temp)