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

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

Issue 1211353002: Integration of VP9 packetization. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: refactor and remove test helper class Created 5 years, 5 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 18 matching lines...) Expand all
29 rtp->codecHeader.VP8.pictureId = info->codecSpecific.VP8.pictureId; 29 rtp->codecHeader.VP8.pictureId = info->codecSpecific.VP8.pictureId;
30 rtp->codecHeader.VP8.nonReference = 30 rtp->codecHeader.VP8.nonReference =
31 info->codecSpecific.VP8.nonReference; 31 info->codecSpecific.VP8.nonReference;
32 rtp->codecHeader.VP8.temporalIdx = info->codecSpecific.VP8.temporalIdx; 32 rtp->codecHeader.VP8.temporalIdx = info->codecSpecific.VP8.temporalIdx;
33 rtp->codecHeader.VP8.layerSync = info->codecSpecific.VP8.layerSync; 33 rtp->codecHeader.VP8.layerSync = info->codecSpecific.VP8.layerSync;
34 rtp->codecHeader.VP8.tl0PicIdx = info->codecSpecific.VP8.tl0PicIdx; 34 rtp->codecHeader.VP8.tl0PicIdx = info->codecSpecific.VP8.tl0PicIdx;
35 rtp->codecHeader.VP8.keyIdx = info->codecSpecific.VP8.keyIdx; 35 rtp->codecHeader.VP8.keyIdx = info->codecSpecific.VP8.keyIdx;
36 rtp->simulcastIdx = info->codecSpecific.VP8.simulcastIdx; 36 rtp->simulcastIdx = info->codecSpecific.VP8.simulcastIdx;
37 return; 37 return;
38 } 38 }
39 case kVideoCodecVP9: {
40 rtp->codec = kRtpVideoVp9;
41 rtp->codecHeader.VP9.InitRTPVideoHeaderVP9();
42 rtp->codecHeader.VP9.interPicPredicted =
43 info->codecSpecific.VP9.interPicPredicted;
44 rtp->codecHeader.VP9.flexibleMode = info->codecSpecific.VP9.flexibleMode;
45 rtp->codecHeader.VP9.beginningOfFrame =
46 info->codecSpecific.VP9.beginningOfFrame;
47 rtp->codecHeader.VP9.endOfFrame = info->codecSpecific.VP9.endOfFrame;
48 rtp->codecHeader.VP9.ssDataAvailable =
49 info->codecSpecific.VP9.ssDataAvailable;
50 rtp->codecHeader.VP9.pictureId = info->codecSpecific.VP9.pictureId;
51 rtp->codecHeader.VP9.tl0PicIdx = info->codecSpecific.VP9.tl0PicIdx;
52 rtp->codecHeader.VP9.temporalIdx = info->codecSpecific.VP9.temporalIdx;
53 rtp->codecHeader.VP9.spatialIdx = info->codecSpecific.VP9.spatialIdx;
54 rtp->codecHeader.VP9.temporalUpSwitch =
55 info->codecSpecific.VP9.temporalUpSwitch;
56 rtp->codecHeader.VP9.interLayerPredicted =
57 info->codecSpecific.VP9.interLayerPredicted;
58 rtp->codecHeader.VP9.gofIdx = info->codecSpecific.VP9.gofIdx;
59
60 if (info->codecSpecific.VP9.ssDataAvailable) {
61 rtp->codecHeader.VP9.numSpatialLayers =
62 info->codecSpecific.VP9.numSpatialLayers;
63 rtp->codecHeader.VP9.spatialLayerResolutionPresent =
64 info->codecSpecific.VP9.spatialLayerResolutionPresent;
65 if (info->codecSpecific.VP9.spatialLayerResolutionPresent) {
66 for (uint8_t s = 0; s < info->codecSpecific.VP9.numSpatialLayers;
67 s++) {
68 rtp->codecHeader.VP9.width[s] = info->codecSpecific.VP9.width[s];
69 rtp->codecHeader.VP9.height[s] = info->codecSpecific.VP9.height[s];
70 }
71 }
72 rtp->codecHeader.VP9.gof.CopyGofInfoVP9(info->codecSpecific.VP9.gof);
73 }
74 return;
75 }
39 case kVideoCodecH264: 76 case kVideoCodecH264:
40 rtp->codec = kRtpVideoH264; 77 rtp->codec = kRtpVideoH264;
41 return; 78 return;
42 case kVideoCodecGeneric: 79 case kVideoCodecGeneric:
43 rtp->codec = kRtpVideoGeneric; 80 rtp->codec = kRtpVideoGeneric;
44 rtp->simulcastIdx = info->codecSpecific.generic.simulcast_idx; 81 rtp->simulcastIdx = info->codecSpecific.generic.simulcast_idx;
45 return; 82 return;
46 default: 83 default:
47 return; 84 return;
48 } 85 }
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 } 326 }
290 327
291 void 328 void
292 VCMEncodedFrameCallback::SetMediaOpt( 329 VCMEncodedFrameCallback::SetMediaOpt(
293 media_optimization::MediaOptimization *mediaOpt) 330 media_optimization::MediaOptimization *mediaOpt)
294 { 331 {
295 _mediaOpt = mediaOpt; 332 _mediaOpt = mediaOpt;
296 } 333 }
297 334
298 } // namespace webrtc 335 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698