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

Commit b77d03b6 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: connect color aspects and surface dataspace 

1. Keep configuration format as video decoder and encoder will need
it to reset their default color aspects on mode/size change.

2. Separate color aspect handling for decoder and encoder as they
are quite different. Update decoder and encoder color aspect setting
to latest policy.

3. propagate dataspace to GraphicBufferSource, MediaCodecSource,
CameraSource and SoftwareRenderer

Bug: 25684127
Change-Id: Ie9a7528af36ed44605a7ce3e69b5794ef16b1c66
parent f56a02a5

include/media/stagefright/ACodec.h

+59 −6
Original line number Diff line number Diff line
@@ -242,8 +242,10 @@ private: 
    IOMX::node_id mNode;

    sp<MemoryDealer> mDealer[2];



    bool mUsingNativeWindow;

    sp<ANativeWindow> mNativeWindow;

    int mNativeWindowUsageBits;

    sp<AMessage> mConfigFormat;

    sp<AMessage> mInputFormat;

    sp<AMessage> mOutputFormat;

    sp<AMessage> mBaseOutputFormat;
@@ -343,21 +345,72 @@ private: 
    status_t setSupportedOutputFormat(bool getLegacyFlexibleFormat);



    status_t setupVideoDecoder(

            const char *mime, const sp<AMessage> &msg, bool usingNativeBuffers,

            const char *mime, const sp<AMessage> &msg, bool usingNativeBuffers, bool haveSwRenderer,

            sp<AMessage> &outputformat);



    status_t setupVideoEncoder(

            const char *mime, const sp<AMessage> &msg, sp<AMessage> &outputformat);

            const char *mime, const sp<AMessage> &msg,

            sp<AMessage> &outputformat, sp<AMessage> &inputformat);



    status_t setVideoFormatOnPort(

            OMX_U32 portIndex,

            int32_t width, int32_t height,

            OMX_VIDEO_CODINGTYPE compressionFormat, float frameRate = -1.0);



    status_t setColorAspects(

        OMX_U32 portIndex, int32_t width, int32_t height, const sp<AMessage> &msg,

        sp<AMessage> &format);

    status_t getColorAspects(OMX_U32 portIndex, sp<AMessage> &format);

    // gets index or sets it to 0 on error. Returns error from codec.

    status_t initDescribeColorAspectsIndex();



    // sets |params|. If |readBack| is true, it re-gets them afterwards if set succeeded.

    // returns the codec error.

    status_t setCodecColorAspects(DescribeColorAspectsParams &params, bool readBack = false);



    // gets |params|; returns the codec error. |param| should not change on error.

    status_t getCodecColorAspects(DescribeColorAspectsParams &params);



    // gets dataspace guidance from codec and platform. |params| should be set up with the color

    // aspects to use. If |tryCodec| is true, the codec is queried first. If it succeeds, we

    // return OK. Otherwise, we fall back to the platform guidance and return the codec error;

    // though, we return OK if the codec failed with UNSUPPORTED, as codec guidance is optional.

    status_t getDataSpace(

            DescribeColorAspectsParams &params, android_dataspace *dataSpace /* nonnull */,

            bool tryCodec);



    // sets color aspects for the encoder for certain |width/height| based on |configFormat|, and

    // set resulting color config into |outputFormat|. If |usingNativeWindow| is true, we use

    // video defaults if config is unspecified. Returns error from the codec.

    status_t setColorAspectsForVideoDecoder(

            int32_t width, int32_t height, bool usingNativeWindow,

            const sp<AMessage> &configFormat, sp<AMessage> &outputFormat);



    // gets color aspects for the encoder for certain |width/height| based on |configFormat|, and

    // set resulting color config into |outputFormat|. If |dataSpace| is non-null, it requests

    // dataspace guidance from the codec and platform and sets it into |dataSpace|. Returns the

    // error from the codec.

    status_t getColorAspectsAndDataSpaceForVideoDecoder(

            int32_t width, int32_t height, const sp<AMessage> &configFormat,

            sp<AMessage> &outputFormat, android_dataspace *dataSpace);



    // sets color aspects for the video encoder assuming bytebuffer mode for certain |configFormat|

    // and sets resulting color config into |outputFormat|. For mediarecorder, also set dataspace

    // into |inputFormat|. Returns the error from the codec.

    status_t setColorAspectsForVideoEncoder(

            const sp<AMessage> &configFormat,

            sp<AMessage> &outputFormat, sp<AMessage> &inputFormat);



    // sets color aspects for the video encoder in surface mode. This basically sets the default

    // video values for unspecified aspects and sets the dataspace to use in the input format.

    // Also sets the dataspace into |dataSpace|.

    // Returns any codec errors during this configuration, except for optional steps.

    status_t setInitialColorAspectsForVideoEncoderSurfaceAndGetDataSpace(

            android_dataspace *dataSpace /* nonnull */);



    // gets color aspects for the video encoder input port and sets them into the |format|.

    // Returns any codec errors.

    status_t getInputColorAspectsForVideoEncoder(sp<AMessage> &format);



    // updates the encoder output format with |aspects| defaulting to |dataSpace| for

    // unspecified values.

    void onDataSpaceChanged(android_dataspace dataSpace, const ColorAspects &aspects);



    typedef struct drcParams {

        int32_t drcCut;

include/media/stagefright/MediaCodecSource.h

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ private: 
    bool mStopping;

    bool mDoMoreWorkPending;

    bool mSetEncoderFormat;

    int mEncoderFormat;

    int mEncoderDataSpace;

    int32_t mEncoderFormat;

    int32_t mEncoderDataSpace;

    sp<AMessage> mEncoderActivityNotify;

    sp<IGraphicBufferProducer> mGraphicBufferProducer;

    sp<IGraphicBufferConsumer> mGraphicBufferConsumer;

include/media/stagefright/foundation/ColorUtils.h

+29 −3
Original line number Diff line number Diff line
@@ -129,11 +129,37 @@ struct ColorUtils { 
    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);

    // updates Unspecified color aspects to their defaults based on the video size

    static void setDefaultCodecColorAspectsIfNeeded(

            ColorAspects &aspects, int32_t width, int32_t height);



    // it returns the closest dataSpace for given color |aspects|. if |mayExpand| is true, it allows

    // returning a larger dataSpace that contains the color space given by |aspects|, and is better

    // suited to blending. This requires implicit color space conversion on part of the device.

    static android_dataspace getDataSpaceForColorAspects(ColorAspects &aspects, bool mayExpand);



    // converts |dataSpace| to a V0 enum, and returns true if dataSpace is an aspect-only value

    static bool convertDataSpaceToV0(android_dataspace &dataSpace);



    // compares |aspect| to |orig|. Returns |true| if any aspects have changed, except if they

    // changed to Unspecified value. It also sets the changed values to Unspecified in |aspect|.

    static bool checkIfAspectsChangedAndUnspecifyThem(

            ColorAspects &aspects, const ColorAspects &orig, bool usePlatformAspects = false);



    // finds color config in format, defaulting them to 0.

    static void getColorConfigFromFormat(

            const sp<AMessage> &format, int *range, int *standard, int *transfer);



    // copies existing color config from |source| to |target|.

    static void copyColorConfig(const sp<AMessage> &source, sp<AMessage> &target);



    // finds color config in format as ColorAspects, defaulting them to 0.

    static void getColorAspectsFromFormat(const sp<AMessage> &format, ColorAspects &aspects);



    // writes |aspects| into format. iff |force| is false, Unspecified values are not

    // written.

    static void setColorAspectsIntoFormat(

            const ColorAspects &aspects, sp<AMessage> &format, bool force = false);

};



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

media/libmediaplayerservice/StagefrightRecorder.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,9 @@ status_t StagefrightRecorder::setupVideoEncoder( 


    if (cameraSource == NULL) {

        flags |= MediaCodecSource::FLAG_USE_SURFACE_INPUT;

    } else {

        // require dataspace setup even if not using surface input

        format->setInt32("android._using-recorder", 1);

    }



    sp<MediaCodecSource> encoder = MediaCodecSource::Create(

media/libstagefright/ACodec.cpp

+379 −127

File changed.

Preview size limit exceeded, changes collapsed.