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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Fix typo, leading to failed video catpure test 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 ReportError(); 360 ReportError();
361 return WEBRTC_VIDEO_CODEC_ERROR; 361 return WEBRTC_VIDEO_CODEC_ERROR;
362 } 362 }
363 363
364 encoded_image_._encodedWidth = frame_buffer->width(); 364 encoded_image_._encodedWidth = frame_buffer->width();
365 encoded_image_._encodedHeight = frame_buffer->height(); 365 encoded_image_._encodedHeight = frame_buffer->height();
366 encoded_image_._timeStamp = input_frame.timestamp(); 366 encoded_image_._timeStamp = input_frame.timestamp();
367 encoded_image_.ntp_time_ms_ = input_frame.ntp_time_ms(); 367 encoded_image_.ntp_time_ms_ = input_frame.ntp_time_ms();
368 encoded_image_.capture_time_ms_ = input_frame.render_time_ms(); 368 encoded_image_.capture_time_ms_ = input_frame.render_time_ms();
369 encoded_image_.rotation_ = input_frame.rotation(); 369 encoded_image_.rotation_ = input_frame.rotation();
370 encoded_image_.content_type_ = (mode_ == kScreensharing)
371 ? VideoContentType::SCREENSHARE
372 : VideoContentType::UNSPECIFIED;
370 encoded_image_._frameType = ConvertToVideoFrameType(info.eFrameType); 373 encoded_image_._frameType = ConvertToVideoFrameType(info.eFrameType);
371 374
372 // Split encoded image up into fragments. This also updates |encoded_image_|. 375 // Split encoded image up into fragments. This also updates |encoded_image_|.
373 RTPFragmentationHeader frag_header; 376 RTPFragmentationHeader frag_header;
374 RtpFragmentize(&encoded_image_, &encoded_image_buffer_, *frame_buffer, &info, 377 RtpFragmentize(&encoded_image_, &encoded_image_buffer_, *frame_buffer, &info,
375 &frag_header); 378 &frag_header);
376 379
377 // Encoder can skip frames to save bandwidth in which case 380 // Encoder can skip frames to save bandwidth in which case
378 // |encoded_image_._length| == 0. 381 // |encoded_image_._length| == 0.
379 if (encoded_image_._length > 0) { 382 if (encoded_image_._length > 0) {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 497
495 int32_t H264EncoderImpl::SetPeriodicKeyFrames(bool enable) { 498 int32_t H264EncoderImpl::SetPeriodicKeyFrames(bool enable) {
496 return WEBRTC_VIDEO_CODEC_OK; 499 return WEBRTC_VIDEO_CODEC_OK;
497 } 500 }
498 501
499 VideoEncoder::ScalingSettings H264EncoderImpl::GetScalingSettings() const { 502 VideoEncoder::ScalingSettings H264EncoderImpl::GetScalingSettings() const {
500 return VideoEncoder::ScalingSettings(true); 503 return VideoEncoder::ScalingSettings(true);
501 } 504 }
502 505
503 } // namespace webrtc 506 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/video_capture_impl.cc ('k') | webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698