Commit dc658038 authored by hubbe's avatar hubbe Committed by Commit bot

Call libyuv for short->half-float conversion

Libyuv has a more optimized version of the half-float conversion code now, and it
will probably become more optimized in the future.

BUG=445071
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel

Review-Url: https://codereview.chromium.org/2389003002
Cr-Commit-Position: refs/heads/master@{#422659}
parent df2d7ede
...@@ -583,6 +583,7 @@ component("cc") { ...@@ -583,6 +583,7 @@ component("cc") {
"//gpu", "//gpu",
"//gpu/command_buffer/client:gles2_interface", "//gpu/command_buffer/client:gles2_interface",
"//media", "//media",
"//third_party/libyuv",
"//ui/events:events_base", "//ui/events:events_base",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
......
...@@ -15,6 +15,7 @@ include_rules = [ ...@@ -15,6 +15,7 @@ include_rules = [
"+skia/ext", "+skia/ext",
"+third_party/khronos/GLES2/gl2.h", "+third_party/khronos/GLES2/gl2.h",
"+third_party/khronos/GLES2/gl2ext.h", "+third_party/khronos/GLES2/gl2ext.h",
"+third_party/libyuv",
"+third_party/skia/include", "+third_party/skia/include",
"+ui/events/latency_info.h", "+ui/events/latency_info.h",
"+ui/gfx", "+ui/gfx",
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "media/renderers/skcanvas_video_renderer.h" #include "media/renderers/skcanvas_video_renderer.h"
#include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/khronos/GLES2/gl2ext.h"
#include "third_party/libyuv/include/libyuv.h"
#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkCanvas.h"
#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/geometry/size_conversions.h"
...@@ -298,19 +299,13 @@ void VideoResourceUpdater::MakeHalfFloats(const uint16_t* src, ...@@ -298,19 +299,13 @@ void VideoResourceUpdater::MakeHalfFloats(const uint16_t* src,
int bits_per_channel, int bits_per_channel,
size_t num, size_t num,
uint16_t* dst) { uint16_t* dst) {
// TODO(hubbe): Make AVX and neon versions of this code. // Source and dest stride can be zero since we're only copying
// one row at a time.
// This magic constant is 2^-112. Multiplying by this int stride = 0;
// is the same as subtracting 112 from the exponent, which // Maximum value used in |src|.
// is the difference in exponent bias between 32-bit and int max_value = (1 << bits_per_channel) - 1;
// 16-bit floats. Once we've done this subtraction, we can int rows = 1;
// simply extract the low bits of the exponent and the high libyuv::HalfFloatPlane(src, stride, dst, stride, 1.0f / max_value, num, rows);
// bits of the mantissa from our float and we're done.
float mult = 1.9259299444e-34f / ((1 << bits_per_channel) - 1);
for (size_t i = 0; i < num; i++) {
float value = src[i] * mult;
dst[i] = (*(uint32_t*)&value) >> 13;
}
} }
VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes( VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes(
...@@ -495,6 +490,7 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes( ...@@ -495,6 +490,7 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes(
resource_provider_->YuvResourceFormat(bits_per_channel)); resource_provider_->YuvResourceFormat(bits_per_channel));
if (!plane_resource.Matches(video_frame->unique_id(), i)) { if (!plane_resource.Matches(video_frame->unique_id(), i)) {
// TODO(hubbe): Move all conversion (and upload?) code to media/.
// We need to transfer data from |video_frame| to the plane resource. // We need to transfer data from |video_frame| to the plane resource.
// TODO(reveman): Can use GpuMemoryBuffers here to improve performance. // TODO(reveman): Can use GpuMemoryBuffers here to improve performance.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment