| Index: cc/resources/video_resource_updater.h
|
| diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h
|
| index 7cc2c813597913a7259f16b34060a0a04b1e18e6..d7a350ed1ece4059313599be4735ab764c2df2e8 100644
|
| --- a/cc/resources/video_resource_updater.h
|
| +++ b/cc/resources/video_resource_updater.h
|
| @@ -20,6 +20,9 @@
|
| #include "cc/resources/release_callback_impl.h"
|
| #include "cc/resources/resource_format.h"
|
| #include "cc/resources/texture_mailbox.h"
|
| +#include "media/video/half_float_maker.h"
|
| +#include "media/video/half_float_maker_lib_yuv.h"
|
| +#include "media/video/half_float_maker_xor.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| namespace media {
|
| @@ -80,27 +83,7 @@ class CC_EXPORT VideoResourceUpdater
|
| VideoFrameExternalResources CreateExternalResourcesFromVideoFrame(
|
| scoped_refptr<media::VideoFrame> video_frame);
|
|
|
| - // Base class for converting short integers to half-floats.
|
| - // TODO(hubbe): Move this to media/.
|
| - class HalfFloatMaker {
|
| - public:
|
| - // Convert an array of short integers into an array of half-floats.
|
| - // |src| is an array of integers in range 0 .. 2^{bits_per_channel} - 1
|
| - // |num| is number of entries in input and output array.
|
| - // The numbers stored in |dst| will be half floats in range 0.0..1.0
|
| - virtual void MakeHalfFloats(const uint16_t* src,
|
| - size_t num,
|
| - uint16_t* dst) = 0;
|
| - // The half-floats made needs by this class will be in the range
|
| - // [Offset() .. Offset() + 1.0/Multiplier]. So if you want results
|
| - // in the 0-1 range, you need to do:
|
| - // (half_float - Offset()) * Multiplier()
|
| - // to each returned value.
|
| - virtual float Offset() const = 0;
|
| - virtual float Multiplier() const = 0;
|
| - };
|
| -
|
| - static std::unique_ptr<HalfFloatMaker> NewHalfFloatMaker(
|
| + static std::unique_ptr<media::HalfFloatMaker> NewHalfFloatMaker(
|
| int bits_per_channel);
|
|
|
| private:
|
|
|