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

[InsertableStreams] Don't include the header in the transformable payload.

Browse Source 
Bug: chromium:1052765
Change-Id: I7d9465361811943edf46b53df80a4c50ad8d01d0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/172720
Commit-Queue: Marina Ciocea <marinaciocea@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30977}
This commit is contained in:
Marina Ciocea 2020-04-02 12:10:03 +02:00 committed by Commit Bot
parent 0cf99ce865
commit fc23cc07e2
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
audio/channel_receive.cc
View File

@ -312,12 +312,12 @@ void ChannelReceive::InitFrameTransformerDelegate(
RTC_DCHECK(frame_transformer);
RTC_DCHECK(!frame_transformer_delegate_);
// Pass a callback to ChannelReceive::ReceivePacket, to be called by the
// delegate to receive transformed audio.
// Pass a callback to ChannelReceive::OnReceivedPayloadData, to be called by
// the delegate to receive transformed audio.
ChannelReceiveFrameTransformerDelegate::ReceiveFrameCallback
receive_audio_callback = [this](rtc::ArrayView<const uint8_t> packet,
const RTPHeader& header) {
ReceivePacket(packet.data(), packet.size(), header);
OnReceivedPayloadData(packet, header);
};
frame_transformer_delegate_ =
new rtc::RefCountedObject<ChannelReceiveFrameTransformerDelegate>(
@ -595,13 +595,7 @@ void ChannelReceive::OnRtpPacket(const RtpPacketReceived& packet) {
rtc::saturated_cast<uint32_t>(packet_copy.payload_type_frequency()),
header.extension.absolute_capture_time);
if (frame_transformer_delegate_) {
// Asynchronously transform the received payload. After the payload is
// transformed, the delegate will call ReceivePacket to handle it.
frame_transformer_delegate_->Transform(packet_copy, header, remote_ssrc_);
} else {
ReceivePacket(packet_copy.data(), packet_copy.size(), header);
}
ReceivePacket(packet_copy.data(), packet_copy.size(), header);
}
void ChannelReceive::ReceivePacket(const uint8_t* packet,
@ -645,8 +639,14 @@ void ChannelReceive::ReceivePacket(const uint8_t* packet,
payload_data_length = 0;
}
OnReceivedPayloadData(
rtc::ArrayView<const uint8_t>(payload, payload_data_length), header);
rtc::ArrayView<const uint8_t> payload_data(payload, payload_data_length);
if (frame_transformer_delegate_) {
// Asynchronously transform the received payload. After the payload is
// transformed, the delegate will call OnReceivedPayloadData to handle it.
frame_transformer_delegate_->Transform(payload_data, header, remote_ssrc_);
} else {
OnReceivedPayloadData(payload_data, header);
}
}
// May be called on either worker thread or network thread.

2
audio/channel_receive_frame_transformer_delegate.h
View File

@ -53,7 +53,7 @@ class ChannelReceiveFrameTransformerDelegate : public TransformedFrameCallback {
void OnTransformedFrame(
std::unique_ptr<TransformableFrameInterface> frame) override;
// Delegates the call to ChannelReceive::ReceivePacket on the
// Delegates the call to ChannelReceive::OnReceivedPayloadData on the
// |channel_receive_thread_|, by calling |receive_frame_callback_|.
void ReceiveFrame(std::unique_ptr<TransformableFrameInterface> frame) const;