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

Unified Diff: webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

Issue 2736603003: Android HW decoder: Don't check slice_height for texture output (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
index eb50e2e160d45da7b48b4fd5d7c479bb9997d54e..d30e94c58fbbb9ed3424a2959ce52cd0253fd003 100644
--- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
@@ -726,10 +726,6 @@ bool MediaCodecVideoDecoder::DeliverPendingOutputs(
j_color_format_field_);
int width = GetIntField(jni, *j_media_codec_video_decoder_, j_width_field_);
int height = GetIntField(jni, *j_media_codec_video_decoder_, j_height_field_);
- int stride = GetIntField(jni, *j_media_codec_video_decoder_, j_stride_field_);
- int slice_height = GetIntField(jni, *j_media_codec_video_decoder_,
- j_slice_height_field_);
- RTC_CHECK_GE(slice_height, height);
rtc::scoped_refptr<webrtc::VideoFrameBuffer> frame_buffer;
int64_t presentation_timestamps_ms = 0;
@@ -767,6 +763,10 @@ bool MediaCodecVideoDecoder::DeliverPendingOutputs(
} else {
// Extract data from Java ByteBuffer and create output yuv420 frame -
// for non surface decoding only.
+ int stride =
+ GetIntField(jni, *j_media_codec_video_decoder_, j_stride_field_);
+ const int slice_height =
+ GetIntField(jni, *j_media_codec_video_decoder_, j_slice_height_field_);
const int output_buffer_index = GetIntField(
jni, j_decoder_output_buffer, j_info_index_field_);
const int output_buffer_offset = GetIntField(
@@ -782,6 +782,7 @@ bool MediaCodecVideoDecoder::DeliverPendingOutputs(
decode_time_ms = GetLongField(jni, j_decoder_output_buffer,
j_byte_buffer_decode_time_ms_field_);
+ RTC_CHECK_GE(slice_height, height);
if (output_buffer_size < width * height * 3 / 2) {
ALOGE << "Insufficient output buffer size: " << output_buffer_size;
@@ -870,7 +871,6 @@ bool MediaCodecVideoDecoder::DeliverPendingOutputs(
if (frames_decoded_ < frames_decoded_logged_) {
ALOGD << "Decoder frame out # " << frames_decoded_ <<
". " << width << " x " << height <<
- ". " << stride << " x " << slice_height <<
sakal 2017/03/06 12:36:41 nit: Maybe add this log line back inside the else
". Color: " << color_format <<
". TS: " << presentation_timestamps_ms <<
". DecTime: " << (int)decode_time_ms <<
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698