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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc

Issue 1342543004: Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 h264_header->packetization_type = kH264FuA; 146 h264_header->packetization_type = kH264FuA;
147 h264_header->nalu_type = original_nal_type; 147 h264_header->nalu_type = original_nal_type;
148 return true; 148 return true;
149 } 149 }
150 } // namespace 150 } // namespace
151 151
152 RtpPacketizerH264::RtpPacketizerH264(FrameType frame_type, 152 RtpPacketizerH264::RtpPacketizerH264(FrameType frame_type,
153 size_t max_payload_len) 153 size_t max_payload_len)
154 : payload_data_(NULL), 154 : payload_data_(NULL),
155 payload_size_(0), 155 payload_size_(0),
156 max_payload_len_(max_payload_len), 156 max_payload_len_(max_payload_len) {
157 frame_type_(frame_type) {
158 } 157 }
159 158
160 RtpPacketizerH264::~RtpPacketizerH264() { 159 RtpPacketizerH264::~RtpPacketizerH264() {
161 } 160 }
162 161
163 void RtpPacketizerH264::SetPayloadData( 162 void RtpPacketizerH264::SetPayloadData(
164 const uint8_t* payload_data, 163 const uint8_t* payload_data,
165 size_t payload_size, 164 size_t payload_size,
166 const RTPFragmentationHeader* fragmentation) { 165 const RTPFragmentationHeader* fragmentation) {
167 assert(packets_.empty()); 166 assert(packets_.empty());
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 // will depacketize the STAP-A into NAL units later. 365 // will depacketize the STAP-A into NAL units later.
367 if (!ParseSingleNalu(parsed_payload, payload_data, payload_data_length)) 366 if (!ParseSingleNalu(parsed_payload, payload_data, payload_data_length))
368 return false; 367 return false;
369 } 368 }
370 369
371 parsed_payload->payload = payload_data + offset; 370 parsed_payload->payload = payload_data + offset;
372 parsed_payload->payload_length = payload_data_length - offset; 371 parsed_payload->payload_length = payload_data_length - offset;
373 return true; 372 return true;
374 } 373 }
375 } // namespace webrtc 374 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_format_h264.h ('k') | webrtc/modules/video_coding/main/test/test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698