diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
index 06f59ad4b..ec059d39e 100644
--- a/trunk/src/app/srs_app_rtc_conn.cpp
+++ b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -771,9 +771,17 @@ srs_error_t SrsRtcPlayer::messages_to_packets(SrsRtcSource* source, const vector
         if (pkt->is_audio()) {
             info.nn_audios++;
 
-            if ((err = package_opus(pkt)) != srs_success) {
-                return srs_error_wrap(err, "package opus");
+            pkt->header.set_timestamp(audio_timestamp);
+            pkt->header.set_sequence(audio_sequence++);
+            pkt->header.set_ssrc(audio_ssrc);
+            pkt->header.set_payload_type(audio_payload_type);
+
+            // TODO: FIXME: Padding audio to the max payload in RTP packets.
+            if (max_padding > 0) {
             }
+
+            // TODO: FIXME: Why 960? Need Refactoring?
+            audio_timestamp += 960;
             continue;
         }
 
@@ -781,44 +789,14 @@ srs_error_t SrsRtcPlayer::messages_to_packets(SrsRtcSource* source, const vector
         info.nn_videos++;
 
         // For video, we should set the RTP packet informations about this consumer.
-        if ((err = package_video(pkt)) != srs_success) {
-            return srs_error_wrap(err, "package video");
-        }
+        pkt->header.set_sequence(video_sequence++);
+        pkt->header.set_ssrc(video_ssrc);
+        pkt->header.set_payload_type(video_payload_type);
     }
 
     return err;
 }
 
-srs_error_t SrsRtcPlayer::package_opus(SrsRtpPacket2* pkt)
-{
-    srs_error_t err = srs_success;
-
-    pkt->header.set_timestamp(audio_timestamp);
-    pkt->header.set_sequence(audio_sequence++);
-    pkt->header.set_ssrc(audio_ssrc);
-    pkt->header.set_payload_type(audio_payload_type);
-
-    // TODO: FIXME: Padding audio to the max payload in RTP packets.
-    if (max_padding > 0) {
-    }
-
-    // TODO: FIXME: Why 960? Need Refactoring?
-    audio_timestamp += 960;
-
-    return err;
-}
-
-srs_error_t SrsRtcPlayer::package_video(SrsRtpPacket2* pkt)
-{
-    srs_error_t err = srs_success;
-
-    pkt->header.set_sequence(video_sequence++);
-    pkt->header.set_ssrc(video_ssrc);
-    pkt->header.set_payload_type(video_payload_type);
-
-    return err;
-}
-
 srs_error_t SrsRtcPlayer::send_packets(const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info)
 {
     srs_error_t err = srs_success;
diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp
index f92820df3..59c746d47 100644
--- a/trunk/src/app/srs_app_rtc_conn.hpp
+++ b/trunk/src/app/srs_app_rtc_conn.hpp
@@ -242,8 +242,6 @@ public:
 private:
     srs_error_t send_messages(SrsRtcSource* source, const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
     srs_error_t messages_to_packets(SrsRtcSource* source, const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
-    srs_error_t package_opus(SrsRtpPacket2* pkt);
-    srs_error_t package_video(SrsRtpPacket2* pkt);
     srs_error_t send_packets(const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
     srs_error_t send_packets_gso(const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
 public: