winlin

change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE

@@ -522,9 +522,9 @@ else @@ -522,9 +522,9 @@ else
522 fi 522 fi
523 523
524 if [ $SRS_TRANSCODE = YES ]; then 524 if [ $SRS_TRANSCODE = YES ]; then
525 - echo "#define SRS_TRANSCODE" >> $SRS_AUTO_HEADERS_H 525 + echo "#define SRS_RTMP_TRANSCODE" >> $SRS_AUTO_HEADERS_H
526 else 526 else
527 - echo "#undef SRS_TRANSCODE" >> $SRS_AUTO_HEADERS_H 527 + echo "#undef SRS_RTMP_TRANSCODE" >> $SRS_AUTO_HEADERS_H
528 fi 528 fi
529 529
530 if [ $SRS_INGEST = YES ]; then 530 if [ $SRS_INGEST = YES ]; then
@@ -34,7 +34,7 @@ using namespace std; @@ -34,7 +34,7 @@ using namespace std;
34 #include <srs_protocol_rtmp_stack.hpp> 34 #include <srs_protocol_rtmp_stack.hpp>
35 #include <srs_app_ffmpeg.hpp> 35 #include <srs_app_ffmpeg.hpp>
36 36
37 -#ifdef SRS_TRANSCODE 37 +#ifdef SRS_RTMP_TRANSCODE
38 38
39 // when error, encoder sleep for a while and retry. 39 // when error, encoder sleep for a while and retry.
40 #define SRS_ENCODER_SLEEP_US (int64_t)(3*1000*1000LL) 40 #define SRS_ENCODER_SLEEP_US (int64_t)(3*1000*1000LL)
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29 */ 29 */
30 #include <srs_core.hpp> 30 #include <srs_core.hpp>
31 31
32 -#ifdef SRS_TRANSCODE 32 +#ifdef SRS_RTMP_TRANSCODE
33 33
34 #include <string> 34 #include <string>
35 #include <vector> 35 #include <vector>
@@ -431,7 +431,7 @@ SrsSource::SrsSource(SrsRequest* _req) @@ -431,7 +431,7 @@ SrsSource::SrsSource(SrsRequest* _req)
431 #ifdef SRS_HLS 431 #ifdef SRS_HLS
432 hls = new SrsHls(this); 432 hls = new SrsHls(this);
433 #endif 433 #endif
434 -#ifdef SRS_TRANSCODE 434 +#ifdef SRS_RTMP_TRANSCODE
435 encoder = new SrsEncoder(); 435 encoder = new SrsEncoder();
436 #endif 436 #endif
437 437
@@ -477,7 +477,7 @@ SrsSource::~SrsSource() @@ -477,7 +477,7 @@ SrsSource::~SrsSource()
477 #ifdef SRS_HLS 477 #ifdef SRS_HLS
478 srs_freep(hls); 478 srs_freep(hls);
479 #endif 479 #endif
480 -#ifdef SRS_TRANSCODE 480 +#ifdef SRS_RTMP_TRANSCODE
481 srs_freep(encoder); 481 srs_freep(encoder);
482 #endif 482 #endif
483 483
@@ -605,7 +605,7 @@ int SrsSource::on_reload_vhost_transcode(string vhost) @@ -605,7 +605,7 @@ int SrsSource::on_reload_vhost_transcode(string vhost)
605 return ret; 605 return ret;
606 } 606 }
607 607
608 -#ifdef SRS_TRANSCODE 608 +#ifdef SRS_RTMP_TRANSCODE
609 encoder->on_unpublish(); 609 encoder->on_unpublish();
610 if ((ret = encoder->on_publish(req)) != ERROR_SUCCESS) { 610 if ((ret = encoder->on_publish(req)) != ERROR_SUCCESS) {
611 srs_error("start encoder failed. ret=%d", ret); 611 srs_error("start encoder failed. ret=%d", ret);
@@ -919,7 +919,7 @@ int SrsSource::on_publish(SrsRequest* _req) @@ -919,7 +919,7 @@ int SrsSource::on_publish(SrsRequest* _req)
919 return ret; 919 return ret;
920 } 920 }
921 921
922 -#ifdef SRS_TRANSCODE 922 +#ifdef SRS_RTMP_TRANSCODE
923 if ((ret = encoder->on_publish(req)) != ERROR_SUCCESS) { 923 if ((ret = encoder->on_publish(req)) != ERROR_SUCCESS) {
924 srs_error("start encoder failed. ret=%d", ret); 924 srs_error("start encoder failed. ret=%d", ret);
925 return ret; 925 return ret;
@@ -941,7 +941,7 @@ void SrsSource::on_unpublish() @@ -941,7 +941,7 @@ void SrsSource::on_unpublish()
941 // destroy all forwarders 941 // destroy all forwarders
942 destroy_forwarders(); 942 destroy_forwarders();
943 943
944 -#ifdef SRS_TRANSCODE 944 +#ifdef SRS_RTMP_TRANSCODE
945 encoder->on_unpublish(); 945 encoder->on_unpublish();
946 #endif 946 #endif
947 947
@@ -46,7 +46,7 @@ class SrsRequest; @@ -46,7 +46,7 @@ class SrsRequest;
46 #ifdef SRS_HLS 46 #ifdef SRS_HLS
47 class SrsHls; 47 class SrsHls;
48 #endif 48 #endif
49 -#ifdef SRS_TRANSCODE 49 +#ifdef SRS_RTMP_TRANSCODE
50 class SrsEncoder; 50 class SrsEncoder;
51 #endif 51 #endif
52 52
@@ -224,7 +224,7 @@ private: @@ -224,7 +224,7 @@ private:
224 SrsHls* hls; 224 SrsHls* hls;
225 #endif 225 #endif
226 // transcoding handler. 226 // transcoding handler.
227 -#ifdef SRS_TRANSCODE 227 +#ifdef SRS_RTMP_TRANSCODE
228 SrsEncoder* encoder; 228 SrsEncoder* encoder;
229 #endif 229 #endif
230 // gop cache for client fast startup. 230 // gop cache for client fast startup.