Skip to content

Commit 8a30cc8

Browse files
committed
Bridger: Fix build fail if disable rtc and ffmpeg-fit
1 parent 3d22597 commit 8a30cc8

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

trunk/src/app/srs_app_rtc_codec.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ srs_error_t SrsAudioTranscoder::init_enc(SrsAudioCodecId dst_codec, int dst_chan
197197
enc_->channel_layout = av_get_default_channel_layout(dst_channels);
198198
enc_->bit_rate = dst_bit_rate;
199199
enc_->sample_fmt = codec->sample_fmts[0];
200-
enc_->time_base = {1, 1000};
200+
enc_->time_base.num = 1; enc_->time_base.den = 1000; // {1, 1000}
201201
if (dst_codec == SrsAudioCodecIdOpus) {
202202
//TODO: for more level setting
203203
enc_->compression_level = 1;

trunk/src/app/srs_app_rtc_conn.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,7 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti
999999
source->set_publish_stream(this);
10001000

10011001
// Bridge to rtmp
1002+
#if defined(SRS_RTC) && defined(SRS_FFMPEG_FIT)
10021003
bool rtc_to_rtmp = _srs_config->get_rtc_to_rtmp(req->vhost);
10031004
if (rtc_to_rtmp) {
10041005
SrsSource *rtmp = NULL;
@@ -1019,6 +1020,7 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti
10191020

10201021
source->set_bridger(bridger);
10211022
}
1023+
#endif
10221024

10231025
return err;
10241026
}

trunk/src/app/srs_app_rtmp_conn.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ srs_error_t SrsRtmpConn::acquire_publish(SrsSource* source)
983983
}
984984

985985
// Bridge to RTC streaming.
986-
#ifdef SRS_RTC
986+
#if defined(SRS_RTC) && defined(SRS_FFMPEG_FIT)
987987
if (rtc) {
988988
SrsRtcFromRtmpBridger *bridger = new SrsRtcFromRtmpBridger(rtc);
989989
if ((err = bridger->initialize(req)) != srs_success) {

0 commit comments

Comments
 (0)