zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Add EncodedImageCallback::OnEncodedImage(). (patchset #13 id:280001 of https://codereview.webrtc.org/2089773002/ )

Browse Source 
Reason for revert:
broke internal tests

Original issue's description:
> Add EncodedImageCallback::OnEncodedImage().
>
> OnEncodedImage() is going to replace Encoded(), which is deprecated now.
> The new OnEncodedImage() returns Result struct that contains frame_id,
> which tells the encoder RTP timestamp for the frame.
>
> BUG=chromium:621691
> R=niklas.enbom@webrtc.org, sprang@webrtc.org, stefan@webrtc.org
>
> Committed: https://crrev.com/ad34dbe934d47f88011045671b4aea00dbd5a795
> Cr-Commit-Position: refs/heads/master@{#13613}

TBR=pbos@webrtc.org,mflodman@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,niklas.enbom@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:621691

Review-Url: https://codereview.webrtc.org/2206743002
Cr-Commit-Position: refs/heads/master@{#13614}
This commit is contained in:
sergeyu
2016-08-02 14:33:16 -07:00
committed by Commit bot
parent ad34dbe934
commit ac4dc2cefe
43 changed files with 380 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/video/payload_router.cc
View File

@ -137,16 +137,15 @@ void PayloadRouter::UpdateModuleSendingState() {
}
}
EncodedImageCallback::Result PayloadRouter::OnEncodedImage(
const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) {
int32_t PayloadRouter::Encoded(const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) {
rtc::CritScope lock(&crit_);
RTC_DCHECK(!rtp_modules_.empty());
if (!active_ || num_sending_modules_ == 0)
return Result(Result::ERROR_SEND_FAILED);
return -1;
int stream_index = 0;
int stream_idx = 0;
RTPVideoHeader rtp_video_header;
memset(&rtp_video_header, 0, sizeof(RTPVideoHeader));
@ -159,19 +158,13 @@ EncodedImageCallback::Result PayloadRouter::OnEncodedImage(
// The simulcast index might actually be larger than the number of modules
// in case the encoder was processing a frame during a codec reconfig.
if (rtp_video_header.simulcastIdx >= num_sending_modules_)
return Result(Result::ERROR_SEND_FAILED);
stream_index = rtp_video_header.simulcastIdx;
return -1;
stream_idx = rtp_video_header.simulcastIdx;
uint32_t frame_id;
int send_result = rtp_modules_[stream_index]->SendOutgoingData(
return rtp_modules_[stream_idx]->SendOutgoingData(
encoded_image._frameType, payload_type_, encoded_image._timeStamp,
encoded_image.capture_time_ms_, encoded_image._buffer,
encoded_image._length, fragmentation, &rtp_video_header, &frame_id);
if (send_result < 0)
return Result(Result::ERROR_SEND_FAILED);
return Result(Result::OK, frame_id);
encoded_image._length, fragmentation, &rtp_video_header);
}
size_t PayloadRouter::MaxPayloadLength() const {