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

Commit 0c5a750c authored by Lajos Molnar's avatar Lajos Molnar
Browse files

media: allow 0 video encoder profiles and levels. 

Some of the new encoder profile and level values are 0, so allow them
to be set. StagefrightRecorder already supports 0 values, and MediaRecorderTest
also already tests negative value for failure.

Bug: 192317919
Test: atest android.hardware.camera2.cts.RecordingTest\#testBasicEncoderProfilesRecording
Change-Id: I9d286ee84c004b21830d743ad46804be456f2bc6
parent 598c5fd5

media/java/android/media/MediaRecorder.java

+3 −3
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ public class MediaRecorder implements AudioRouting, 
        setVideoSize(profile.getWidth(), profile.getHeight());

        setVideoEncodingBitRate(profile.getBitrate());

        setVideoEncoder(profile.getCodec());

        if (profile.getProfile() > 0) {

        if (profile.getProfile() >= 0) {

            setVideoEncodingProfileLevel(profile.getProfile(), 0 /* level */);

        }

    }
@@ -1121,10 +1121,10 @@ public class MediaRecorder implements AudioRouting, 
     * @throws IllegalArgumentException when an invalid profile or level value is used.

     */

    public void setVideoEncodingProfileLevel(int profile, int level) {

        if (profile <= 0)  {

        if (profile < 0)  {

            throw new IllegalArgumentException("Video encoding profile is not positive");

        }

        if (level <= 0)  {

        if (level < 0)  {

            throw new IllegalArgumentException("Video encoding level is not positive");

        }

        setParameter("video-param-encoder-profile=" + profile);