| OLD | NEW | 
|---|
| 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 687 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 698   if (encoded_image_._length > 0) { | 698   if (encoded_image_._length > 0) { | 
| 699     TRACE_COUNTER1("webrtc", "EncodedFrameSize", encoded_image_._length); | 699     TRACE_COUNTER1("webrtc", "EncodedFrameSize", encoded_image_._length); | 
| 700     encoded_image_._timeStamp = input_image_->timestamp(); | 700     encoded_image_._timeStamp = input_image_->timestamp(); | 
| 701     encoded_image_.capture_time_ms_ = input_image_->render_time_ms(); | 701     encoded_image_.capture_time_ms_ = input_image_->render_time_ms(); | 
| 702     encoded_image_.rotation_ = input_image_->rotation(); | 702     encoded_image_.rotation_ = input_image_->rotation(); | 
| 703     encoded_image_._encodedHeight = raw_->d_h; | 703     encoded_image_._encodedHeight = raw_->d_h; | 
| 704     encoded_image_._encodedWidth = raw_->d_w; | 704     encoded_image_._encodedWidth = raw_->d_w; | 
| 705     int qp = -1; | 705     int qp = -1; | 
| 706     vpx_codec_control(encoder_, VP8E_GET_LAST_QUANTIZER, &qp); | 706     vpx_codec_control(encoder_, VP8E_GET_LAST_QUANTIZER, &qp); | 
| 707     encoded_image_.qp_ = qp; | 707     encoded_image_.qp_ = qp; | 
| 708     encoded_complete_callback_->Encoded(encoded_image_, &codec_specific, | 708     encoded_complete_callback_->OnEncodedImage(encoded_image_, &codec_specific, | 
| 709                                         &frag_info); | 709                                                &frag_info); | 
| 710   } | 710   } | 
| 711   return WEBRTC_VIDEO_CODEC_OK; | 711   return WEBRTC_VIDEO_CODEC_OK; | 
| 712 } | 712 } | 
| 713 | 713 | 
| 714 vpx_svc_ref_frame_config VP9EncoderImpl::GenerateRefsAndFlags( | 714 vpx_svc_ref_frame_config VP9EncoderImpl::GenerateRefsAndFlags( | 
| 715     const SuperFrameRefSettings& settings) { | 715     const SuperFrameRefSettings& settings) { | 
| 716   static const vpx_enc_frame_flags_t kAllFlags = | 716   static const vpx_enc_frame_flags_t kAllFlags = | 
| 717       VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_LAST | | 717       VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_REF_GF | VP8_EFLAG_NO_REF_LAST | | 
| 718       VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_GF; | 718       VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_GF; | 
| 719   vpx_svc_ref_frame_config sf_conf = {}; | 719   vpx_svc_ref_frame_config sf_conf = {}; | 
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 994   frame_buffer_pool_.ClearPool(); | 994   frame_buffer_pool_.ClearPool(); | 
| 995   inited_ = false; | 995   inited_ = false; | 
| 996   return WEBRTC_VIDEO_CODEC_OK; | 996   return WEBRTC_VIDEO_CODEC_OK; | 
| 997 } | 997 } | 
| 998 | 998 | 
| 999 const char* VP9DecoderImpl::ImplementationName() const { | 999 const char* VP9DecoderImpl::ImplementationName() const { | 
| 1000   return "libvpx"; | 1000   return "libvpx"; | 
| 1001 } | 1001 } | 
| 1002 | 1002 | 
| 1003 }  // namespace webrtc | 1003 }  // namespace webrtc | 
| OLD | NEW | 
|---|