| 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 b752e2ad1a97563c9206ee781c2170d8651dd50c..29d5886712d071028d8c8493c389982ebf609efd 100644
|
| --- a/webrtc/modules/audio_coding/codecs/audio_decoder.cc
|
| +++ b/webrtc/modules/audio_coding/codecs/audio_decoder.cc
|
| @@ -25,9 +25,9 @@ namespace webrtc {
|
| AudioDecoder::ParseResult::ParseResult() = default;
|
| AudioDecoder::ParseResult::ParseResult(ParseResult&& b) = default;
|
| AudioDecoder::ParseResult::ParseResult(uint32_t timestamp,
|
| - bool primary,
|
| + uint8_t 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;
|
|
|
| @@ -36,12 +36,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, payload, is_primary));
|
| - results.emplace_back(timestamp, is_primary, std::move(frame));
|
| + new LegacyEncodedAudioFrame(this, payload));
|
| + results.emplace_back(timestamp, 0, std::move(frame));
|
| return results;
|
| }
|
|
|
|
|