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

Reland of Add content type information to encoded images and corresponding rtp extension header (patchset #1 id:1 of https://codereview.webrtc.org/2809653004/ )

Browse Source 
Reason for revert:
Fix failing bots.

BUG=webrtc:7420

Review-Url: https://codereview.webrtc.org/2816493002
Cr-Commit-Position: refs/heads/master@{#17658}
This commit is contained in:
ilnik
2017-04-11 10:34:31 -07:00
committed by Commit bot
parent 10d095d4f7
commit 00d802b6ee
48 changed files with 477 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/video_coding/include/video_coding_defines.h
View File

@ -61,8 +61,17 @@ struct VCMFrameCount {
// rendered.
class VCMReceiveCallback {
public:
// TODO(ilnik): Once deprecation is complete, change this to pure virtual.
virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT
rtc::Optional<uint8_t> qp) = 0;
rtc::Optional<uint8_t> qp,
VideoContentType /*content_type*/) {
return FrameToRender(videoFrame, qp);
}
// DEPRECATED. Use the other overloaded version.
virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT
rtc::Optional<uint8_t> qp) {
return -1;
}
virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) {
return -1;
}