OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 17 matching lines...) Expand all Loading... | |
28 | 28 |
29 // The tuple (|picture_id|, |spatial_layer|) uniquely identifies a frame | 29 // The tuple (|picture_id|, |spatial_layer|) uniquely identifies a frame |
30 // object. For codec types that don't necessarily have picture ids they | 30 // object. For codec types that don't necessarily have picture ids they |
31 // have to be constructed from the header data relevant to that codec. | 31 // have to be constructed from the header data relevant to that codec. |
32 uint16_t picture_id; | 32 uint16_t picture_id; |
33 uint8_t spatial_layer; | 33 uint8_t spatial_layer; |
34 | 34 |
35 size_t num_references; | 35 size_t num_references; |
36 uint16_t references[kMaxFrameReferences]; | 36 uint16_t references[kMaxFrameReferences]; |
37 bool inter_layer_predicted; | 37 bool inter_layer_predicted; |
38 | |
39 size_t size; | |
38 }; | 40 }; |
39 | 41 |
40 class PacketBuffer; | 42 class PacketBuffer; |
41 | 43 |
42 class RtpFrameObject : public FrameObject { | 44 class RtpFrameObject : public FrameObject { |
43 public: | 45 public: |
44 RtpFrameObject(PacketBuffer* packet_buffer, | 46 RtpFrameObject(PacketBuffer* packet_buffer, |
45 uint16_t first_seq_num, | 47 uint16_t first_seq_num, |
46 uint16_t last_seq_num); | 48 uint16_t last_seq_num, |
49 size_t combined_size, | |
50 int8_t max_nack_count); | |
47 | 51 |
48 ~RtpFrameObject(); | 52 ~RtpFrameObject(); |
49 uint16_t first_seq_num() const; | 53 uint16_t first_seq_num() const; |
50 uint16_t last_seq_num() const; | 54 uint16_t last_seq_num() const; |
55 int8_t max_nack_count() const; | |
51 FrameType frame_type() const; | 56 FrameType frame_type() const; |
52 VideoCodecType codec_type() const; | 57 VideoCodecType codec_type() const; |
53 bool GetBitstream(uint8_t* destination) const override; | 58 bool GetBitstream(uint8_t* destination) const override; |
54 RTPVideoTypeHeader* GetCodecHeader() const; | 59 RTPVideoTypeHeader* GetCodecHeader() const; |
55 | 60 |
56 private: | 61 private: |
57 PacketBuffer* packet_buffer_; | 62 PacketBuffer* packet_buffer_; |
58 FrameType frame_type_; | 63 FrameType frame_type_; |
59 VideoCodecType codec_type_; | 64 VideoCodecType codec_type_; |
60 uint16_t first_seq_num_; | 65 uint16_t first_seq_num_; |
61 uint16_t last_seq_num_; | 66 uint16_t last_seq_num_; |
67 int8_t max_nack_count_; | |
stefan-webrtc
2016/05/20 13:10:23
Why int8_t? int would be nicer
philipel
2016/05/23 09:19:22
Changed to int.
The reason I use int8_t here is b
terelius
2016/05/23 11:49:55
If you keep this as an int8_t and you are going to
| |
62 }; | 68 }; |
63 | 69 |
64 } // namespace video_coding | 70 } // namespace video_coding |
65 } // namespace webrtc | 71 } // namespace webrtc |
66 | 72 |
67 #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ | 73 #endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_OBJECT_H_ |
OLD | NEW |