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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc

Issue 2816463002: Revert of Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: 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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 RTC_DCHECK_LE(encoded_image_._length, encoded_image_._size); 699 RTC_DCHECK_LE(encoded_image_._length, encoded_image_._size);
700 700
701 CodecSpecificInfo codec_specific; 701 CodecSpecificInfo codec_specific;
702 PopulateCodecSpecific(&codec_specific, *pkt, input_image_->timestamp()); 702 PopulateCodecSpecific(&codec_specific, *pkt, input_image_->timestamp());
703 703
704 if (encoded_image_._length > 0) { 704 if (encoded_image_._length > 0) {
705 TRACE_COUNTER1("webrtc", "EncodedFrameSize", encoded_image_._length); 705 TRACE_COUNTER1("webrtc", "EncodedFrameSize", encoded_image_._length);
706 encoded_image_._timeStamp = input_image_->timestamp(); 706 encoded_image_._timeStamp = input_image_->timestamp();
707 encoded_image_.capture_time_ms_ = input_image_->render_time_ms(); 707 encoded_image_.capture_time_ms_ = input_image_->render_time_ms();
708 encoded_image_.rotation_ = input_image_->rotation(); 708 encoded_image_.rotation_ = input_image_->rotation();
709 encoded_image_.content_type_ = (codec_.mode == kScreensharing)
710 ? VideoContentType::SCREENSHARE
711 : VideoContentType::UNSPECIFIED;
712 encoded_image_._encodedHeight = raw_->d_h; 709 encoded_image_._encodedHeight = raw_->d_h;
713 encoded_image_._encodedWidth = raw_->d_w; 710 encoded_image_._encodedWidth = raw_->d_w;
714 int qp = -1; 711 int qp = -1;
715 vpx_codec_control(encoder_, VP8E_GET_LAST_QUANTIZER, &qp); 712 vpx_codec_control(encoder_, VP8E_GET_LAST_QUANTIZER, &qp);
716 encoded_image_.qp_ = qp; 713 encoded_image_.qp_ = qp;
717 encoded_complete_callback_->OnEncodedImage(encoded_image_, &codec_specific, 714 encoded_complete_callback_->OnEncodedImage(encoded_image_, &codec_specific,
718 &frag_info); 715 &frag_info);
719 } 716 }
720 return WEBRTC_VIDEO_CODEC_OK; 717 return WEBRTC_VIDEO_CODEC_OK;
721 } 718 }
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 frame_buffer_pool_.ClearPool(); 1005 frame_buffer_pool_.ClearPool();
1009 inited_ = false; 1006 inited_ = false;
1010 return WEBRTC_VIDEO_CODEC_OK; 1007 return WEBRTC_VIDEO_CODEC_OK;
1011 } 1008 }
1012 1009
1013 const char* VP9DecoderImpl::ImplementationName() const { 1010 const char* VP9DecoderImpl::ImplementationName() const {
1014 return "libvpx"; 1011 return "libvpx";
1015 } 1012 }
1016 1013
1017 } // namespace webrtc 1014 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc ('k') | webrtc/modules/video_coding/encoded_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698