Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a09d8d6 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: move ColorUtils to foundation 

These are needed by OMX, which cannot depend on stagefright.

Bug: 25684127
Change-Id: I1784be72368e667404229d338b9c18df917ac2ed
parent 14fd3a1e

include/media/stagefright/CodecBase.h

+4 −108
Original line number Diff line number Diff line
@@ -20,9 +20,12 @@ 


#include <stdint.h>



#define STRINGIFY_ENUMS



#include <media/IOMX.h>

#include <media/MediaCodecInfo.h>

#include <media/stagefright/foundation/AHandler.h>

#include <media/stagefright/foundation/ColorUtils.h>

#include <media/hardware/HardwareAPI.h>



#include <utils/NativeHandle.h>
@@ -34,7 +37,7 @@ namespace android { 
struct ABuffer;

struct PersistentSurface;



struct CodecBase : public AHandler {

struct CodecBase : public AHandler, /* static */ ColorUtils {

    enum {

        kWhatFillThisBuffer      = 'fill',

        kWhatDrainThisBuffer     = 'drai',
@@ -97,113 +100,6 @@ struct CodecBase : public AHandler { 
     * Codec-related defines

     */



    /**********************************************************************************************/



    /*

     * Media-platform color constants. MediaCodec uses (an extended version of) platform-defined

     * constants that are derived from HAL_DATASPACE, since these are directly exposed to the user.

     * We extend the values to maintain the richer set of information defined inside media

     * containers and bitstreams that are not supported by the platform. We also expect vendors

     * to extend some of these values with vendor-specific values. These are separated into a

     * vendor-extension section so they won't collide with future platform values.

     */



    enum ColorStandard : uint32_t {

        kColorStandardUnspecified =

                HAL_DATASPACE_STANDARD_UNSPECIFIED >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT709 =     HAL_DATASPACE_STANDARD_BT709 >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT601_625 = HAL_DATASPACE_STANDARD_BT601_625 >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT601_625_Unadjusted =

                HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT601_525 = HAL_DATASPACE_STANDARD_BT601_525 >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT601_525_Unadjusted =

                HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT2020 =    HAL_DATASPACE_STANDARD_BT2020 >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT2020Constant =

                HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardBT470M =    HAL_DATASPACE_STANDARD_BT470M >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardFilm =      HAL_DATASPACE_STANDARD_FILM >> HAL_DATASPACE_STANDARD_SHIFT,

        kColorStandardMax =       HAL_DATASPACE_STANDARD_MASK >> HAL_DATASPACE_STANDARD_SHIFT,



        /* This marks a section of color-standard values that are not supported by graphics HAL,

           but track defined color primaries-matrix coefficient combinations in media.

           These are stable for a given release. */

        kColorStandardExtendedStart = kColorStandardMax + 1,



        /* This marks a section of color-standard values that are not supported by graphics HAL

           nor using media defined color primaries or matrix coefficients. These may differ per

           device. */

        kColorStandardVendorStart = 0x10000,

    };



    enum ColorTransfer : uint32_t  {

        kColorTransferUnspecified =

                HAL_DATASPACE_TRANSFER_UNSPECIFIED >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferLinear =      HAL_DATASPACE_TRANSFER_LINEAR >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferSRGB =        HAL_DATASPACE_TRANSFER_SRGB >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferSMPTE_170M =

                HAL_DATASPACE_TRANSFER_SMPTE_170M >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferGamma22 =     HAL_DATASPACE_TRANSFER_GAMMA2_2 >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferGamma28 =     HAL_DATASPACE_TRANSFER_GAMMA2_8 >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferST2084 =      HAL_DATASPACE_TRANSFER_ST2084 >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferHLG =         HAL_DATASPACE_TRANSFER_HLG >> HAL_DATASPACE_TRANSFER_SHIFT,

        kColorTransferMax =         HAL_DATASPACE_TRANSFER_MASK >> HAL_DATASPACE_TRANSFER_SHIFT,



        /* This marks a section of color-transfer values that are not supported by graphics HAL,

           but track media-defined color-transfer. These are stable for a given release. */

        kColorTransferExtendedStart = kColorTransferMax + 1,



        /* This marks a section of color-transfer values that are not supported by graphics HAL

           nor defined by media. These may differ per device. */

        kColorTransferVendorStart = 0x10000,

    };



    enum ColorRange : uint32_t  {

        kColorRangeUnspecified = HAL_DATASPACE_RANGE_UNSPECIFIED >> HAL_DATASPACE_RANGE_SHIFT,

        kColorRangeFull =        HAL_DATASPACE_RANGE_FULL >> HAL_DATASPACE_RANGE_SHIFT,

        kColorRangeLimited =     HAL_DATASPACE_RANGE_LIMITED >> HAL_DATASPACE_RANGE_SHIFT,

        kColorRangeMax =         HAL_DATASPACE_RANGE_MASK >> HAL_DATASPACE_RANGE_SHIFT,



        /* This marks a section of color-transfer values that are not supported by graphics HAL,

           but track media-defined color-transfer. These are stable for a given release. */

        kColorRangeExtendedStart = kColorRangeMax + 1,



        /* This marks a section of color-transfer values that are not supported by graphics HAL

           nor defined by media. These may differ per device. */

        kColorRangeVendorStart = 0x10000,

    };



    /*

     * Static utilities for codec support

     */



    // using int32_t for media range/standard/transfers to denote extended ranges

    static int32_t wrapColorAspectsIntoColorStandard(

            ColorAspects::Primaries primaries, ColorAspects::MatrixCoeffs coeffs);

    static int32_t wrapColorAspectsIntoColorRange(ColorAspects::Range range);

    static int32_t wrapColorAspectsIntoColorTransfer(ColorAspects::Transfer transfer);



    static status_t unwrapColorAspectsFromColorRange(

            int32_t range, ColorAspects::Range *aspect);

    static status_t unwrapColorAspectsFromColorTransfer(

            int32_t transfer, ColorAspects::Transfer *aspect);

    static status_t unwrapColorAspectsFromColorStandard(

            int32_t standard,

            ColorAspects::Primaries *primaries, ColorAspects::MatrixCoeffs *coeffs);



    static status_t convertPlatformColorAspectsToCodecAspects(

            int32_t range, int32_t standard, int32_t transfer, ColorAspects &aspects);

    static status_t convertCodecColorAspectsToPlatformAspects(

            const ColorAspects &aspects,

            int32_t *range, int32_t *standard, int32_t *transfer);



    // updates unspecified range, standard and transfer values to their defaults

    static void setDefaultPlatformColorAspectsIfNeeded(

            int32_t &range, int32_t &standard, int32_t &transfer,

            int32_t width, int32_t height);

    static void setDefaultCodecColorAspectsIfNeeded(

            ColorAspects &aspects, int32_t width, int32_t height);



protected:

    CodecBase();

    virtual ~CodecBase();

include/media/stagefright/foundation/ColorUtils.h

0 → 100644
+184 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef COLOR_UTILS_H_



#define COLOR_UTILS_H_



#include <stdint.h>



#define STRINGIFY_ENUMS



#include <media/stagefright/foundation/AMessage.h>



#include <media/hardware/VideoAPI.h>

#include <system/graphics.h>



namespace android {



struct ColorUtils {

    /*

     * Media-platform color constants. MediaCodec uses (an extended version of) platform-defined

     * constants that are derived from HAL_DATASPACE, since these are directly exposed to the user.

     * We extend the values to maintain the richer set of information defined inside media

     * containers and bitstreams that are not supported by the platform. We also expect vendors

     * to extend some of these values with vendor-specific values. These are separated into a

     * vendor-extension section so they won't collide with future platform values.

     */



#define GET_HAL_ENUM(class, name) HAL_DATASPACE_##class##name

#define GET_HAL_BITFIELD(class, name) (GET_HAL_ENUM(class, _##name) >> GET_HAL_ENUM(class, _SHIFT))



    enum ColorStandard : uint32_t {

        kColorStandardUnspecified =          GET_HAL_BITFIELD(STANDARD, UNSPECIFIED),

        kColorStandardBT709 =                GET_HAL_BITFIELD(STANDARD, BT709),

        kColorStandardBT601_625 =            GET_HAL_BITFIELD(STANDARD, BT601_625),

        kColorStandardBT601_625_Unadjusted = GET_HAL_BITFIELD(STANDARD, BT601_625_UNADJUSTED),

        kColorStandardBT601_525 =            GET_HAL_BITFIELD(STANDARD, BT601_525),

        kColorStandardBT601_525_Unadjusted = GET_HAL_BITFIELD(STANDARD, BT601_525_UNADJUSTED),

        kColorStandardBT2020 =               GET_HAL_BITFIELD(STANDARD, BT2020),

        kColorStandardBT2020Constant =       GET_HAL_BITFIELD(STANDARD, BT2020_CONSTANT_LUMINANCE),

        kColorStandardBT470M =               GET_HAL_BITFIELD(STANDARD, BT470M),

        kColorStandardFilm =                 GET_HAL_BITFIELD(STANDARD, FILM),

        kColorStandardMax =                  GET_HAL_BITFIELD(STANDARD, MASK),



        /* This marks a section of color-standard values that are not supported by graphics HAL,

           but track defined color primaries-matrix coefficient combinations in media.

           These are stable for a given release. */

        kColorStandardExtendedStart = kColorStandardMax + 1,



        /* This marks a section of color-standard values that are not supported by graphics HAL

           nor using media defined color primaries or matrix coefficients. These may differ per

           device. */

        kColorStandardVendorStart = 0x10000,

    };



    enum ColorTransfer : uint32_t  {

        kColorTransferUnspecified = GET_HAL_BITFIELD(TRANSFER, UNSPECIFIED),

        kColorTransferLinear =      GET_HAL_BITFIELD(TRANSFER, LINEAR),

        kColorTransferSRGB =        GET_HAL_BITFIELD(TRANSFER, SRGB),

        kColorTransferSMPTE_170M =  GET_HAL_BITFIELD(TRANSFER, SMPTE_170M),

        kColorTransferGamma22 =     GET_HAL_BITFIELD(TRANSFER, GAMMA2_2),

        kColorTransferGamma28 =     GET_HAL_BITFIELD(TRANSFER, GAMMA2_8),

        kColorTransferST2084 =      GET_HAL_BITFIELD(TRANSFER, ST2084),

        kColorTransferHLG =         GET_HAL_BITFIELD(TRANSFER, HLG),

        kColorTransferMax =         GET_HAL_BITFIELD(TRANSFER, MASK),



        /* This marks a section of color-transfer values that are not supported by graphics HAL,

           but track media-defined color-transfer. These are stable for a given release. */

        kColorTransferExtendedStart = kColorTransferMax + 1,



        /* This marks a section of color-transfer values that are not supported by graphics HAL

           nor defined by media. These may differ per device. */

        kColorTransferVendorStart = 0x10000,

    };



    enum ColorRange : uint32_t  {

        kColorRangeUnspecified = GET_HAL_BITFIELD(RANGE, UNSPECIFIED),

        kColorRangeFull =        GET_HAL_BITFIELD(RANGE, FULL),

        kColorRangeLimited =     GET_HAL_BITFIELD(RANGE, LIMITED),

        kColorRangeMax =         GET_HAL_BITFIELD(RANGE, MASK),



        /* This marks a section of color-transfer values that are not supported by graphics HAL,

           but track media-defined color-transfer. These are stable for a given release. */

        kColorRangeExtendedStart = kColorRangeMax + 1,



        /* This marks a section of color-transfer values that are not supported by graphics HAL

           nor defined by media. These may differ per device. */

        kColorRangeVendorStart = 0x10000,

    };



#undef GET_HAL_BITFIELD

#undef GET_HAL_ENUM



    /*

     * Static utilities for codec support

     */



    // using int32_t for media range/standard/transfers to denote extended ranges

    // wrap methods change invalid aspects to the Unspecified value

    static int32_t wrapColorAspectsIntoColorStandard(

            ColorAspects::Primaries primaries, ColorAspects::MatrixCoeffs coeffs);

    static int32_t wrapColorAspectsIntoColorRange(ColorAspects::Range range);

    static int32_t wrapColorAspectsIntoColorTransfer(ColorAspects::Transfer transfer);



    // unwrap methods change invalid aspects to the Other value

    static status_t unwrapColorAspectsFromColorRange(

            int32_t range, ColorAspects::Range *aspect);

    static status_t unwrapColorAspectsFromColorTransfer(

            int32_t transfer, ColorAspects::Transfer *aspect);

    static status_t unwrapColorAspectsFromColorStandard(

            int32_t standard,

            ColorAspects::Primaries *primaries, ColorAspects::MatrixCoeffs *coeffs);



    static status_t convertPlatformColorAspectsToCodecAspects(

            int32_t range, int32_t standard, int32_t transfer, ColorAspects &aspects);

    static status_t convertCodecColorAspectsToPlatformAspects(

            const ColorAspects &aspects, int32_t *range, int32_t *standard, int32_t *transfer);



    // updates unspecified range, standard and transfer values to their defaults

    static void setDefaultPlatformColorAspectsIfNeeded(

            int32_t &range, int32_t &standard, int32_t &transfer, int32_t width, int32_t height);

    static void setDefaultCodecColorAspectsIfNeeded(

            ColorAspects &aspects, int32_t width, int32_t height);

};



inline static const char *asString(android::ColorUtils::ColorStandard i, const char *def = "??") {

    using namespace android;

    switch (i) {

        case ColorUtils::kColorStandardUnspecified:          return "Unspecified";

        case ColorUtils::kColorStandardBT709:                return "BT709";

        case ColorUtils::kColorStandardBT601_625:            return "BT601_625";

        case ColorUtils::kColorStandardBT601_625_Unadjusted: return "BT601_625_Unadjusted";

        case ColorUtils::kColorStandardBT601_525:            return "BT601_525";

        case ColorUtils::kColorStandardBT601_525_Unadjusted: return "BT601_525_Unadjusted";

        case ColorUtils::kColorStandardBT2020:               return "BT2020";

        case ColorUtils::kColorStandardBT2020Constant:       return "BT2020Constant";

        case ColorUtils::kColorStandardBT470M:               return "BT470M";

        case ColorUtils::kColorStandardFilm:                 return "Film";

        default:                                            return def;

    }

}



inline static const char *asString(android::ColorUtils::ColorTransfer i, const char *def = "??") {

    using namespace android;

    switch (i) {

        case ColorUtils::kColorTransferUnspecified: return "Unspecified";

        case ColorUtils::kColorTransferLinear:      return "Linear";

        case ColorUtils::kColorTransferSRGB:        return "SRGB";

        case ColorUtils::kColorTransferSMPTE_170M:  return "SMPTE_170M";

        case ColorUtils::kColorTransferGamma22:     return "Gamma22";

        case ColorUtils::kColorTransferGamma28:     return "Gamma28";

        case ColorUtils::kColorTransferST2084:      return "ST2084";

        case ColorUtils::kColorTransferHLG:         return "HLG";

        default:                                   return def;

    }

}



inline static const char *asString(android::ColorUtils::ColorRange i, const char *def = "??") {

    using namespace android;

    switch (i) {

        case ColorUtils::kColorRangeUnspecified: return "Unspecified";

        case ColorUtils::kColorRangeFull:        return "Full";

        case ColorUtils::kColorRangeLimited:     return "Limited";

        default:                                return def;

    }

}



}  // namespace android



#endif  // COLOR_UTILS_H_

media/libstagefright/CodecBase.cpp

+0 −275

File changed.

Preview size limit exceeded, changes collapsed.

media/libstagefright/foundation/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES:= \ 
    AString.cpp                   \

    AStringUtils.cpp              \

    AWakeLock.cpp                 \

    ColorUtils.cpp                \

    MediaBuffer.cpp               \

    MediaBufferGroup.cpp          \

    MetaData.cpp                  \

media/libstagefright/foundation/ColorUtils.cpp

0 → 100644
+312 −0

File added.

Preview size limit exceeded, changes collapsed.