| Index: media/cast/framer/frame_id_map.cc
|
| diff --git a/media/cast/framer/frame_id_map.cc b/media/cast/framer/frame_id_map.cc
|
| index 44c57febab8b7f485b8d4da204ea860f77ef0831..b6ae1406caa997e6b3551983b19155517b34e295 100644
|
| --- a/media/cast/framer/frame_id_map.cc
|
| +++ b/media/cast/framer/frame_id_map.cc
|
| @@ -38,9 +38,7 @@ PacketType FrameInfo::InsertPacket(uint16 packet_id) {
|
| return missing_packets_.empty() ? kNewPacketCompletingFrame : kNewPacket;
|
| }
|
|
|
| -bool FrameInfo::Complete() const {
|
| - return missing_packets_.empty();
|
| -}
|
| +bool FrameInfo::Complete() const { return missing_packets_.empty(); }
|
|
|
| void FrameInfo::GetMissingPackets(bool newest_frame,
|
| PacketIdSet* missing_packets) const {
|
| @@ -54,12 +52,10 @@ void FrameInfo::GetMissingPackets(bool newest_frame,
|
| }
|
| }
|
|
|
| -
|
| FrameIdMap::FrameIdMap()
|
| : waiting_for_key_(true),
|
| last_released_frame_(kStartFrameId),
|
| - newest_frame_id_(kStartFrameId) {
|
| -}
|
| + newest_frame_id_(kStartFrameId) {}
|
|
|
| FrameIdMap::~FrameIdMap() {}
|
|
|
| @@ -131,9 +127,7 @@ void FrameIdMap::Clear() {
|
| newest_frame_id_ = kStartFrameId;
|
| }
|
|
|
| -uint32 FrameIdMap::NewestFrameId() const {
|
| - return newest_frame_id_;
|
| -}
|
| +uint32 FrameIdMap::NewestFrameId() const { return newest_frame_id_; }
|
|
|
| bool FrameIdMap::NextContinuousFrame(uint32* frame_id) const {
|
| FrameMap::const_iterator it;
|
| @@ -156,8 +150,10 @@ uint32 FrameIdMap::LastContinuousFrame() const {
|
| do {
|
| next_expected_frame++;
|
| it = frame_map_.find(next_expected_frame);
|
| - if (it == frame_map_.end()) break;
|
| - if (!it->second->Complete()) break;
|
| + if (it == frame_map_.end())
|
| + break;
|
| + if (!it->second->Complete())
|
| + break;
|
|
|
| // We found the next continuous frame.
|
| last_continuous_frame_id = it->first;
|
| @@ -167,7 +163,8 @@ uint32 FrameIdMap::LastContinuousFrame() const {
|
|
|
| bool FrameIdMap::NextAudioFrameAllowingMissingFrames(uint32* frame_id) const {
|
| // First check if we have continuous frames.
|
| - if (NextContinuousFrame(frame_id)) return true;
|
| + if (NextContinuousFrame(frame_id))
|
| + return true;
|
|
|
| // Find the oldest frame.
|
| FrameMap::const_iterator it_best_match = frame_map_.end();
|
| @@ -180,7 +177,8 @@ bool FrameIdMap::NextAudioFrameAllowingMissingFrames(uint32* frame_id) const {
|
| break;
|
| }
|
| }
|
| - if (it_best_match == frame_map_.end()) return false; // No complete frame.
|
| + if (it_best_match == frame_map_.end())
|
| + return false; // No complete frame.
|
|
|
| ++it;
|
| for (; it != frame_map_.end(); ++it) {
|
| @@ -202,15 +200,14 @@ bool FrameIdMap::NextVideoFrameAllowingSkippingFrames(uint32* frame_id) const {
|
| it_best_match = it;
|
| }
|
| }
|
| - if (it_best_match == frame_map_.end()) return false;
|
| + if (it_best_match == frame_map_.end())
|
| + return false;
|
|
|
| *frame_id = it_best_match->first;
|
| return true;
|
| }
|
|
|
| -bool FrameIdMap::Empty() const {
|
| - return frame_map_.empty();
|
| -}
|
| +bool FrameIdMap::Empty() const { return frame_map_.empty(); }
|
|
|
| int FrameIdMap::NumberOfCompleteFrames() const {
|
| int count = 0;
|
| @@ -231,20 +228,24 @@ void FrameIdMap::GetMissingPackets(uint32 frame_id,
|
| bool last_frame,
|
| PacketIdSet* missing_packets) const {
|
| FrameMap::const_iterator it = frame_map_.find(frame_id);
|
| - if (it == frame_map_.end()) return;
|
| + if (it == frame_map_.end())
|
| + return;
|
|
|
| it->second->GetMissingPackets(last_frame, missing_packets);
|
| }
|
|
|
| bool FrameIdMap::ContinuousFrame(FrameInfo* frame) const {
|
| DCHECK(frame);
|
| - if (waiting_for_key_ && !frame->is_key_frame()) return false;
|
| + if (waiting_for_key_ && !frame->is_key_frame())
|
| + return false;
|
| return static_cast<uint32>(last_released_frame_ + 1) == frame->frame_id();
|
| }
|
|
|
| bool FrameIdMap::DecodableVideoFrame(FrameInfo* frame) const {
|
| - if (frame->is_key_frame()) return true;
|
| - if (waiting_for_key_ && !frame->is_key_frame()) return false;
|
| + if (frame->is_key_frame())
|
| + return true;
|
| + if (waiting_for_key_ && !frame->is_key_frame())
|
| + return false;
|
|
|
| // Current frame is not necessarily referencing the last frame.
|
| // Do we have the reference frame?
|
|
|