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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/vp8_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) 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 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 } 871 }
872 PopulateCodecSpecific(&codec_specific, *pkt, stream_idx, 872 PopulateCodecSpecific(&codec_specific, *pkt, stream_idx,
873 input_image.timestamp()); 873 input_image.timestamp());
874 break; 874 break;
875 } 875 }
876 } 876 }
877 encoded_images_[encoder_idx]._timeStamp = input_image.timestamp(); 877 encoded_images_[encoder_idx]._timeStamp = input_image.timestamp();
878 encoded_images_[encoder_idx].capture_time_ms_ = 878 encoded_images_[encoder_idx].capture_time_ms_ =
879 input_image.render_time_ms(); 879 input_image.render_time_ms();
880 encoded_images_[encoder_idx].rotation_ = input_image.rotation(); 880 encoded_images_[encoder_idx].rotation_ = input_image.rotation();
881 encoded_images_[encoder_idx].content_type_ =
882 (codec_.mode == kScreensharing) ? VideoContentType::SCREENSHARE
883 : VideoContentType::UNSPECIFIED;
881 884
882 int qp = -1; 885 int qp = -1;
883 vpx_codec_control(&encoders_[encoder_idx], VP8E_GET_LAST_QUANTIZER_64, &qp); 886 vpx_codec_control(&encoders_[encoder_idx], VP8E_GET_LAST_QUANTIZER_64, &qp);
884 temporal_layers_[stream_idx]->FrameEncoded( 887 temporal_layers_[stream_idx]->FrameEncoded(
885 encoded_images_[encoder_idx]._length, qp); 888 encoded_images_[encoder_idx]._length, qp);
886 if (send_stream_[stream_idx]) { 889 if (send_stream_[stream_idx]) {
887 if (encoded_images_[encoder_idx]._length > 0) { 890 if (encoded_images_[encoder_idx]._length > 0) {
888 TRACE_COUNTER_ID1("webrtc", "EncodedFrameSize", encoder_idx, 891 TRACE_COUNTER_ID1("webrtc", "EncodedFrameSize", encoder_idx,
889 encoded_images_[encoder_idx]._length); 892 encoded_images_[encoder_idx]._length);
890 encoded_images_[encoder_idx]._encodedHeight = 893 encoded_images_[encoder_idx]._encodedHeight =
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 buffer_pool_.Release(); 1152 buffer_pool_.Release();
1150 inited_ = false; 1153 inited_ = false;
1151 return WEBRTC_VIDEO_CODEC_OK; 1154 return WEBRTC_VIDEO_CODEC_OK;
1152 } 1155 }
1153 1156
1154 const char* VP8DecoderImpl::ImplementationName() const { 1157 const char* VP8DecoderImpl::ImplementationName() const {
1155 return "libvpx"; 1158 return "libvpx";
1156 } 1159 }
1157 1160
1158 } // namespace webrtc 1161 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc ('k') | webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698