calc the delta for time jitter for video

@@ -68,11 +68,11 @@ int SrsConsumer::get_time()
 	return (int)last_pkt_correct_time;
 	return (int)last_pkt_correct_time;
 }
 }
 
 
-int SrsConsumer::enqueue(SrsSharedPtrMessage* msg, int audio_sample_rate)
+int SrsConsumer::enqueue(SrsSharedPtrMessage* msg, int audio_sample_rate, int video_frame_rate)
 {
 {
 	int ret = ERROR_SUCCESS;
 	int ret = ERROR_SUCCESS;
 	
 	
-	if ((ret = jitter_correct(msg, audio_sample_rate)) != ERROR_SUCCESS) {
+	if ((ret = jitter_correct(msg, audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 		return ret;
 		return ret;
 	}
 	}
 	
 	
@@ -179,7 +179,7 @@ void SrsConsumer::shrink()
 	}
 	}
 }
 }
 
 
-int SrsConsumer::jitter_correct(SrsSharedPtrMessage* msg, int audio_sample_rate)
+int SrsConsumer::jitter_correct(SrsSharedPtrMessage* msg, int audio_sample_rate, int video_frame_rate)
 {
 {
 	int ret = ERROR_SUCCESS;
 	int ret = ERROR_SUCCESS;
 	
 	
@@ -201,6 +201,8 @@ int SrsConsumer::jitter_correct(SrsSharedPtrMessage* msg, int audio_sample_rate)
 		// calc the right diff by audio sample rate
 		// calc the right diff by audio sample rate
 		if (msg->header.is_audio() && audio_sample_rate > 0) {
 		if (msg->header.is_audio() && audio_sample_rate > 0) {
 			delta = (int32_t)(delta * 1000.0 / audio_sample_rate);
 			delta = (int32_t)(delta * 1000.0 / audio_sample_rate);
+		} else if (msg->header.is_video() && video_frame_rate > 0) {
+			delta = (int32_t)(delta * 1.0 / video_frame_rate);
 		} else {
 		} else {
 			delta = DEFAULT_FRAME_TIME_MS;
 			delta = DEFAULT_FRAME_TIME_MS;
 		}
 		}
@@ -244,7 +246,7 @@ SrsSource::SrsSource(std::string _stream_url)
 	cached_video_count = 0;
 	cached_video_count = 0;
 	enable_gop_cache = true;
 	enable_gop_cache = true;
 	
 	
-	audio_sample_rate = 0;
+	video_frame_rate = audio_sample_rate = 0;
 }
 }
 
 
 SrsSource::~SrsSource()
 SrsSource::~SrsSource()
@@ -278,6 +280,11 @@ int SrsSource::on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata
 			audio_sample_rate = (int)(srs_amf0_convert<SrsAmf0Number>(prop)->value);
 			audio_sample_rate = (int)(srs_amf0_convert<SrsAmf0Number>(prop)->value);
 		}
 		}
 	}
 	}
+	if ((prop = metadata->metadata->get_property("framerate")) != NULL) {
+		if (prop->is_number()) {
+			video_frame_rate = (int)(srs_amf0_convert<SrsAmf0Number>(prop)->value);
+		}
+	}
 	
 	
 	// encode the metadata to payload
 	// encode the metadata to payload
 	int size = metadata->get_payload_length();
 	int size = metadata->get_payload_length();
@@ -311,7 +318,7 @@ int SrsSource::on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata
 	std::vector<SrsConsumer*>::iterator it;
 	std::vector<SrsConsumer*>::iterator it;
 	for (it = consumers.begin(); it != consumers.end(); ++it) {
 	for (it = consumers.begin(); it != consumers.end(); ++it) {
 		SrsConsumer* consumer = *it;
 		SrsConsumer* consumer = *it;
-		if ((ret = consumer->enqueue(cache_metadata->copy(), audio_sample_rate)) != ERROR_SUCCESS) {
+		if ((ret = consumer->enqueue(cache_metadata->copy(), audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 			srs_error("dispatch the metadata failed. ret=%d", ret);
 			srs_error("dispatch the metadata failed. ret=%d", ret);
 			return ret;
 			return ret;
 		}
 		}
@@ -341,7 +348,7 @@ int SrsSource::on_audio(SrsCommonMessage* audio)
 	std::vector<SrsConsumer*>::iterator it;
 	std::vector<SrsConsumer*>::iterator it;
 	for (it = consumers.begin(); it != consumers.end(); ++it) {
 	for (it = consumers.begin(); it != consumers.end(); ++it) {
 		SrsConsumer* consumer = *it;
 		SrsConsumer* consumer = *it;
-		if ((ret = consumer->enqueue(msg->copy(), audio_sample_rate)) != ERROR_SUCCESS) {
+		if ((ret = consumer->enqueue(msg->copy(), audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 			srs_error("dispatch the audio failed. ret=%d", ret);
 			srs_error("dispatch the audio failed. ret=%d", ret);
 			return ret;
 			return ret;
 		}
 		}
@@ -385,7 +392,7 @@ int SrsSource::on_video(SrsCommonMessage* video)
 	std::vector<SrsConsumer*>::iterator it;
 	std::vector<SrsConsumer*>::iterator it;
 	for (it = consumers.begin(); it != consumers.end(); ++it) {
 	for (it = consumers.begin(); it != consumers.end(); ++it) {
 		SrsConsumer* consumer = *it;
 		SrsConsumer* consumer = *it;
-		if ((ret = consumer->enqueue(msg->copy(), audio_sample_rate)) != ERROR_SUCCESS) {
+		if ((ret = consumer->enqueue(msg->copy(), audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 			srs_error("dispatch the video failed. ret=%d", ret);
 			srs_error("dispatch the video failed. ret=%d", ret);
 			return ret;
 			return ret;
 		}
 		}
@@ -416,19 +423,19 @@ int SrsSource::on_video(SrsCommonMessage* video)
 	consumer = new SrsConsumer(this);
 	consumer = new SrsConsumer(this);
 	consumers.push_back(consumer);
 	consumers.push_back(consumer);
 
 
-	if (cache_metadata && (ret = consumer->enqueue(cache_metadata->copy(), audio_sample_rate)) != ERROR_SUCCESS) {
+	if (cache_metadata && (ret = consumer->enqueue(cache_metadata->copy(), audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 		srs_error("dispatch metadata failed. ret=%d", ret);
 		srs_error("dispatch metadata failed. ret=%d", ret);
 		return ret;
 		return ret;
 	}
 	}
 	srs_info("dispatch metadata success");
 	srs_info("dispatch metadata success");
 	
 	
-	if (cache_sh_video && (ret = consumer->enqueue(cache_sh_video->copy(), audio_sample_rate)) != ERROR_SUCCESS) {
+	if (cache_sh_video && (ret = consumer->enqueue(cache_sh_video->copy(), audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 		srs_error("dispatch video sequence header failed. ret=%d", ret);
 		srs_error("dispatch video sequence header failed. ret=%d", ret);
 		return ret;
 		return ret;
 	}
 	}
 	srs_info("dispatch video sequence header success");
 	srs_info("dispatch video sequence header success");
 	
 	
-	if (cache_sh_audio && (ret = consumer->enqueue(cache_sh_audio->copy(), audio_sample_rate)) != ERROR_SUCCESS) {
+	if (cache_sh_audio && (ret = consumer->enqueue(cache_sh_audio->copy(), audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 		srs_error("dispatch audio sequence header failed. ret=%d", ret);
 		srs_error("dispatch audio sequence header failed. ret=%d", ret);
 		return ret;
 		return ret;
 	}
 	}
@@ -437,7 +444,7 @@ int SrsSource::on_video(SrsCommonMessage* video)
 	std::vector<SrsSharedPtrMessage*>::iterator it;
 	std::vector<SrsSharedPtrMessage*>::iterator it;
 	for (it = gop_cache.begin(); it != gop_cache.end(); ++it) {
 	for (it = gop_cache.begin(); it != gop_cache.end(); ++it) {
 		SrsSharedPtrMessage* msg = *it;
 		SrsSharedPtrMessage* msg = *it;
-		if ((ret = consumer->enqueue(msg->copy(), audio_sample_rate)) != ERROR_SUCCESS) {
+		if ((ret = consumer->enqueue(msg->copy(), audio_sample_rate, video_frame_rate)) != ERROR_SUCCESS) {
 			srs_error("dispatch cached gop failed. ret=%d", ret);
 			srs_error("dispatch cached gop failed. ret=%d", ret);
 			return ret;
 			return ret;
 		}
 		}

@@ -62,8 +62,10 @@ public:
 	virtual int get_time();
 	virtual int get_time();
 	/**
 	/**
 	* enqueue an shared ptr message.
 	* enqueue an shared ptr message.
+	* @param audio_sample_rate used to calc the audio time delta if time-jitter detected.
+	* @param video_frame_rate used to calc the video time delta if time-jitter detected.
 	*/
 	*/
-	virtual int enqueue(SrsSharedPtrMessage* msg, int audio_sample_rate);
+	virtual int enqueue(SrsSharedPtrMessage* msg, int audio_sample_rate, int video_frame_rate);
 	/**
 	/**
 	* get packets in consumer queue.
 	* get packets in consumer queue.
 	* @pmsgs SrsMessages*[], output the prt array.
 	* @pmsgs SrsMessages*[], output the prt array.
@@ -84,7 +86,7 @@ private:
 	/**
 	/**
 	* detect the time jitter and correct it.
 	* detect the time jitter and correct it.
 	*/
 	*/
-	virtual int jitter_correct(SrsSharedPtrMessage* msg, int audio_sample_rate);
+	virtual int jitter_correct(SrsSharedPtrMessage* msg, int audio_sample_rate, int video_frame_rate);
 	virtual void clear();
 	virtual void clear();
 };
 };
 
 
@@ -128,6 +130,10 @@ private:
 	* the sample rate of audio in metadata.
 	* the sample rate of audio in metadata.
 	*/
 	*/
 	int audio_sample_rate;
 	int audio_sample_rate;
+	/**
+	* the video frame rate in metadata.
+	*/
+	int video_frame_rate;
 private:
 private:
 	SrsSharedPtrMessage* cache_metadata;
 	SrsSharedPtrMessage* cache_metadata;
 	// the cached video sequence header.
 	// the cached video sequence header.