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

Side by Side Diff: webrtc/modules/video_coding/frame_buffer.cc

Issue 2809653004: Revert of Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ 156 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
157 // ts_126114v120700p.pdf Section 7.4.5. 157 // ts_126114v120700p.pdf Section 7.4.5.
158 // The MTSI client shall add the payload bytes as defined in this clause 158 // The MTSI client shall add the payload bytes as defined in this clause
159 // onto the last RTP packet in each group of packets which make up a key 159 // onto the last RTP packet in each group of packets which make up a key
160 // frame (I-frame or IDR frame in H.264 (AVC), or an IRAP picture in H.265 160 // frame (I-frame or IDR frame in H.264 (AVC), or an IRAP picture in H.265
161 // (HEVC)). 161 // (HEVC)).
162 if (packet.markerBit) { 162 if (packet.markerBit) {
163 RTC_DCHECK(!_rotation_set); 163 RTC_DCHECK(!_rotation_set);
164 rotation_ = packet.video_header.rotation; 164 rotation_ = packet.video_header.rotation;
165 _rotation_set = true; 165 _rotation_set = true;
166 content_type_ = packet.video_header.content_type;
167 } 166 }
168 167
169 if (packet.is_first_packet_in_frame) { 168 if (packet.is_first_packet_in_frame) {
170 playout_delay_ = packet.video_header.playout_delay; 169 playout_delay_ = packet.video_header.playout_delay;
171 } 170 }
172 171
173 if (_sessionInfo.complete()) { 172 if (_sessionInfo.complete()) {
174 SetState(kStateComplete); 173 SetState(kStateComplete);
175 return kCompleteSession; 174 return kCompleteSession;
176 } else if (_sessionInfo.decodable()) { 175 } else if (_sessionInfo.decodable()) {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 size_t bytes_removed = _sessionInfo.MakeDecodable(); 274 size_t bytes_removed = _sessionInfo.MakeDecodable();
276 _length -= bytes_removed; 275 _length -= bytes_removed;
277 // Transfer frame information to EncodedFrame and create any codec 276 // Transfer frame information to EncodedFrame and create any codec
278 // specific information. 277 // specific information.
279 _frameType = _sessionInfo.FrameType(); 278 _frameType = _sessionInfo.FrameType();
280 _completeFrame = _sessionInfo.complete(); 279 _completeFrame = _sessionInfo.complete();
281 _missingFrame = !continuous; 280 _missingFrame = !continuous;
282 } 281 }
283 282
284 } // namespace webrtc 283 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/encoded_frame.cc ('k') | webrtc/modules/video_coding/frame_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698