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

Commit 58b9bd5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "add color converter for NV12 to RGB"

parents decf9a51 a1ac9f8b

media/libstagefright/colorconversion/ColorConverter.cpp

+44 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include "libyuv/convert_from.h"

#include "libyuv/convert_argb.h"

#include "libyuv/planar_functions.h"

#include "libyuv/video_common.h"

#include <functional>

#include <sys/time.h>
@@ -91,10 +92,17 @@ bool ColorConverter::isValid() const { 


        case OMX_COLOR_FormatCbYCrY:

        case OMX_QCOM_COLOR_FormatYVU420SemiPlanar:

        case OMX_COLOR_FormatYUV420SemiPlanar:

        case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:

            return mDstFormat == OMX_COLOR_Format16bitRGB565;



        case OMX_COLOR_FormatYUV420SemiPlanar:

#ifdef USE_LIBYUV

            return mDstFormat == OMX_COLOR_Format16bitRGB565

                    || mDstFormat == OMX_COLOR_Format32BitRGBA8888;

#else

            return mDstFormat == OMX_COLOR_Format16bitRGB565;

#endif



        default:

            return false;

    }
@@ -236,7 +244,11 @@ status_t ColorConverter::convert( 
            break;



        case OMX_COLOR_FormatYUV420SemiPlanar:

#ifdef USE_LIBYUV

            err = convertYUV420SemiPlanarUseLibYUV(src, dst);

#else

            err = convertYUV420SemiPlanar(src, dst);

#endif

            break;



        case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
@@ -365,6 +377,36 @@ status_t ColorConverter::convertYUV420PlanarUseLibYUV( 
    return OK;

}



status_t ColorConverter::convertYUV420SemiPlanarUseLibYUV(

        const BitmapParams &src, const BitmapParams &dst) {

    uint8_t *dst_ptr = (uint8_t *)dst.mBits

        + dst.mCropTop * dst.mStride + dst.mCropLeft * dst.mBpp;



    const uint8_t *src_y =

        (const uint8_t *)src.mBits + src.mCropTop * src.mStride + src.mCropLeft;



    const uint8_t *src_u =

        (const uint8_t *)src.mBits + src.mStride * src.mHeight

        + (src.mCropTop / 2) * src.mStride + src.mCropLeft;



    switch (mDstFormat) {

    case OMX_COLOR_Format16bitRGB565:

        libyuv::NV12ToRGB565(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,

                dst.mStride, src.cropWidth(), src.cropHeight());

        break;



    case OMX_COLOR_Format32BitRGBA8888:

        libyuv::NV12ToARGB(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,

                dst.mStride, src.cropWidth(), src.cropHeight());

        break;



    default:

        return ERROR_UNSUPPORTED;

   }



   return OK;

}



std::function<void (void *, void *, void *, size_t,

                    signed *, signed *, signed *, signed *)>

getReadFromSrc(OMX_COLOR_FORMATTYPE srcFormat) {
@@ -852,7 +894,7 @@ status_t ColorConverter::convertYUV420SemiPlanar( 


    const uint8_t *src_u =

        (const uint8_t *)src.mBits + src.mHeight * src.mStride +

        src.mCropTop * src.mStride / 2 + src.mCropLeft;

        (src.mCropTop / 2) * src.mStride + src.mCropLeft;



    for (size_t y = 0; y < src.cropHeight(); ++y) {

        for (size_t x = 0; x < src.cropWidth(); x += 2) {

media/libstagefright/include/media/stagefright/ColorConverter.h

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ private: 
    status_t convertYUV420PlanarUseLibYUV(

            const BitmapParams &src, const BitmapParams &dst);



    status_t convertYUV420SemiPlanarUseLibYUV(

            const BitmapParams &src, const BitmapParams &dst);



    status_t convertYUV420Planar16(

            const BitmapParams &src, const BitmapParams &dst);