refine config

@@ -409,14 +409,10 @@ vhost play.srs.com {
         #   1. full, to ensure stream start at zero, and ensure stream monotonically increasing.
         #   1. full, to ensure stream start at zero, and ensure stream monotonically increasing.
         #   2. zero, only ensure stream start at zero, ignore timestamp jitter.
         #   2. zero, only ensure stream start at zero, ignore timestamp jitter.
         #   3. off, disable the time jitter algorithm, like atc.
         #   3. off, disable the time jitter algorithm, like atc.
+        # @remark for full, correct timestamp only when |delta| > 250ms.
+        # @remark disabled when atc is on.
         # default: full
         # default: full
         time_jitter             full;
         time_jitter             full;
-        # whether use the interleaved/mixed algorithm to correct the timestamp.
-        # if on, always ensure the timestamp of audio+video is interleaved/mixed monotonically increase.
-        # if off, use time_jitter to correct the timestamp if required.
-        # default: off
-        mix_correct             off;
-
         # vhost for atc for hls/hds/rtmp backup.
         # vhost for atc for hls/hds/rtmp backup.
         # generally, atc default to off, server delivery rtmp stream to client(flash) timestamp from 0.
         # generally, atc default to off, server delivery rtmp stream to client(flash) timestamp from 0.
         # when atc is on, server delivery rtmp stream by absolute time.
         # when atc is on, server delivery rtmp stream by absolute time.
@@ -428,8 +424,16 @@ vhost play.srs.com {
         # @see http://www.adobe.com/cn/devnet/adobe-media-server/articles/varnish-sample-for-failover.html
         # @see http://www.adobe.com/cn/devnet/adobe-media-server/articles/varnish-sample-for-failover.html
         # @see http://www.baidu.com/#wd=hds%20hls%20atc
         # @see http://www.baidu.com/#wd=hds%20hls%20atc
         #
         #
+        # @remark when atc is on, auto off the time_jitter
         # default: off
         # default: off
         atc             off;
         atc             off;
+        # whether use the interleaved/mixed algorithm to correct the timestamp.
+        # if on, always ensure the timestamp of audio+video is interleaved/mixed monotonically increase.
+        # if off, use time_jitter to correct the timestamp if required.
+        # @remark to use mix_correct, atc should on(or time_jitter should off).
+        # default: off
+        mix_correct             off;
+
         # whether enable the auto atc,
         # whether enable the auto atc,
         # if enabled, detect the bravo_atc="true" in onMetaData packet,
         # if enabled, detect the bravo_atc="true" in onMetaData packet,
         # set atc to on if matched.
         # set atc to on if matched.
@@ -464,9 +468,21 @@ vhost play.srs.com {
 # vhost for time jitter
 # vhost for time jitter
 vhost jitter.srs.com {
 vhost jitter.srs.com {
     # @see play.srs.com
     # @see play.srs.com
+    # to use time_jitter full, the default config.
     play {
     play {
-        time_jitter             full;
-        mix_correct             off;
+    }
+    # to use mix_correct.
+    play {
+        time_jitter             off;
+        mix_correct             on;
+    }
+    play {
+        atc                     on;
+        mix_correct             on;
+    }
+    # to use atc
+    play {
+        atc                     on;
     }
     }
 }
 }