Extra logging for HW codec.

talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 149 matching lines @@
   jfieldID j_input_buffers_field_;
   jfieldID j_output_buffers_field_;
   jfieldID j_color_format_field_;
   jfieldID j_width_field_;
   jfieldID j_height_field_;
   jfieldID j_stride_field_;
   jfieldID j_slice_height_field_;
   // MediaCodecVideoDecoder.DecodedTextureBuffer fields.
   jfieldID j_texture_id_field_;
   jfieldID j_transform_matrix_field_;
+  jfieldID j_texture_presentation_timestamp_ms_field_;
   jfieldID j_texture_timestamp_ms_field_;
   jfieldID j_texture_ntp_timestamp_ms_field_;
   jfieldID j_texture_decode_time_ms_field_;
   jfieldID j_texture_frame_delay_ms_field_;
   // MediaCodecVideoDecoder.DecodedOutputBuffer fields.
   jfieldID j_info_index_field_;
   jfieldID j_info_offset_field_;
   jfieldID j_info_size_field_;
-  jfieldID j_info_timestamp_ms_field_;
-  jfieldID j_info_ntp_timestamp_ms_field_;
+  jfieldID j_presentation_timestamp_ms_field_;
+  jfieldID j_timestamp_ms_field_;
+  jfieldID j_ntp_timestamp_ms_field_;
   jfieldID j_byte_buffer_decode_time_ms_field_;
 
   // Global references; must be deleted in Release().
   std::vector<jobject> input_buffers_;
 };
 
 MediaCodecVideoDecoder::MediaCodecVideoDecoder(
     JNIEnv* jni, VideoCodecType codecType, jobject render_egl_context) :
     codecType_(codecType),
     render_egl_context_(render_egl_context),
@@ skipping 51 matching lines @@
       jni, *j_media_codec_video_decoder_class_, "stride", "I");
   j_slice_height_field_ = GetFieldID(
       jni, *j_media_codec_video_decoder_class_, "sliceHeight", "I");
 
   jclass j_decoded_texture_buffer_class = FindClass(jni,
       "org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer");
   j_texture_id_field_ = GetFieldID(
       jni, j_decoded_texture_buffer_class, "textureID", "I");
   j_transform_matrix_field_ = GetFieldID(
       jni, j_decoded_texture_buffer_class, "transformMatrix", "[F");
+  j_texture_presentation_timestamp_ms_field_ = GetFieldID(
+      jni, j_decoded_texture_buffer_class, "presentationTimeStampMs", "J");
   j_texture_timestamp_ms_field_ = GetFieldID(
       jni, j_decoded_texture_buffer_class, "timeStampMs", "J");
   j_texture_ntp_timestamp_ms_field_ = GetFieldID(
       jni, j_decoded_texture_buffer_class, "ntpTimeStampMs", "J");
   j_texture_decode_time_ms_field_ = GetFieldID(
       jni, j_decoded_texture_buffer_class, "decodeTimeMs", "J");
   j_texture_frame_delay_ms_field_ = GetFieldID(
       jni, j_decoded_texture_buffer_class, "frameDelayMs", "J");
 
   jclass j_decoded_output_buffer_class = FindClass(jni,
       "org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer");
   j_info_index_field_ = GetFieldID(
       jni, j_decoded_output_buffer_class, "index", "I");
   j_info_offset_field_ = GetFieldID(
       jni, j_decoded_output_buffer_class, "offset", "I");
   j_info_size_field_ = GetFieldID(
       jni, j_decoded_output_buffer_class, "size", "I");
-  j_info_timestamp_ms_field_ = GetFieldID(
+  j_info_size_field_ = GetFieldID(

[perkj_webrtc, 2016/02/01 09:20:53]

duplicate set

[AlexG, 2016/02/01 20:13:35]

Done.

+      jni, j_decoded_output_buffer_class, "size", "I");
+  j_presentation_timestamp_ms_field_ = GetFieldID(
+      jni, j_decoded_output_buffer_class, "presentationTimeStampMs", "J");
+  j_timestamp_ms_field_ = GetFieldID(
       jni, j_decoded_output_buffer_class, "timeStampMs", "J");
-  j_info_ntp_timestamp_ms_field_ = GetFieldID(
+  j_ntp_timestamp_ms_field_ = GetFieldID(
       jni, j_decoded_output_buffer_class, "ntpTimeStampMs", "J");
   j_byte_buffer_decode_time_ms_field_ = GetFieldID(
       jni, j_decoded_output_buffer_class, "decodeTimeMs", "J");
 
   CHECK_EXCEPTION(jni) << "MediaCodecVideoDecoder ctor failed";
   use_surface_ = (render_egl_context_ != NULL);
   ALOGD << "MediaCodecVideoDecoder ctor. Use surface: " << use_surface_;
   memset(&codec_, 0, sizeof(codec_));
   AllowBlockingCalls();
 }
@@ skipping 278 matching lines @@
       reinterpret_cast<uint8_t*>(jni->GetDirectBufferAddress(j_input_buffer));
   RTC_CHECK(buffer) << "Indirect buffer??";
   int64_t buffer_capacity = jni->GetDirectBufferCapacity(j_input_buffer);
   if (CheckException(jni) || buffer_capacity < inputImage._length) {
     ALOGE << "Input frame size "<<  inputImage._length <<
         " is bigger than buffer size " << buffer_capacity;
     return ProcessHWErrorOnCodecThread();
   }
   jlong presentation_timestamp_us =
       (frames_received_ * 1000000) / codec_.maxFramerate;
+  memcpy(buffer, inputImage._buffer, inputImage._length);
+
   if (frames_decoded_ < kMaxDecodedLogFrames) {
     ALOGD << "Decoder frame in # " << frames_received_ << ". Type: "
         << inputImage._frameType << ". Buffer # " <<
-        j_input_buffer_index << ". pTS: "
+        j_input_buffer_index << ". TS: "
         << (int)(presentation_timestamp_us / 1000)
-        << ". TS: " << inputImage._timeStamp
         << ". Size: " << inputImage._length;
   }
-  memcpy(buffer, inputImage._buffer, inputImage._length);
 
   // Save input image timestamps for later output.
   frames_received_++;
   current_bytes_ += inputImage._length;
 
   // Feed input to decoder.
   bool success = jni->CallBooleanMethod(
       *j_media_codec_video_decoder_,
       j_queue_input_buffer_method_,
       j_input_buffer_index,
@@ skipping 40 matching lines @@
   // Get decoded video frame properties.
   int color_format = GetIntField(jni, *j_media_codec_video_decoder_,
       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::scoped_refptr<webrtc::VideoFrameBuffer> frame_buffer;
+  int64_t presentation_timestamps_ms = 0;
   int64_t output_timestamps_ms = 0;
   int64_t output_ntp_timestamps_ms = 0;
   int decode_time_ms = 0;
   int64_t frame_delayed_ms = 0;
   if (use_surface_) {
     // Extract data from Java DecodedTextureBuffer.
     const int texture_id =
         GetIntField(jni, j_decoder_output_buffer, j_texture_id_field_);
     if (texture_id != 0) {  // |texture_id| == 0 represents a dropped frame.
       const jfloatArray j_transform_matrix =
           reinterpret_cast<jfloatArray>(GetObjectField(
               jni, j_decoder_output_buffer, j_transform_matrix_field_));
-      const int64_t timestamp_us =
-          GetLongField(jni, j_decoder_output_buffer,
-              j_texture_timestamp_ms_field_);
-      output_timestamps_ms = GetLongField(jni, j_decoder_output_buffer,
-                                          j_texture_timestamp_ms_field_);
-      output_ntp_timestamps_ms =
-          GetLongField(jni, j_decoder_output_buffer,
-                       j_texture_ntp_timestamp_ms_field_);
-      decode_time_ms = GetLongField(jni, j_decoder_output_buffer,
-          j_texture_decode_time_ms_field_);
-      frame_delayed_ms = GetLongField(jni, j_decoder_output_buffer,
-          j_texture_frame_delay_ms_field_);
+      const int64_t timestamp_us = GetLongField(
+          jni, j_decoder_output_buffer, j_texture_timestamp_ms_field_);
+      presentation_timestamps_ms = GetLongField(
+          jni, j_decoder_output_buffer,
+          j_texture_presentation_timestamp_ms_field_);
+      output_timestamps_ms = GetLongField(
+          jni, j_decoder_output_buffer, j_texture_timestamp_ms_field_);
+      output_ntp_timestamps_ms = GetLongField(
+          jni, j_decoder_output_buffer, j_texture_ntp_timestamp_ms_field_);
+      decode_time_ms = GetLongField(
+          jni, j_decoder_output_buffer, j_texture_decode_time_ms_field_);
+      frame_delayed_ms = GetLongField(
+          jni, j_decoder_output_buffer, j_texture_frame_delay_ms_field_);
 
       // Create webrtc::VideoFrameBuffer with native texture handle.
       frame_buffer = surface_texture_helper_->CreateTextureFrame(
           width, height, NativeHandleImpl(jni, texture_id, j_transform_matrix));
     }
   } else {
     // Extract data from Java ByteBuffer and create output yuv420 frame -
     // for non surface decoding only.
-    const int output_buffer_index =
-        GetIntField(jni, j_decoder_output_buffer, j_info_index_field_);
-    const int output_buffer_offset =
-        GetIntField(jni, j_decoder_output_buffer, j_info_offset_field_);
-    const int output_buffer_size =
-        GetIntField(jni, j_decoder_output_buffer, j_info_size_field_);
-    output_timestamps_ms = GetLongField(jni, j_decoder_output_buffer,
-                                        j_info_timestamp_ms_field_);
-    output_ntp_timestamps_ms =
-        GetLongField(jni, j_decoder_output_buffer,
-                     j_info_ntp_timestamp_ms_field_);
+    const int output_buffer_index = GetIntField(
+        jni, j_decoder_output_buffer, j_info_index_field_);
+    const int output_buffer_offset = GetIntField(
+        jni, j_decoder_output_buffer, j_info_offset_field_);
+    const int output_buffer_size = GetIntField(
+        jni, j_decoder_output_buffer, j_info_size_field_);
+    presentation_timestamps_ms = GetLongField(
+        jni, j_decoder_output_buffer, j_presentation_timestamp_ms_field_);
+    output_timestamps_ms = GetLongField(
+        jni, j_decoder_output_buffer, j_timestamp_ms_field_);
+    output_ntp_timestamps_ms = GetLongField(
+        jni, j_decoder_output_buffer, j_ntp_timestamp_ms_field_);
 
     decode_time_ms = GetLongField(jni, j_decoder_output_buffer,
                                   j_byte_buffer_decode_time_ms_field_);
 
     if (output_buffer_size < width * height * 3 / 2) {
       ALOGE << "Insufficient output buffer size: " << output_buffer_size;
       return false;
     }
     jobjectArray output_buffers = reinterpret_cast<jobjectArray>(GetObjectField(
         jni, *j_media_codec_video_decoder_, j_output_buffers_field_));
@@ skipping 51 matching lines @@
       return false;
     }
   }
   VideoFrame decoded_frame(frame_buffer, 0, 0, webrtc::kVideoRotation_0);
   decoded_frame.set_timestamp(output_timestamps_ms);
   decoded_frame.set_ntp_time_ms(output_ntp_timestamps_ms);
 
   if (frames_decoded_ < kMaxDecodedLogFrames) {
     ALOGD << "Decoder frame out # " << frames_decoded_ << ". " << width <<
         " x " << height << ". " << stride << " x " <<  slice_height <<
-        ". Color: " << color_format << ". TS:" << decoded_frame.timestamp() <<
+        ". Color: " << color_format << ". TS: " << presentation_timestamps_ms <<
         ". DecTime: " << (int)decode_time_ms <<
         ". DelayTime: " << (int)frame_delayed_ms;
   }
 
   // Calculate and print decoding statistics - every 3 seconds.
   frames_decoded_++;
   current_frames_++;
   current_decoding_time_ms_ += decode_time_ms;
   int statistic_time_ms = GetCurrentTimeMs() - start_time_ms_;
   if (statistic_time_ms >= kMediaCodecStatisticsIntervalMs &&
@@ skipping 131 matching lines @@
   ALOGD << "Destroy video decoder.";
   delete decoder;
 }
 
 const char* MediaCodecVideoDecoder::ImplementationName() const {
   return "MediaCodec";
 }
 
 }  // namespace webrtc_jni