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

Commit ce1552fd authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by android-build-merger
Browse files

Merge "C2SoftHevcEnc: Reduce min supported resolution to 2x2" into qt-dev 

am: 248e025c

Change-Id: Id38b6c3f31ed1cdc4e2896bf87e11ada3d9c2b81
parents a4d3cbef 248e025c

media/codec2/components/hevc/C2SoftHevcEnc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ class C2SoftHevcEnc::IntfImpl : public SimpleInterface<void>::BaseParams { 
            DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE)

                .withDefault(new C2StreamPictureSizeInfo::input(0u, 320, 240))

                .withFields({

                    C2F(mSize, width).inRange(320, 1920, 2),

                    C2F(mSize, height).inRange(128, 1088, 2),

                    C2F(mSize, width).inRange(2, 1920, 2),

                    C2F(mSize, height).inRange(2, 1088, 2),

                })

                .withSetter(SizeSetter)

                .build());

media/libstagefright/data/media_codecs_google_c2_video.xml

+2 −1
Original line number Diff line number Diff line
@@ -109,11 +109,12 @@ 
        </MediaCodec>

        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc">

            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->

            <Limit name="size" min="320x128" max="512x512" />

            <Limit name="size" min="2x2" max="512x512" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="8x8" />

            <Limit name="block-count" range="1-4096" /> <!-- max 512x512 -->

            <Limit name="blocks-per-second" range="1-122880" />

            <Limit name="frame-rate" range="1-120" />

            <Limit name="bitrate" range="1-10000000" />

            <Limit name="complexity" range="0-10"  default="0" />

            <Limit name="quality" range="0-100"  default="80" />

media/libstagefright/data/media_codecs_sw.xml

+2 −1
Original line number Diff line number Diff line
@@ -296,11 +296,12 @@ 
        </MediaCodec>

        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" variant="!slow-cpu">

            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->

            <Limit name="size" min="320x128" max="512x512" />

            <Limit name="size" min="2x2" max="512x512" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="8x8" />

            <Limit name="block-count" range="1-4096" /> <!-- max 512x512 -->

            <Limit name="blocks-per-second" range="1-122880" />

            <Limit name="frame-rate" range="1-120" />

            <Limit name="bitrate" range="1-10000000" />

            <Limit name="complexity" range="0-10"  default="0" />

            <Limit name="quality" range="0-100"  default="80" />