diff options
Diffstat (limited to 'webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc')
| -rw-r--r-- | webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc index a922e35712..1838e32eb7 100644 --- a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc +++ b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.cc @@ -25,8 +25,7 @@ ReferencePictureSelection::ReferencePictureSelection() last_sent_ref_update_time_(0), established_ref_picture_id_(0), last_refresh_time_(0), - rtt_(0) { -} + rtt_(0) {} void ReferencePictureSelection::Init() { update_golden_next_ = true; @@ -62,7 +61,8 @@ bool ReferencePictureSelection::ReceivedSLI(uint32_t now_ts) { return send_refresh; } -int ReferencePictureSelection::EncodeFlags(int picture_id, bool send_refresh, +int ReferencePictureSelection::EncodeFlags(int picture_id, + bool send_refresh, uint32_t now_ts) { int flags = 0; // We can't refresh the decoder until we have established the key frame. @@ -87,12 +87,12 @@ int ReferencePictureSelection::EncodeFlags(int picture_id, bool send_refresh, received_ack_) { flags |= VP8_EFLAG_NO_REF_LAST; // Don't reference the last frame. if (update_golden_next_) { - flags |= VP8_EFLAG_FORCE_GF; // Update the golden reference. + flags |= VP8_EFLAG_FORCE_GF; // Update the golden reference. flags |= VP8_EFLAG_NO_UPD_ARF; // Don't update alt-ref. - flags |= VP8_EFLAG_NO_REF_GF; // Don't reference the golden frame. + flags |= VP8_EFLAG_NO_REF_GF; // Don't reference the golden frame. } else { - flags |= VP8_EFLAG_FORCE_ARF; // Update the alt-ref reference. - flags |= VP8_EFLAG_NO_UPD_GF; // Don't update the golden frame. + flags |= VP8_EFLAG_FORCE_ARF; // Update the alt-ref reference. + flags |= VP8_EFLAG_NO_UPD_GF; // Don't update the golden frame. flags |= VP8_EFLAG_NO_REF_ARF; // Don't reference the alt-ref frame. } last_sent_ref_picture_id_ = picture_id; @@ -103,9 +103,9 @@ int ReferencePictureSelection::EncodeFlags(int picture_id, bool send_refresh, if (established_golden_) flags |= VP8_EFLAG_NO_REF_ARF; // Don't reference the alt-ref frame. else - flags |= VP8_EFLAG_NO_REF_GF; // Don't reference the golden frame. - flags |= VP8_EFLAG_NO_UPD_GF; // Don't update the golden frame. - flags |= VP8_EFLAG_NO_UPD_ARF; // Don't update the alt-ref frame. + flags |= VP8_EFLAG_NO_REF_GF; // Don't reference the golden frame. + flags |= VP8_EFLAG_NO_UPD_GF; // Don't update the golden frame. + flags |= VP8_EFLAG_NO_UPD_ARF; // Don't update the alt-ref frame. } return flags; } |