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

Refactor code, rename variable

Browse source
This commit is contained in:
winlin 2020-04-11 18:01:38 +08:00
parent 3cccef327c
commit c6fb5e6fdd
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/app/srs_app_rtc.cpp
View file

@ -260,23 +260,26 @@ srs_error_t SrsRtpH264Muxer::packet_stap_a(const string &sps, const string& pps,
SrsRtpOpusMuxer::SrsRtpOpusMuxer() SrsRtpOpusMuxer::SrsRtpOpusMuxer()
{ {
transcode = NULL; codec = NULL;
} }
SrsRtpOpusMuxer::~SrsRtpOpusMuxer() SrsRtpOpusMuxer::~SrsRtpOpusMuxer()
{ {
srs_freep(transcode); srs_freep(codec);
} }
srs_error_t SrsRtpOpusMuxer::initialize() srs_error_t SrsRtpOpusMuxer::initialize()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
transcode = new SrsAudioRecode(kChannel, kSamplerate); codec = new SrsAudioRecode(kChannel, kSamplerate);
if (!transcode) { if (!codec) {
return srs_error_new(ERROR_RTC_RTP_MUXER, "SrsAacOpus init failed"); return srs_error_new(ERROR_RTC_RTP_MUXER, "SrsAacOpus init failed");
} }
transcode->initialize();
if ((err = codec->initialize()) != srs_success) {
return srs_error_wrap(err, "init codec");
}
return err; return err;
} }
@ -286,7 +289,7 @@ const int kMaxOpusPackets = 8;
// The max size for each OPUS packet. // The max size for each OPUS packet.
const int kMaxOpusPacketSize = 4096; const int kMaxOpusPacketSize = 4096;
srs_error_t SrsRtpOpusMuxer::frame_to_packet(SrsSharedPtrMessage* shared_audio, SrsFormat* format, char* adts_audio, int nn_adts_audio) srs_error_t SrsRtpOpusMuxer::transcode(SrsSharedPtrMessage* shared_audio, char* adts_audio, int nn_adts_audio)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -311,7 +314,7 @@ srs_error_t SrsRtpOpusMuxer::frame_to_packet(SrsSharedPtrMessage* shared_audio,
int nn_opus_packets = 0; int nn_opus_packets = 0;
int opus_sizes[kMaxOpusPackets]; int opus_sizes[kMaxOpusPackets];
if ((err = transcode->recode(&aac, opus_payloads, opus_sizes, nn_opus_packets)) != srs_success) { if ((err = codec->recode(&aac, opus_payloads, opus_sizes, nn_opus_packets)) != srs_success) {
return srs_error_wrap(err, "recode error"); return srs_error_wrap(err, "recode error");
} }
@ -459,7 +462,7 @@ srs_error_t SrsRtc::on_audio(SrsSharedPtrMessage* shared_audio, SrsFormat* forma
} }
if (adts_audio) { if (adts_audio) {
err = rtp_opus_muxer->frame_to_packet(shared_audio, format, adts_audio, nn_adts_audio); err = rtp_opus_muxer->transcode(shared_audio, adts_audio, nn_adts_audio);
srs_freep(adts_audio); srs_freep(adts_audio);
} }

4
trunk/src/app/srs_app_rtc.hpp
View file

@ -90,13 +90,13 @@ private:
class SrsRtpOpusMuxer class SrsRtpOpusMuxer
{ {
private: private:
SrsAudioRecode* transcode; SrsAudioRecode* codec;
public: public:
SrsRtpOpusMuxer(); SrsRtpOpusMuxer();
virtual ~SrsRtpOpusMuxer(); virtual ~SrsRtpOpusMuxer();
virtual srs_error_t initialize(); virtual srs_error_t initialize();
public: public:
srs_error_t frame_to_packet(SrsSharedPtrMessage* shared_audio, SrsFormat* format, char* adts_audio, int nn_adts_audio); srs_error_t transcode(SrsSharedPtrMessage* shared_audio, char* adts_audio, int nn_adts_audio);
}; };
class SrsRtc class SrsRtc

4
trunk/src/utest/srs_utest_avc.cpp
View file

@ -462,7 +462,7 @@ VOID TEST(SrsAVCTest, AACMuxSequenceHeader)
codec.sound_rate = SrsAudioSampleRate44100; codec.sound_rate = SrsAudioSampleRate44100;
codec.sampling_frequency_index = 4; codec.sampling_frequency_index = 4;
HELPER_ASSERT_SUCCESS(h.mux_sequence_header(&codec, sh)); HELPER_ASSERT_SUCCESS(h.mux_sequence_header(&codec, sh));
EXPECT_EQ(2, sh.length()); EXPECT_EQ(2, (int)sh.length());
EXPECT_EQ(0x0a, (uint8_t)sh.at(0)); EXPECT_EQ(0x0a, (uint8_t)sh.at(0));
EXPECT_EQ(0x08, (uint8_t)sh.at(1)); EXPECT_EQ(0x08, (uint8_t)sh.at(1));
} }
@ -475,7 +475,7 @@ VOID TEST(SrsAVCTest, AACMuxSequenceHeader)
codec.sound_rate = SrsAudioSampleRate22050; codec.sound_rate = SrsAudioSampleRate22050;
codec.sampling_frequency_index = 4; codec.sampling_frequency_index = 4;
HELPER_ASSERT_SUCCESS(h.mux_sequence_header(&codec, sh)); HELPER_ASSERT_SUCCESS(h.mux_sequence_header(&codec, sh));
EXPECT_EQ(2, sh.length()); EXPECT_EQ(2, (int)sh.length());
EXPECT_EQ(0x0a, (uint8_t)sh.at(0)); EXPECT_EQ(0x0a, (uint8_t)sh.at(0));
EXPECT_EQ(0x08, (uint8_t)sh.at(1)); EXPECT_EQ(0x08, (uint8_t)sh.at(1));
} }