Move HalfFloatMaker to media

cc/resources/video_resource_updater.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/video_resource_updater.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 280 matching lines @@
   if (software_compositor)
     return coded_size;
 
   int plane_width = media::VideoFrame::Columns(
       plane_index, input_frame->format(), coded_size.width());
   int plane_height = media::VideoFrame::Rows(plane_index, input_frame->format(),
                                              coded_size.height());
   return gfx::Size(plane_width, plane_height);
 }
 
-namespace {
-// By OR-ing with 0x3800, 10-bit numbers become half-floats in the
-// range [0.5..1) and 9-bit numbers get the range [0.5..0.75).
-//
-// Half-floats are evaluated as:
-// float value = pow(2.0, exponent - 25) * (0x400 + fraction);
-//
-// In our case the exponent is 14 (since we or with 0x3800) and
-// pow(2.0, 14-25) * 0x400 evaluates to 0.5 (our offset) and
-// pow(2.0, 14-25) * fraction is [0..0.49951171875] for 10-bit and
-// [0..0.24951171875] for 9-bit.
-//
-// https://en.wikipedia.org/wiki/Half-precision_floating-point_format
-class HalfFloatMaker_xor : public VideoResourceUpdater::HalfFloatMaker {
- public:
-  explicit HalfFloatMaker_xor(int bits_per_channel)
-      : bits_per_channel_(bits_per_channel) {}
-  float Offset() const override { return 0.5; }
-  float Multiplier() const override {
-    int max_input_value = (1 << bits_per_channel_) - 1;
-    // 2 << 11 = 2048 would be 1.0 with our exponent.
-    return 2048.0 / max_input_value;
-  }
-  void MakeHalfFloats(const uint16_t* src, size_t num, uint16_t* dst) override {
-    // Micro-benchmarking indicates that the compiler does
-    // a good enough job of optimizing this loop that trying
-    // to manually operate on one uint64 at a time is not
-    // actually helpful.
-    // Note to future optimizers: Benchmark your optimizations!
-    for (size_t i = 0; i < num; i++)
-      dst[i] = src[i] | 0x3800;
-  }
-
- private:
-  int bits_per_channel_;
-};
-
-class HalfFloatMaker_libyuv : public VideoResourceUpdater::HalfFloatMaker {
- public:
-  explicit HalfFloatMaker_libyuv(int bits_per_channel) {
-    int max_value = (1 << bits_per_channel) - 1;
-    // For less than 15 bits, we can give libyuv a multiplier of
-    // 1.0, which is faster on some platforms. If bits is 16 or larger,
-    // a multiplier of 1.0 would cause overflows. However, a multiplier
-    // of 1/max_value would cause subnormal floats, which perform
-    // very poorly on some platforms.
-    if (bits_per_channel <= 15) {
-      libyuv_multiplier_ = 1.0f;
-    } else {
-      // This multiplier makes sure that we avoid subnormal values.
-      libyuv_multiplier_ = 1.0f / 4096.0f;
-    }
-    resource_multiplier_ = 1.0f / libyuv_multiplier_ / max_value;
-  }
-  float Offset() const override { return 0.0f; }
-  float Multiplier() const override { return resource_multiplier_; }
-  void MakeHalfFloats(const uint16_t* src, size_t num, uint16_t* dst) override {
-    // Source and dest stride can be zero since we're only copying
-    // one row at a time.
-    int stride = 0;
-    int rows = 1;
-    libyuv::HalfFloatPlane(src, stride, dst, stride, libyuv_multiplier_, num,
-                           rows);
-  }
-
- private:
-  float libyuv_multiplier_;
-  float resource_multiplier_;
-};
-
-}  // namespace
-
-std::unique_ptr<VideoResourceUpdater::HalfFloatMaker>
-VideoResourceUpdater::NewHalfFloatMaker(int bits_per_channel) {
+std::unique_ptr<media::HalfFloatMaker> VideoResourceUpdater::NewHalfFloatMaker(

[hubbe, 2017/03/22 17:48:22]

Move this function to media

[Uzair, 2017/03/23 07:13:30]

Done.

+    int bits_per_channel) {
   if (bits_per_channel < 11) {
-    return std::unique_ptr<VideoResourceUpdater::HalfFloatMaker>(
-        new HalfFloatMaker_xor(bits_per_channel));
+    return std::unique_ptr<media::HalfFloatMaker>(
+        new media::HalfFloatMaker_xor(bits_per_channel));
   } else {
-    return std::unique_ptr<VideoResourceUpdater::HalfFloatMaker>(
-        new HalfFloatMaker_libyuv(bits_per_channel));
+    return std::unique_ptr<media::HalfFloatMaker>(
+        new media::HalfFloatMaker_libyuv(bits_per_channel));
   }
 }
 
 VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes(
     scoped_refptr<media::VideoFrame> video_frame) {
   TRACE_EVENT0("cc", "VideoResourceUpdater::CreateForSoftwarePlanes");
   const media::VideoPixelFormat input_frame_format = video_frame->format();
 
   int bits_per_channel = video_frame->BitsPerChannel(input_frame_format);
 
@@ skipping 120 matching lines @@
                                  plane_resource.resource_id()));
       mailbox.set_color_space(output_color_space);
       external_resources.mailboxes.push_back(mailbox);
       external_resources.release_callbacks.push_back(base::Bind(
           &RecycleResource, AsWeakPtr(), plane_resource.resource_id()));
       external_resources.type = VideoFrameExternalResources::RGBA_RESOURCE;
     }
     return external_resources;
   }
 
-  std::unique_ptr<HalfFloatMaker> half_float_maker;
+  std::unique_ptr<media::HalfFloatMaker> half_float_maker;
   if (resource_provider_->YuvResourceFormat(bits_per_channel) ==
       LUMINANCE_F16) {
     half_float_maker = NewHalfFloatMaker(bits_per_channel);
     external_resources.offset = half_float_maker->Offset();
     external_resources.multiplier = half_float_maker->Multiplier();
   }
 
   for (size_t i = 0; i < plane_resources.size(); ++i) {
     PlaneResource& plane_resource = *plane_resources[i];
     // Update each plane's resource id with its content.
     DCHECK_EQ(plane_resource.resource_format(),
               resource_provider_->YuvResourceFormat(bits_per_channel));
 
     if (!plane_resource.Matches(video_frame->unique_id(), i)) {
       // TODO(hubbe): Move all conversion (and upload?) code to media/.

[hubbe, 2017/03/22 17:48:22]

Update this TODO

[Uzair, 2017/03/23 07:13:30]

Done.

       // We need to transfer data from |video_frame| to the plane resource.
       // TODO(reveman): Can use GpuMemoryBuffers here to improve performance.
 
       // The |resource_size_pixels| is the size of the resource we want to
       // upload to.
       gfx::Size resource_size_pixels = plane_resource.resource_size();
       // The |video_stride_bytes| is the width of the video frame we are
       // uploading (including non-frame data to fill in the stride).
       int video_stride_bytes = video_frame->stride(i);
 
@@ skipping 229 matching lines @@
   if (lost_resource) {
     resource_it->clear_refs();
     updater->DeleteResource(resource_it);
     return;
   }
 
   resource_it->remove_ref();
 }
 
 }  // namespace cc