admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call RtpStreamReceiver.AddReceiveCodec() with codec_params.

Browse Source 
BUG=webrtc:5948

Review-Url: https://codereview.webrtc.org/2649873005
Cr-Commit-Position: refs/heads/master@{#16268}
This commit is contained in:
johan 2017-01-25 07:37:27 -08:00 committed by Commit bot
parent d160fd735d
commit bfb11b2243
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/video/rtp_stream_receiver.h
View File

@ -82,9 +82,6 @@ class RtpStreamReceiver : public RtpData,
bool AddReceiveCodec(const VideoCodec& video_codec,
const std::map<std::string, std::string>& codec_params);
bool AddReceiveCodec(const VideoCodec& video_codec);
uint32_t GetRemoteSsrc() const;
int GetCsrcs(uint32_t* csrcs) const;
@ -144,6 +141,7 @@ class RtpStreamReceiver : public RtpData,
void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
private:
bool AddReceiveCodec(const VideoCodec& video_codec);
bool ReceivePacket(const uint8_t* packet,
size_t packet_length,
const RTPHeader& header,

5
webrtc/video/video_receive_stream.cc
View File

@ -313,10 +313,9 @@ void VideoReceiveStream::Start() {
for (const Decoder& decoder : config_.decoders) {
video_receiver_.RegisterExternalDecoder(decoder.decoder,
decoder.payload_type);
// TODO(johan): make Decoder.codec_params accessible for RtpStreamReceiver
// which holds H264SpsPpsTracker
VideoCodec codec = CreateDecoderVideoCodec(decoder);
RTC_CHECK(rtp_stream_receiver_.AddReceiveCodec(codec));
RTC_CHECK(
rtp_stream_receiver_.AddReceiveCodec(codec, decoder.codec_params));
RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec(
&codec, num_cpu_cores_, false));
}