diff --git a/trunk/src/app/srs_app_audio_recode.cpp b/trunk/src/app/srs_app_audio_recode.cpp
index ba6a9cf65..d716766c6 100644
--- a/trunk/src/app/srs_app_audio_recode.cpp
+++ b/trunk/src/app/srs_app_audio_recode.cpp
@@ -384,6 +384,7 @@ srs_error_t SrsAudioRecode::initialize()
     return err;
 }
 
+// TODO: FIXME: Rename to transcode.
 srs_error_t SrsAudioRecode::recode(SrsSample *pkt, char **buf, int *buf_len, int &n)
 {
     srs_error_t err = srs_success;
diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp
index 360f3a6b7..3cf8dc1eb 100644
--- a/trunk/src/app/srs_app_rtc.cpp
+++ b/trunk/src/app/srs_app_rtc.cpp
@@ -402,6 +402,7 @@ srs_error_t SrsRtpOpusMuxer::packet_opus(SrsSharedPtrMessage* shared_frame, SrsS
     stream->write_2bytes(sequence);
     // timestamp
     stream->write_4bytes(int32_t(timestamp));
+    // TODO: FIXME: Why 960? Need Refactoring?
     timestamp += 960;
     // ssrc
     stream->write_4bytes(int32_t(kAudioSSRC));
diff --git a/trunk/src/app/srs_app_rtc.hpp b/trunk/src/app/srs_app_rtc.hpp
index e0a147c73..27974943f 100644
--- a/trunk/src/app/srs_app_rtc.hpp
+++ b/trunk/src/app/srs_app_rtc.hpp
@@ -85,6 +85,7 @@ private:
 class SrsRtpOpusMuxer
 {
 private:
+    // TODO: FIXME: How to handle timestamp overflow?
     uint32_t timestamp;
     uint16_t sequence;
     SrsAudioRecode* recoder;