From c6fb5e6fdd3596b5545dcd038badf3955579cff5 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 11 Apr 2020 18:01:38 +0800
Subject: [PATCH] Refactor code, rename variable

---
 trunk/src/app/srs_app_rtc.cpp     | 19 +++++++++++--------
 trunk/src/app/srs_app_rtc.hpp     |  4 ++--
 trunk/src/utest/srs_utest_avc.cpp |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp
index 7b74ba3fe..c99db24ce 100644
--- a/trunk/src/app/srs_app_rtc.cpp
+++ b/trunk/src/app/srs_app_rtc.cpp
@@ -260,23 +260,26 @@ srs_error_t SrsRtpH264Muxer::packet_stap_a(const string &sps, const string& pps,
 
 SrsRtpOpusMuxer::SrsRtpOpusMuxer()
 {
-    transcode = NULL;
+    codec = NULL;
 }
 
 SrsRtpOpusMuxer::~SrsRtpOpusMuxer()
 {
-    srs_freep(transcode);
+    srs_freep(codec);
 }
 
 srs_error_t SrsRtpOpusMuxer::initialize()
 {
     srs_error_t err = srs_success;
 
-    transcode = new SrsAudioRecode(kChannel, kSamplerate);
-    if (!transcode) {
+    codec = new SrsAudioRecode(kChannel, kSamplerate);
+    if (!codec) {
         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;
 }
@@ -286,7 +289,7 @@ const int kMaxOpusPackets = 8;
 // The max size for each OPUS packet.
 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;
 
@@ -311,7 +314,7 @@ srs_error_t SrsRtpOpusMuxer::frame_to_packet(SrsSharedPtrMessage* shared_audio,
 
     int nn_opus_packets = 0;
     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");
     }
 
@@ -459,7 +462,7 @@ srs_error_t SrsRtc::on_audio(SrsSharedPtrMessage* shared_audio, SrsFormat* forma
     }
 
     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);
     }
 
diff --git a/trunk/src/app/srs_app_rtc.hpp b/trunk/src/app/srs_app_rtc.hpp
index 855c2e62b..320a9e277 100644
--- a/trunk/src/app/srs_app_rtc.hpp
+++ b/trunk/src/app/srs_app_rtc.hpp
@@ -90,13 +90,13 @@ private:
 class SrsRtpOpusMuxer
 {
 private:
-    SrsAudioRecode* transcode;
+    SrsAudioRecode* codec;
 public:
     SrsRtpOpusMuxer();
     virtual ~SrsRtpOpusMuxer();
     virtual srs_error_t initialize();
 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
diff --git a/trunk/src/utest/srs_utest_avc.cpp b/trunk/src/utest/srs_utest_avc.cpp
index 4aa8f037f..60b4bb29d 100644
--- a/trunk/src/utest/srs_utest_avc.cpp
+++ b/trunk/src/utest/srs_utest_avc.cpp
@@ -462,7 +462,7 @@ VOID TEST(SrsAVCTest, AACMuxSequenceHeader)
         codec.sound_rate = SrsAudioSampleRate44100;
         codec.sampling_frequency_index = 4;
         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(0x08, (uint8_t)sh.at(1));
     }
@@ -475,7 +475,7 @@ VOID TEST(SrsAVCTest, AACMuxSequenceHeader)
         codec.sound_rate = SrsAudioSampleRate22050;
         codec.sampling_frequency_index = 4;
         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(0x08, (uint8_t)sh.at(1));
     }