| 
								
								
									 winlin | d32632ee8a | rename SrsFastBuffer to SrsFastStream | 2015-09-22 09:01:47 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 4f3d2c8607 | rename SrsSimpleBuffer to SrsSimpleStream | 2015-09-22 08:59:52 +08:00 |  | 
				
					
						| 
								
								
									 winlin | dadfe101b4 | rename SrsBitStream to SrsBitBuffer | 2015-09-22 08:59:21 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0e52fc6d5b | rename SrsStream to SrsBuffer | 2015-09-22 08:57:31 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ca3577e11b | rename temp to stream | 2015-09-22 08:52:00 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f33d736442 | rename kernel stream to buffer | 2015-09-22 08:50:14 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a4f51564db | rename kernel stream to buffer | 2015-09-22 08:48:55 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 495f575ac3 | rename kernel buffer to temp | 2015-09-22 08:43:56 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ac2b03a3ed | rename srs_kernel_buffer to temp | 2015-09-22 08:42:54 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1de2bb0801 | add kafka protocol files. | 2015-09-21 17:12:28 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b5996567e8 | refine the role of srs, to cluster. | 2015-09-21 12:09:09 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d8a64aaab5 | fix #484, hotfix the openssl build script 2.0.190 | 2015-09-21 12:01:48 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b471c6e61c | refine code, use json integter rather than number. | 2015-09-19 14:40:32 +08:00 |  | 
				
					
						| 
								
								
									 winlin | c5cd58761c | move the srs thread to st. | 2015-09-19 13:46:55 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 3042115385 | refine json to_str to dumps. | 2015-09-19 13:37:56 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b59d9ba6a1 | support amf0 and json to convert with each other. | 2015-09-19 13:31:57 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 3f7e69b617 | json objects support dumps to string. | 2015-09-19 12:27:31 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 225e742657 | add args3 | 2015-09-17 14:03:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1fd83d9314 | refine the order. | 2015-09-17 13:36:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 7b2b11e932 | async call worker fast execute tasks. | 2015-09-17 11:57:17 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 087f7740b7 | fix the build failed bug | 2015-09-17 11:41:23 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 256459e1ec | fix the utest bug | 2015-09-17 11:37:35 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8a90e76637 | fix #459, support dvr raw api. 3.0.4 | 2015-09-15 23:00:00 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2a1b2b69a0 | for #459, dvr support apply filter for ng-control dvr module. | 2015-09-15 15:58:57 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8f9cfcdcf4 | fix #319, http raw api support update global and vhost. 3.0.4 | 2015-09-15 13:03:18 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e8a00de4a3 | for #319, support enable or disable vhost. | 2015-09-15 12:51:14 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 631e76cd32 | for #319, support update and delete the disabled vhost | 2015-09-15 12:15:18 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a7c4b786cf | merge from 2.0 | 2015-09-14 18:42:31 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 511627abab | fix #474, config to donot parse width/height from sps. 2.0.189 | 2015-09-14 18:36:44 +08:00 |  | 
				
					
						| 
								
								
									 winlin | eb578b4a39 | refine the thread, set to disposed when terminate normally | 2015-09-14 17:17:38 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 83a9ff9f5d | for #474, refine the hls publish, donot fetch from source when publish | 2015-09-14 15:49:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 44bcb4045f | for #474, decode the sequence header before hls. | 2015-09-14 15:32:09 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 07ef8160a3 | clear the queue when edge republish. | 2015-09-14 15:25:01 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 704624c9ec | clear the queue when edge republish. | 2015-09-14 15:19:49 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8be3c875af | donot release stream when busy | 2015-09-14 15:17:59 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 3da25f3aee | when thread terminated normally, set the tid to NULL. | 2015-09-14 15:11:49 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a994191ddc | for #474, always release publish for source. | 2015-09-14 15:10:34 +08:00 |  | 
				
					
						| 
								
								
									 winlin | eb9aa47ab1 | merge from 2.0 | 2015-09-14 13:48:27 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0d57ef9373 | fix #458, http hooks use source thread cid. 2.0.188 | 2015-09-14 13:47:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 3b483094bd | merge from 2.0 | 2015-09-14 12:24:57 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6d50aa1aa2 | #475, fix http hooks crash for st context switch. 2.0.187 | 2015-09-14 12:22:19 +08:00 |  | 
				
					
						| 
								
								
									 winlin | adb74dc74e | Merge branch '2.0release' into develop | 2015-09-14 11:17:19 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f0fc093b19 | fix the http zero content length bug. | 2015-09-14 11:17:04 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 01308ecc98 | for #319, support initialize the parser to whether use jsonp | 2015-09-12 22:22:33 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 491ec11833 | for #319, raw api support add new vhost | 2015-09-12 21:55:53 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0d6c24581d | refine json number, use int64 when number is int. | 2015-09-12 16:36:29 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a88f321d8b | for #319, merge from 2.0release | 2015-09-09 23:41:11 +08:00 |  | 
				
					
						| 
								
								
									 winlin | abd7ee227c | support reload utc_time. 2.0.186 | 2015-09-09 23:37:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | c4feb8f6ed | for #319, raw api support update all globals. | 2015-09-09 23:32:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6aafd072db | for #319, raw api support update srs log tank, level and file. | 2015-09-09 22:44:34 +08:00 |  |