胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
750f4413 2 parents ccb250f3 142a9733

merge srs2 for #536

内嵌 并排对比
正在显示 4 个修改的文件 包含 6 行增加 和 2 行删除
@@ -1363,6 +1363,7 @@ Winlin @@ -1363,6 +1363,7 @@ Winlin
1363 [bug #588]: https://github.com/ossrs/srs/issues/588 1363 [bug #588]: https://github.com/ossrs/srs/issues/588
1364 [bug #740]: https://github.com/ossrs/srs/issues/740 1364 [bug #740]: https://github.com/ossrs/srs/issues/740
1365 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx 1365 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
  1366 +
1366 [bug #735]: https://github.com/ossrs/srs/issues/735 1367 [bug #735]: https://github.com/ossrs/srs/issues/735
1367 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx 1368 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
1368 1369
@@ -333,7 +333,6 @@ @@ -333,7 +333,6 @@
333 3C1EE6D01AB1080900576EE9 /* srs.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = srs.conf; path = ../../../conf/srs.conf; sourceTree = "<group>"; }; 333 3C1EE6D01AB1080900576EE9 /* srs.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = srs.conf; path = ../../../conf/srs.conf; sourceTree = "<group>"; };
334 3C1EE6D11AB1080900576EE9 /* transcode2hls.audio.only.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = transcode2hls.audio.only.conf; path = ../../../conf/transcode2hls.audio.only.conf; sourceTree = "<group>"; }; 334 3C1EE6D11AB1080900576EE9 /* transcode2hls.audio.only.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = transcode2hls.audio.only.conf; path = ../../../conf/transcode2hls.audio.only.conf; sourceTree = "<group>"; };
335 3C1EE6D31AB1367D00576EE9 /* AUTHORS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS.txt; path = ../../../AUTHORS.txt; sourceTree = "<group>"; }; 335 3C1EE6D31AB1367D00576EE9 /* AUTHORS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS.txt; path = ../../../AUTHORS.txt; sourceTree = "<group>"; };
336 - 3C1EE6D41AB1367D00576EE9 /* DONATIONS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DONATIONS.txt; path = ../../../DONATIONS.txt; sourceTree = "<group>"; };  
337 3C1EE6D51AB1367D00576EE9 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../../../LICENSE; sourceTree = "<group>"; }; 336 3C1EE6D51AB1367D00576EE9 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../../../LICENSE; sourceTree = "<group>"; };
338 3C1EE6D61AB1367D00576EE9 /* README.md */ = {isa = PBXFileReference; explicitFileType = net.daringfireball.markdown; fileEncoding = 4; name = README.md; path = ../../../README.md; sourceTree = "<group>"; wrapsLines = 0; }; 337 3C1EE6D61AB1367D00576EE9 /* README.md */ = {isa = PBXFileReference; explicitFileType = net.daringfireball.markdown; fileEncoding = 4; name = README.md; path = ../../../README.md; sourceTree = "<group>"; wrapsLines = 0; };
339 3C24ECCB1C3B824800460622 /* memory.error.notcmalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = memory.error.notcmalloc.cpp; path = ../../../research/gperftools/memory.error.notcmalloc.cpp; sourceTree = "<group>"; }; 338 3C24ECCB1C3B824800460622 /* memory.error.notcmalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = memory.error.notcmalloc.cpp; path = ../../../research/gperftools/memory.error.notcmalloc.cpp; sourceTree = "<group>"; };
@@ -788,7 +787,6 @@ @@ -788,7 +787,6 @@
788 isa = PBXGroup; 787 isa = PBXGroup;
789 children = ( 788 children = (
790 3C1EE6D31AB1367D00576EE9 /* AUTHORS.txt */, 789 3C1EE6D31AB1367D00576EE9 /* AUTHORS.txt */,
791 - 3C1EE6D41AB1367D00576EE9 /* DONATIONS.txt */,  
792 3C1EE6D51AB1367D00576EE9 /* LICENSE */, 790 3C1EE6D51AB1367D00576EE9 /* LICENSE */,
793 3C1EE6D61AB1367D00576EE9 /* README.md */, 791 3C1EE6D61AB1367D00576EE9 /* README.md */,
794 ); 792 );
@@ -298,6 +298,10 @@ int SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, SrsConfDir @@ -298,6 +298,10 @@ int SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, SrsConfDir
298 log_file += req->app; 298 log_file += req->app;
299 log_file += "-"; 299 log_file += "-";
300 log_file += req->stream; 300 log_file += req->stream;
  301 + if (!engine->args.empty()) {
  302 + log_file += "-";
  303 + log_file += engine->arg0();
  304 + }
301 log_file += ".log"; 305 log_file += ".log";
302 } 306 }
303 307
@@ -47,6 +47,7 @@ class SrsFFMPEG @@ -47,6 +47,7 @@ class SrsFFMPEG
47 private: 47 private:
48 SrsProcess* process; 48 SrsProcess* process;
49 std::vector<std::string> params; 49 std::vector<std::string> params;
  50 +private:
50 std::string log_file; 51 std::string log_file;
51 private: 52 private:
52 std::string ffmpeg; 53 std::string ffmpeg;