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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.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, 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) 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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 input_image.video_frame_buffer()->StrideV(), 321 input_image.video_frame_buffer()->StrideV(),
322 src_width, src_height, 322 src_width, src_height,
323 dst_buffer->MutableDataY(), dst_buffer->StrideY(), 323 dst_buffer->MutableDataY(), dst_buffer->StrideY(),
324 dst_buffer->MutableDataU(), dst_buffer->StrideU(), 324 dst_buffer->MutableDataU(), dst_buffer->StrideU(),
325 dst_buffer->MutableDataV(), dst_buffer->StrideV(), 325 dst_buffer->MutableDataV(), dst_buffer->StrideV(),
326 dst_width, dst_height, 326 dst_width, dst_height,
327 libyuv::kFilterBilinear); 327 libyuv::kFilterBilinear);
328 328
329 int ret = streaminfos_[stream_idx].encoder->Encode( 329 int ret = streaminfos_[stream_idx].encoder->Encode(
330 VideoFrame(dst_buffer, input_image.timestamp(), 330 VideoFrame(dst_buffer, input_image.timestamp(),
331 input_image.render_time_ms(), webrtc::kVideoRotation_0), 331 input_image.render_time_ms(), webrtc::kVideoRotation_0,
332 webrtc::kVideoContent_Default),
332 codec_specific_info, &stream_frame_types); 333 codec_specific_info, &stream_frame_types);
333 if (ret != WEBRTC_VIDEO_CODEC_OK) { 334 if (ret != WEBRTC_VIDEO_CODEC_OK) {
334 return ret; 335 return ret;
335 } 336 }
336 } 337 }
337 } 338 }
338 339
339 return WEBRTC_VIDEO_CODEC_OK; 340 return WEBRTC_VIDEO_CODEC_OK;
340 } 341 }
341 342
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 if (!Initialized() || NumberOfStreams(codec_) != 1) 472 if (!Initialized() || NumberOfStreams(codec_) != 1)
472 return VideoEncoder::ScalingSettings(false); 473 return VideoEncoder::ScalingSettings(false);
473 return streaminfos_[0].encoder->GetScalingSettings(); 474 return streaminfos_[0].encoder->GetScalingSettings();
474 } 475 }
475 476
476 const char* SimulcastEncoderAdapter::ImplementationName() const { 477 const char* SimulcastEncoderAdapter::ImplementationName() const {
477 return implementation_name_.c_str(); 478 return implementation_name_.c_str();
478 } 479 }
479 480
480 } // namespace webrtc 481 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698