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

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

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Fix typo, leading to failed video catpure test 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 _payloadType = 0; 80 _payloadType = 0;
81 _frameType = kVideoFrameDelta; 81 _frameType = kVideoFrameDelta;
82 _encodedWidth = 0; 82 _encodedWidth = 0;
83 _encodedHeight = 0; 83 _encodedHeight = 0;
84 _completeFrame = false; 84 _completeFrame = false;
85 _missingFrame = false; 85 _missingFrame = false;
86 _length = 0; 86 _length = 0;
87 _codecSpecificInfo.codecType = kVideoCodecUnknown; 87 _codecSpecificInfo.codecType = kVideoCodecUnknown;
88 _codec = kVideoCodecUnknown; 88 _codec = kVideoCodecUnknown;
89 rotation_ = kVideoRotation_0; 89 rotation_ = kVideoRotation_0;
90 content_type_ = VideoContentType::UNSPECIFIED;
90 _rotation_set = false; 91 _rotation_set = false;
91 } 92 }
92 93
93 void VCMEncodedFrame::CopyCodecSpecific(const RTPVideoHeader* header) { 94 void VCMEncodedFrame::CopyCodecSpecific(const RTPVideoHeader* header) {
94 if (header) { 95 if (header) {
95 switch (header->codec) { 96 switch (header->codec) {
96 case kRtpVideoVp8: { 97 case kRtpVideoVp8: {
97 if (_codecSpecificInfo.codecType != kVideoCodecVP8) { 98 if (_codecSpecificInfo.codecType != kVideoCodecVP8) {
98 // This is the first packet for this frame. 99 // This is the first packet for this frame.
99 _codecSpecificInfo.codecSpecific.VP8.pictureId = -1; 100 _codecSpecificInfo.codecSpecific.VP8.pictureId = -1;
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // copy old data 208 // copy old data
208 memcpy(newBuffer, _buffer, _size); 209 memcpy(newBuffer, _buffer, _size);
209 delete[] _buffer; 210 delete[] _buffer;
210 } 211 }
211 _buffer = newBuffer; 212 _buffer = newBuffer;
212 _size = minimumSize; 213 _size = minimumSize;
213 } 214 }
214 } 215 }
215 216
216 } // namespace webrtc 217 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/encoded_frame.h ('k') | webrtc/modules/video_coding/frame_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698