| Index: webrtc/modules/audio_coding/codecs/audio_decoder.cc
|
| diff --git a/webrtc/modules/audio_coding/codecs/audio_decoder.cc b/webrtc/modules/audio_coding/codecs/audio_decoder.cc
|
| index 6c67924260b14f69588c460baf11d480ef32f558..4d2b9934d0fa5847ae5abb3168e2820280ea6f01 100644
|
| --- a/webrtc/modules/audio_coding/codecs/audio_decoder.cc
|
| +++ b/webrtc/modules/audio_coding/codecs/audio_decoder.cc
|
| @@ -27,9 +27,9 @@ namespace webrtc {
|
| AudioDecoder::ParseResult::ParseResult() = default;
|
| AudioDecoder::ParseResult::ParseResult(ParseResult&& b) = default;
|
| AudioDecoder::ParseResult::ParseResult(uint32_t timestamp,
|
| - bool primary,
|
| + int priority,
|
| std::unique_ptr<EncodedAudioFrame> frame)
|
| - : timestamp(timestamp), primary(primary), frame(std::move(frame)) {}
|
| + : timestamp(timestamp), priority(priority), frame(std::move(frame)) {}
|
|
|
| AudioDecoder::ParseResult::~ParseResult() = default;
|
|
|
| @@ -38,12 +38,11 @@ AudioDecoder::ParseResult& AudioDecoder::ParseResult::operator=(
|
|
|
| std::vector<AudioDecoder::ParseResult> AudioDecoder::ParsePayload(
|
| rtc::Buffer&& payload,
|
| - uint32_t timestamp,
|
| - bool is_primary) {
|
| + uint32_t timestamp) {
|
| std::vector<ParseResult> results;
|
| std::unique_ptr<EncodedAudioFrame> frame(
|
| - new LegacyEncodedAudioFrame(this, std::move(payload), is_primary));
|
| - results.emplace_back(timestamp, is_primary, std::move(frame));
|
| + new LegacyEncodedAudioFrame(this, std::move(payload)));
|
| + results.emplace_back(timestamp, 0, std::move(frame));
|
| return results;
|
| }
|
|
|
|
|