Support texture scaling in Androids MediaEncoder

talk/app/webrtc/java/jni/androidmediaencoder_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 488 matching lines @@
   const bool encode_status = jni->CallBooleanMethod(
       *j_media_codec_video_encoder_, j_init_encode_method_,
       j_video_codec_enum, width, height, kbps, fps,
       (use_surface ? egl_context_ : nullptr));
   if (!encode_status) {
     ALOGE << "Failed to configure encoder.";
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
   CHECK_EXCEPTION(jni);
 
-  if (use_surface) {
-    scale_ = false; // TODO(perkj): Implement scaling when using textures.
-  } else {
+  if (!use_surface) {
     jobjectArray input_buffers = reinterpret_cast<jobjectArray>(
         jni->CallObjectMethod(*j_media_codec_video_encoder_,
             j_get_input_buffers_method_));
     CHECK_EXCEPTION(jni);
     if (IsNull(jni, input_buffers)) {
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
 
     switch (GetIntField(jni, *j_media_codec_video_encoder_,
         j_color_format_field_)) {
@@ skipping 45 matching lines @@
       return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
   if (drop_next_input_frame_) {
     ALOGW << "Encoder drop frame - failed callback.";
     drop_next_input_frame_ = false;
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   RTC_CHECK(frame_types->size() == 1) << "Unexpected stream count";
-  // Check framerate before spatial resolution change.
-  if (scale_)
+
+  VideoFrame input_frame = frame;
+  if (scale_) {
+    // Check framerate before spatial resolution change.
     quality_scaler_.OnEncodeFrame(frame);
-
-  const VideoFrame& input_frame =
-      scale_ ? quality_scaler_.GetScaledFrame(frame) : frame;
+    if (quality_scaler_.GetScaledResolution().width != frame.width() ||

[pbos-webrtc, 2015/11/26 09:41:37]

Get scaled resolution once, this looks clunky. Otherwise I think it's good.

[perkj_webrtc, 2015/11/26 12:58:48]

Done.

+        quality_scaler_.GetScaledResolution().height != frame.height()) {
+      if (frame.native_handle() != nullptr) {
+        rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled_buffer(

[pbos-webrtc, 2015/11/26 09:41:37]

If you wanna put a comment on how the crop-and-scale thing works (no actual
copy), feel free to do so.

[perkj_webrtc, 2015/11/26 12:58:48]

No I don't :-> Read the code...

+            static_cast<AndroidTextureBuffer*>(
+                frame.video_frame_buffer().get())->CropAndScale(
+                    frame.width(),
+                    frame.height(),
+                    quality_scaler_.GetScaledResolution().width,
+                    quality_scaler_.GetScaledResolution().height));
+        input_frame.set_video_frame_buffer(scaled_buffer);
+      } else {
+        input_frame.ShallowCopy(quality_scaler_.GetScaledFrame(frame));
+      }
+    }
+  }
 
   if (!MaybeReconfigureEncoderOnCodecThread(input_frame)) {
     ALOGE << "Failed to reconfigure encoder.";
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
   // Check if we accumulated too many frames in encoder input buffers
   // or the encoder latency exceeds 70 ms and drop frame if so.
   if (frames_in_queue_ > 0 && last_input_timestamp_ms_ >= 0) {
     int encoder_latency_ms = last_input_timestamp_ms_ -
@@ skipping 553 matching lines @@
 }
 
 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
     webrtc::VideoEncoder* encoder) {
   ALOGD << "Destroy video encoder.";
   delete encoder;
 }
 
 }  // namespace webrtc_jni