Bridger: Fix build fail if disable rtc and ffmpeg-fit

winlinvip · winlinvip · commit 705f8a872ec5 · 2021-04-30T17:46:54.000+08:00
diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -999,6 +999,7 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti
     source->set_publish_stream(this);
 
     // Bridge to rtmp
+#if defined(SRS_RTC) && defined(SRS_FFMPEG_FIT)
     bool rtc_to_rtmp = _srs_config->get_rtc_to_rtmp(req->vhost);
     if (rtc_to_rtmp) {
         SrsSource *rtmp = NULL;
@@ -1019,6 +1020,7 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti
 
         source->set_bridger(bridger);
     }
+#endif
 
     return err;
 }
diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp
@@ -983,7 +983,7 @@ srs_error_t SrsRtmpConn::acquire_publish(SrsSource* source)
     }
 
     // Bridge to RTC streaming.
-#ifdef SRS_RTC
+#if defined(SRS_RTC) && defined(SRS_FFMPEG_FIT)
     if (rtc) {
         SrsRtcFromRtmpBridger *bridger = new SrsRtcFromRtmpBridger(rtc);
         if ((err = bridger->initialize(req)) != srs_success) {

Original file line number	Diff line number	Diff line change
`@@ -999,6 +999,7 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti`
`999`	`999`	`source->set_publish_stream(this);`
`1000`	`1000`
`1001`	`1001`	`// Bridge to rtmp`
	`1002`	`+#if defined(SRS_RTC) && defined(SRS_FFMPEG_FIT)`
`1002`	`1003`	`bool rtc_to_rtmp = _srs_config->get_rtc_to_rtmp(req->vhost);`
`1003`	`1004`	`if (rtc_to_rtmp) {`
`1004`	`1005`	`SrsSource *rtmp = NULL;`
`@@ -1019,6 +1020,7 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti`
`1019`	`1020`
`1020`	`1021`	`source->set_bridger(bridger);`
`1021`	`1022`	`}`
	`1023`	`+#endif`
`1022`	`1024`
`1023`	`1025`	`return err;`
`1024`	`1026`	`}`
Original file line number	Diff line number	Diff line change
`@@ -983,7 +983,7 @@ srs_error_t SrsRtmpConn::acquire_publish(SrsSource* source)`
`983`	`983`	`}`
`984`	`984`
`985`	`985`	`// Bridge to RTC streaming.`
`986`		`-#ifdef SRS_RTC`
	`986`	`+#if defined(SRS_RTC) && defined(SRS_FFMPEG_FIT)`
`987`	`987`	`if (rtc) {`
`988`	`988`	`SrsRtcFromRtmpBridger *bridger = new SrsRtcFromRtmpBridger(rtc);`
`989`	`989`	`if ((err = bridger->initialize(req)) != srs_success) {`