Cast: Get rid of frame_id_map

media/cast/net/rtp/framer.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAST_FRAMER_FRAMER_H_
 #define MEDIA_CAST_FRAMER_FRAMER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "media/cast/net/rtcp/rtcp.h"
 #include "media/cast/net/rtp/cast_message_builder.h"
 #include "media/cast/net/rtp/frame_buffer.h"
-#include "media/cast/net/rtp/frame_id_map.h"
 #include "media/cast/net/rtp/rtp_receiver_defines.h"
 
 namespace media {
 namespace cast {
 
 typedef std::map<uint32, linked_ptr<FrameBuffer> > FrameList;
 
 class Framer {
  public:
   Framer(base::TickClock* clock,
@@ skipping 23 matching lines @@
   // TODO(hubbe): Move this elsewhere.
   void AckFrame(uint32 frame_id);
 
   void ReleaseFrame(uint32 frame_id);
 
   // Reset framer state to original state and flush all pending buffers.
   void Reset();
   bool TimeToSendNextCastMessage(base::TimeTicks* time_to_send);
   void SendCastMessage();
 
+  bool Empty() const;
+  bool FrameExists(uint32 frame_id) const;
+  uint32 NewestFrameId() const;
+
+  void RemoveOldFrames(uint32 frame_id);
+
+  // Identifies the next frame to be released (rendered).
+  bool NextContinuousFrame(uint32* frame_id) const;
+  uint32 LastContinuousFrame() const;
+
+  bool NextFrameAllowingSkippingFrames(uint32* frame_id) const;
+  bool HaveMultipleDecodableFrames() const;
+
+  int NumberOfCompleteFrames() const;
+  void GetMissingPackets(uint32 frame_id,
+                         bool last_frame,
+                         PacketIdSet* missing_packets) const;
+
  private:
+  bool ContinuousFrame(FrameBuffer* frame) const;
+  bool DecodableFrame(FrameBuffer* frame) const;
+
   const bool decoder_faster_than_max_frame_rate_;
   FrameList frames_;
-  FrameIdMap frame_id_map_;
-
   scoped_ptr<CastMessageBuilder> cast_msg_builder_;
+  bool waiting_for_key_;
+  uint32 last_released_frame_;
+  uint32 newest_frame_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Framer);
 };
 
 }  //  namespace cast
 }  //  namespace media
 
 #endif  // MEDIA_CAST_FRAMER_FRAMER_H_