Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: media/cast/net/rtp/frame_buffer.h

Issue 540713002: Cast: Get rid of frame_id_map (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed unused variable Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/cast/net/rtp/cast_message_builder_unittest.cc ('k') | media/cast/net/rtp/frame_buffer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CAST_FRAMER_FRAME_BUFFER 5 #ifndef MEDIA_CAST_FRAMER_FRAME_BUFFER
6 #define MEDIA_CAST_FRAMER_FRAME_BUFFER 6 #define MEDIA_CAST_FRAMER_FRAME_BUFFER
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "media/cast/cast_config.h" 11 #include "media/cast/cast_config.h"
12 #include "media/cast/net/rtp/rtp_receiver_defines.h" 12 #include "media/cast/net/rtp/rtp_receiver_defines.h"
13 13
14 namespace media { 14 namespace media {
15 namespace cast { 15 namespace cast {
16 16
17 typedef std::map<uint16, std::vector<uint8> > PacketMap; 17 typedef std::map<uint16, std::vector<uint8> > PacketMap;
18 18
19 class FrameBuffer { 19 class FrameBuffer {
20 public: 20 public:
21 FrameBuffer(); 21 FrameBuffer();
22 ~FrameBuffer(); 22 ~FrameBuffer();
23 void InsertPacket(const uint8* payload_data, 23 bool InsertPacket(const uint8* payload_data,
24 size_t payload_size, 24 size_t payload_size,
25 const RtpCastHeader& rtp_header); 25 const RtpCastHeader& rtp_header);
26 bool Complete() const; 26 bool Complete() const;
27 27
28 void GetMissingPackets(bool newest_frame, PacketIdSet* missing_packets) const;
29
28 // If a frame is complete, sets the frame IDs and RTP timestamp in |frame|, 30 // If a frame is complete, sets the frame IDs and RTP timestamp in |frame|,
29 // and also copies the data from all packets into the data field in |frame|. 31 // and also copies the data from all packets into the data field in |frame|.
30 // Returns true if the frame was complete; false if incomplete and |frame| 32 // Returns true if the frame was complete; false if incomplete and |frame|
31 // remains unchanged. 33 // remains unchanged.
32 bool AssembleEncodedFrame(EncodedFrame* frame) const; 34 bool AssembleEncodedFrame(EncodedFrame* frame) const;
33 35
34 bool is_key_frame() const { return is_key_frame_; } 36 bool is_key_frame() const { return is_key_frame_; }
35
36 uint32 last_referenced_frame_id() const { return last_referenced_frame_id_; } 37 uint32 last_referenced_frame_id() const { return last_referenced_frame_id_; }
38 uint32 frame_id() const { return frame_id_; }
37 39
38 private: 40 private:
39 uint32 frame_id_; 41 uint32 frame_id_;
40 uint16 max_packet_id_; 42 uint16 max_packet_id_;
41 uint16 num_packets_received_; 43 uint16 num_packets_received_;
44 uint16 max_seen_packet_id_;
42 uint16 new_playout_delay_ms_; 45 uint16 new_playout_delay_ms_;
43 bool is_key_frame_; 46 bool is_key_frame_;
44 size_t total_data_size_; 47 size_t total_data_size_;
45 uint32 last_referenced_frame_id_; 48 uint32 last_referenced_frame_id_;
46 uint32 rtp_timestamp_; 49 uint32 rtp_timestamp_;
47 PacketMap packets_; 50 PacketMap packets_;
48 51
49 DISALLOW_COPY_AND_ASSIGN(FrameBuffer); 52 DISALLOW_COPY_AND_ASSIGN(FrameBuffer);
50 }; 53 };
51 54
52 } // namespace cast 55 } // namespace cast
53 } // namespace media 56 } // namespace media
54 57
55 #endif // MEDIA_CAST_FRAMER_FRAME_BUFFER 58 #endif // MEDIA_CAST_FRAMER_FRAME_BUFFER
OLDNEW
« no previous file with comments | « media/cast/net/rtp/cast_message_builder_unittest.cc ('k') | media/cast/net/rtp/frame_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698