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

Delete support for receiving RTCP RPSI and SLI message.

Browse Source 
This code has been unused for years, and at least the RTCP RSPI sending
logic appears broken.

This cl is part 3, following

  https://codereview.webrtc.org/2746413003 (delete sending)
  https://codereview.webrtc.org/2753783002 (delete vp8 feedback mode)

BUG=webrtc:7338

Review-Url: https://codereview.webrtc.org/2742383004
Cr-Commit-Position: refs/heads/master@{#17342}
This commit is contained in:
nisse
2017-03-22 07:15:09 -07:00
committed by Commit bot
parent b69aec59f3
commit 25d0bdc1bc
23 changed files with 12 additions and 909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
View File

@ -708,10 +708,6 @@ int VP8EncoderImpl::Encode(const VideoFrame& frame,
}
}
}
// The flag modification below (due to forced key frame, RPS, etc.,) for now
// will be the same for all encoders/spatial layers.
// TODO(marpan/holmer): Allow for key frame request to be set per encoder.
bool only_predict_from_key_frame = false;
if (send_key_frame) {
// Adapt the size of the key frame when in screenshare with 1 temporal
// layer.
@ -770,7 +766,7 @@ int VP8EncoderImpl::Encode(const VideoFrame& frame,
return WEBRTC_VIDEO_CODEC_ERROR;
timestamp_ += duration;
// Examines frame timestamps only.
return GetEncodedPartitions(frame, only_predict_from_key_frame);
return GetEncodedPartitions(frame);
}
// TODO(pbos): Make sure this works for properly for >1 encoders.
@ -805,8 +801,7 @@ void VP8EncoderImpl::PopulateCodecSpecific(
CodecSpecificInfo* codec_specific,
const vpx_codec_cx_pkt_t& pkt,
int stream_idx,
uint32_t timestamp,
bool only_predicting_from_key_frame) {
uint32_t timestamp) {
assert(codec_specific != NULL);
codec_specific->codecType = kVideoCodecVP8;
codec_specific->codec_name = ImplementationName();
@ -819,16 +814,14 @@ void VP8EncoderImpl::PopulateCodecSpecific(
vp8Info->keyIdx = kNoKeyIdx; // TODO(hlundin) populate this
vp8Info->nonReference =
(pkt.data.frame.flags & VPX_FRAME_IS_DROPPABLE) ? true : false;
bool base_layer_sync_point = (pkt.data.frame.flags & VPX_FRAME_IS_KEY) ||
only_predicting_from_key_frame;
bool base_layer_sync_point = pkt.data.frame.flags & VPX_FRAME_IS_KEY;
temporal_layers_[stream_idx]->PopulateCodecSpecific(base_layer_sync_point,
vp8Info, timestamp);
// Prepare next.
picture_id_[stream_idx] = (picture_id_[stream_idx] + 1) & 0x7FFF;
}
int VP8EncoderImpl::GetEncodedPartitions(const VideoFrame& input_image,
bool only_predicting_from_key_frame) {
int VP8EncoderImpl::GetEncodedPartitions(const VideoFrame& input_image) {
int bw_resolutions_disabled =
(encoders_.size() > 1) ? NumStreamsDisabled(send_stream_) : -1;
@ -879,8 +872,7 @@ int VP8EncoderImpl::GetEncodedPartitions(const VideoFrame& input_image,
encoded_images_[encoder_idx]._frameType = kVideoFrameKey;
}
PopulateCodecSpecific(&codec_specific, *pkt, stream_idx,
input_image.timestamp(),
only_predicting_from_key_frame);
input_image.timestamp());
break;
}
}

6
webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
View File

@ -81,11 +81,9 @@ class VP8EncoderImpl : public VP8Encoder {
void PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
const vpx_codec_cx_pkt& pkt,
int stream_idx,
uint32_t timestamp,
bool only_predicting_from_key_frame);
uint32_t timestamp);
int GetEncodedPartitions(const VideoFrame& input_image,
bool only_predicting_from_key_frame);
int GetEncodedPartitions(const VideoFrame& input_image);
// Set the stream state for stream |stream_idx|.
void SetStreamState(bool send_stream, int stream_idx);