webrtc/modules/video_coding/main/source/encoded_frame.cc - Issue 1328113004: Work on flexible mode and screen sharing.

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

Issue 1328113004: Work on flexible mode and screen sharing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebase + comments Created 5 years, 1 month 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

« webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc ('K') | « webrtc/modules/video_coding/main/source/decoding_state_unittest.cc ('k') | webrtc/modules/video_coding/main/source/generic_encoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
140 _codecSpecificInfo.codecSpecific.VP9.spatial_idx = 0;	140 _codecSpecificInfo.codecSpecific.VP9.spatial_idx = 0;

141 _codecSpecificInfo.codecSpecific.VP9.gof_idx = 0;	141 _codecSpecificInfo.codecSpecific.VP9.gof_idx = 0;

142 _codecSpecificInfo.codecSpecific.VP9.inter_layer_predicted = false;	142 _codecSpecificInfo.codecSpecific.VP9.inter_layer_predicted = false;

143 _codecSpecificInfo.codecSpecific.VP9.tl0_pic_idx = -1;	143 _codecSpecificInfo.codecSpecific.VP9.tl0_pic_idx = -1;

144 _codecSpecificInfo.codecType = kVideoCodecVP9;	144 _codecSpecificInfo.codecType = kVideoCodecVP9;

145 }	145 }

146 _codecSpecificInfo.codecSpecific.VP9.inter_pic_predicted =	146 _codecSpecificInfo.codecSpecific.VP9.inter_pic_predicted =

147 header->codecHeader.VP9.inter_pic_predicted;	147 header->codecHeader.VP9.inter_pic_predicted;

148 _codecSpecificInfo.codecSpecific.VP9.flexible_mode =	148 _codecSpecificInfo.codecSpecific.VP9.flexible_mode =

149 header->codecHeader.VP9.flexible_mode;	149 header->codecHeader.VP9.flexible_mode;

	150 _codecSpecificInfo.codecSpecific.VP9.num_ref_pics =

	151 header->codecHeader.VP9.num_ref_pics;

	152 for (uint8_t r = 0; r < header->codecHeader.VP9.num_ref_pics; ++r) {

	153 _codecSpecificInfo.codecSpecific.VP9.p_diff[r] =

	154 header->codecHeader.VP9.pid_diff[r];

	155 }

150 _codecSpecificInfo.codecSpecific.VP9.ss_data_available =	156 _codecSpecificInfo.codecSpecific.VP9.ss_data_available =

151 header->codecHeader.VP9.ss_data_available;	157 header->codecHeader.VP9.ss_data_available;

152 if (header->codecHeader.VP9.picture_id != kNoPictureId) {	158 if (header->codecHeader.VP9.picture_id != kNoPictureId) {

153 _codecSpecificInfo.codecSpecific.VP9.picture_id =	159 _codecSpecificInfo.codecSpecific.VP9.picture_id =

154 header->codecHeader.VP9.picture_id;	160 header->codecHeader.VP9.picture_id;

155 }	161 }

156 if (header->codecHeader.VP9.tl0_pic_idx != kNoTl0PicIdx) {	162 if (header->codecHeader.VP9.tl0_pic_idx != kNoTl0PicIdx) {

157 _codecSpecificInfo.codecSpecific.VP9.tl0_pic_idx =	163 _codecSpecificInfo.codecSpecific.VP9.tl0_pic_idx =

158 header->codecHeader.VP9.tl0_pic_idx;	164 header->codecHeader.VP9.tl0_pic_idx;

159 }	165 }

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
220 // copy old data	226 // copy old data

221 memcpy(newBuffer, _buffer, _size);	227 memcpy(newBuffer, _buffer, _size);

222 delete [] _buffer;	228 delete [] _buffer;

223 }	229 }

224 _buffer = newBuffer;	230 _buffer = newBuffer;

225 _size = minimumSize;	231 _size = minimumSize;

226 }	232 }

227 }	233 }

228	234

229 } // namespace webrtc	235 } // namespace webrtc

OLD	NEW