Index: talk/app/webrtc/java/jni/androidmediaencoder_jni.cc |
diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc |
index d2ec5528341cf423233e2cc76d01bd4e395742f8..a9f20b328e4a6ccd1d31a01ac13d27d9c17e21cd 100644 |
--- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc |
+++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc |
@@ -795,8 +795,13 @@ bool MediaCodecVideoEncoder::DeliverPendingOutputs(JNIEnv* jni) { |
header.fragmentationLength[0] = image->_length; |
header.fragmentationPlType[0] = 0; |
header.fragmentationTimeDiff[0] = 0; |
- if (scale_) |
- quality_scaler_.ReportQP(webrtc::vp8::GetQP(payload)); |
+ if (scale_) { |
+ int qp; |
+ bool found = webrtc::vp8::GetQp(payload, payload_size, &qp); |
+ RTC_DCHECK(found); |
+ if (found) |
magjed_webrtc
2015/10/20 13:17:20
You shouldn't handle DCHECK failures. At least thi
åsapersson
2015/10/20 13:52:36
Ok. Removed check.
|
+ quality_scaler_.ReportQP(qp); |
+ } |
} else if (codecType_ == kVideoCodecH264) { |
if (scale_) { |
h264_bitstream_parser_.ParseBitstream(payload, payload_size); |