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

Commit 52052562 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2SoftVp8: List profile0 as supported profile" am: c457289b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1810582

Change-Id: If5ddfcb434bd075207a8ccdc224ef4d122eaad76
parents c12881ec c457289b

media/codec2/components/vpx/C2SoftVpxDec.cpp

+10 −2
Original line number Diff line number Diff line
@@ -149,8 +149,16 @@ public: 
#else

        addParameter(

                DefineParam(mProfileLevel, C2_PARAMKEY_PROFILE_LEVEL)

                .withConstValue(new C2StreamProfileLevelInfo::input(0u,

                        C2Config::PROFILE_UNUSED, C2Config::LEVEL_UNUSED))

                .withDefault(new C2StreamProfileLevelInfo::input(0u,

                        C2Config::PROFILE_VP8_0, C2Config::LEVEL_UNUSED))

                .withFields({

                    C2F(mProfileLevel, profile).equalTo(

                        PROFILE_VP8_0

                    ),

                    C2F(mProfileLevel, level).equalTo(

                        LEVEL_UNUSED),

                })

                .withSetter(ProfileLevelSetter, mSize)

                .build());

#endif

media/codec2/components/vpx/C2SoftVpxEnc.h

+28 −14
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams { 
                .withConstValue(new C2StreamIntraRefreshTuning::output(

                             0u, C2Config::INTRA_REFRESH_DISABLED, 0.))

                .build());



#ifdef VP9

        addParameter(

                DefineParam(mProfileLevel, C2_PARAMKEY_PROFILE_LEVEL)

                .withDefault(new C2StreamProfileLevelInfo::output(
@@ -338,7 +338,21 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams { 
                })

                .withSetter(ProfileLevelSetter)

                .build());



#else

        addParameter(

                DefineParam(mProfileLevel, C2_PARAMKEY_PROFILE_LEVEL)

                .withDefault(new C2StreamProfileLevelInfo::output(

                        0u, PROFILE_VP8_0, LEVEL_UNUSED))

                .withFields({

                    C2F(mProfileLevel, profile).equalTo(

                        PROFILE_VP8_0

                    ),

                    C2F(mProfileLevel, level).equalTo(

                        LEVEL_UNUSED),

                })

                .withSetter(ProfileLevelSetter)

                .build());

#endif

        addParameter(

                DefineParam(mRequestSync, C2_PARAMKEY_REQUEST_SYNC_FRAME)

                .withDefault(new C2StreamRequestSyncFrameTuning::output(0u, C2_FALSE))