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

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

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Set EncodedImage content_type from vie_encoder Created 3 years, 9 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return encoder_->SetPeriodicKeyFrames(enable); 121 return encoder_->SetPeriodicKeyFrames(enable);
122 } 122 }
123 123
124 int32_t VCMGenericEncoder::RequestFrame( 124 int32_t VCMGenericEncoder::RequestFrame(
125 const std::vector<FrameType>& frame_types) { 125 const std::vector<FrameType>& frame_types) {
126 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_); 126 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
127 127
128 // TODO(nisse): Used only with internal source. Delete as soon as 128 // TODO(nisse): Used only with internal source. Delete as soon as
129 // that feature is removed. The only implementation I've been able 129 // that feature is removed. The only implementation I've been able
130 // to find ignores what's in the frame. 130 // to find ignores what's in the frame.
131 return encoder_->Encode(VideoFrame(I420Buffer::Create(1, 1), 131 return encoder_->Encode(VideoFrame(I420Buffer::Create(1, 1), kVideoRotation_0,
132 kVideoRotation_0, 0), 132 kVideoContent_Default, 0),
133 NULL, &frame_types); 133 NULL, &frame_types);
134 return 0; 134 return 0;
135 } 135 }
136 136
137 bool VCMGenericEncoder::InternalSource() const { 137 bool VCMGenericEncoder::InternalSource() const {
138 return internal_source_; 138 return internal_source_;
139 } 139 }
140 140
141 bool VCMGenericEncoder::SupportsNativeHandle() const { 141 bool VCMGenericEncoder::SupportsNativeHandle() const {
142 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_); 142 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
(...skipping 24 matching lines...) Expand all
167 media_opt_->UpdateWithEncodedData(encoded_image); 167 media_opt_->UpdateWithEncodedData(encoded_image);
168 if (internal_source_) { 168 if (internal_source_) {
169 // Signal to encoder to drop next frame. 169 // Signal to encoder to drop next frame.
170 result.drop_next_frame = media_opt_->DropFrame(); 170 result.drop_next_frame = media_opt_->DropFrame();
171 } 171 }
172 } 172 }
173 return result; 173 return result;
174 } 174 }
175 175
176 } // namespace webrtc 176 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698