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

Commit ded2fd3a authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by Wonsik Kim
Browse files

C2SoftHevcEnc: Reduce min supported resolution to 2x2 

libhevc encoder library earlier had a restriction on min resolution
supported as 320x128. It now supports upto 2x2.
This commit updates min supported resolution in c2 plugin and as well
in xml files.

Also add supported frame-rate range in xml for c2 soft hevc encoder

Bug: 130537033
Test: atest android.media.cts.MediaCodecCapabilitiesTest#\
testAllAdvertisedVideoEncoderBitrateModes
Test: atest android.media.cts.MediaCodecCapabilitiesTest#\
testAllNonTunneledVideoCodecsSupportFlexibleYUV

Change-Id: I0cfcf3cb3098a2a63c9386a047c702ab3c5c5a32
parent 4f1b6908

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" />