external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

RTC: Rename recode to transcode

Browse source
This commit is contained in:
winlin 2020-05-13 17:56:51 +08:00
parent b8b52f28f5
commit 377128f4e9
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/src/app/srs_app_rtc_codec.cpp
View file

@ -384,8 +384,7 @@ srs_error_t SrsAudioRecode::initialize()
return err; return err;
} }
// TODO: FIXME: Rename to transcode. srs_error_t SrsAudioRecode::transcode(SrsSample *pkt, char **buf, int *buf_len, int &n)
srs_error_t SrsAudioRecode::recode(SrsSample *pkt, char **buf, int *buf_len, int &n)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;

2
trunk/src/app/srs_app_rtc_codec.hpp
View file

@ -121,7 +121,7 @@ public:
SrsAudioRecode(int channels, int samplerate); SrsAudioRecode(int channels, int samplerate);
virtual ~SrsAudioRecode(); virtual ~SrsAudioRecode();
srs_error_t initialize(); srs_error_t initialize();
virtual srs_error_t recode(SrsSample *pkt, char **buf, int *buf_len, int &n); virtual srs_error_t transcode(SrsSample *pkt, char **buf, int *buf_len, int &n);
}; };
#endif /* SRS_APP_AUDIO_RECODE_HPP */ #endif /* SRS_APP_AUDIO_RECODE_HPP */

8
trunk/src/app/srs_app_rtc_source.cpp
View file

@ -641,7 +641,7 @@ srs_error_t SrsRtcFromRtmpBridger::on_audio(SrsSharedPtrMessage* msg)
return source_->on_audio_imp(msg); return source_->on_audio_imp(msg);
} }
srs_error_t SrsRtcFromRtmpBridger::transcode(SrsSharedPtrMessage* shared_audio, char* adts_audio, int nn_adts_audio) srs_error_t SrsRtcFromRtmpBridger::transcode(SrsSharedPtrMessage* msg, char* adts_audio, int nn_adts_audio)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -666,7 +666,7 @@ srs_error_t SrsRtcFromRtmpBridger::transcode(SrsSharedPtrMessage* shared_audio,
int nn_opus_packets = 0; int nn_opus_packets = 0;
int opus_sizes[kMaxOpusPackets]; int opus_sizes[kMaxOpusPackets];
if ((err = codec->recode(&aac, opus_payloads, opus_sizes, nn_opus_packets)) != srs_success) { if ((err = codec->transcode(&aac, opus_payloads, opus_sizes, nn_opus_packets)) != srs_success) {
return srs_error_wrap(err, "recode error"); return srs_error_wrap(err, "recode error");
} }
@ -686,8 +686,8 @@ srs_error_t SrsRtcFromRtmpBridger::transcode(SrsSharedPtrMessage* shared_audio,
nn_max_extra_payload = srs_max(nn_max_extra_payload, p->size); nn_max_extra_payload = srs_max(nn_max_extra_payload, p->size);
} }
shared_audio->set_extra_payloads(samples, nn_opus_packets); msg->set_extra_payloads(samples, nn_opus_packets);
shared_audio->set_max_extra_payload(nn_max_extra_payload); msg->set_max_extra_payload(nn_max_extra_payload);
return err; return err;
} }