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

Commit 860d0b0f authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Use decoder values for screen recording size" into sc-qpr1-dev am: 76d42927 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901815

Change-Id: I2c1c8aa45099efc6ff76c0bd7a284853c875966a
parents 386712d6 76d42927

packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java

+46 −60
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.content.Context; 
import android.graphics.Bitmap;

import android.hardware.display.DisplayManager;

import android.hardware.display.VirtualDisplay;

import android.media.MediaCodec;

import android.media.MediaCodecInfo;

import android.media.MediaCodecList;

import android.media.MediaFormat;

import android.media.MediaMuxer;

import android.media.MediaRecorder;
@@ -187,23 +187,17 @@ public class ScreenMediaRecorder { 
     * @param refreshRate Desired refresh rate

     * @return array with supported width, height, and refresh rate

     */

    private int[] getSupportedSize(final int screenWidth, final int screenHeight, int refreshRate) {

        double maxScale = 0;



        MediaCodecList codecList = new MediaCodecList(MediaCodecList.REGULAR_CODECS);

        MediaCodecInfo.VideoCapabilities maxInfo = null;

        for (MediaCodecInfo codec : codecList.getCodecInfos()) {

    private int[] getSupportedSize(final int screenWidth, final int screenHeight, int refreshRate)

            throws IOException {

        String videoType = MediaFormat.MIMETYPE_VIDEO_AVC;

            String[] types = codec.getSupportedTypes();

            for (String t : types) {

                if (!t.equalsIgnoreCase(videoType)) {

                    continue;

                }

                MediaCodecInfo.CodecCapabilities capabilities =

                        codec.getCapabilitiesForType(videoType);

                if (capabilities != null && capabilities.getVideoCapabilities() != null) {

                    MediaCodecInfo.VideoCapabilities vc = capabilities.getVideoCapabilities();



        // Get max size from the decoder, to ensure recordings will be playable on device

        MediaCodec decoder = MediaCodec.createDecoderByType(videoType);

        MediaCodecInfo.VideoCapabilities vc = decoder.getCodecInfo()

                .getCapabilitiesForType(videoType).getVideoCapabilities();

        decoder.release();



        // Check if we can support screen size as-is

        int width = vc.getSupportedWidths().getUpper();

        int height = vc.getSupportedHeights().getUpper();
@@ -229,35 +223,27 @@ public class ScreenMediaRecorder { 
            return new int[]{screenWidthAligned, screenHeightAligned, refreshRate};

        }



                    // Otherwise, continue searching

        // Otherwise, resize for max supported size

        double scale = Math.min(((double) width / screenWidth),

                ((double) height / screenHeight));

                    if (scale > maxScale) {

                        maxScale = Math.min(1, scale);

                        maxInfo = vc;

                    }

                }

            }

        }



        // Resize for max supported size

        int scaledWidth = (int) (screenWidth * maxScale);

        int scaledHeight = (int) (screenHeight * maxScale);

        if (scaledWidth % maxInfo.getWidthAlignment() != 0) {

            scaledWidth -= (scaledWidth % maxInfo.getWidthAlignment());

        int scaledWidth = (int) (screenWidth * scale);

        int scaledHeight = (int) (screenHeight * scale);

        if (scaledWidth % vc.getWidthAlignment() != 0) {

            scaledWidth -= (scaledWidth % vc.getWidthAlignment());

        }

        if (scaledHeight % maxInfo.getHeightAlignment() != 0) {

            scaledHeight -= (scaledHeight % maxInfo.getHeightAlignment());

        if (scaledHeight % vc.getHeightAlignment() != 0) {

            scaledHeight -= (scaledHeight % vc.getHeightAlignment());

        }



        // Find max supported rate for size

        int maxRate = maxInfo.getSupportedFrameRatesFor(scaledWidth, scaledHeight)

        int maxRate = vc.getSupportedFrameRatesFor(scaledWidth, scaledHeight)

                .getUpper().intValue();

        if (maxRate < refreshRate) {

            refreshRate = maxRate;

        }



        Log.d(TAG, "Resized by " + maxScale + ": " + scaledWidth + ", " + scaledHeight

        Log.d(TAG, "Resized by " + scale + ": " + scaledWidth + ", " + scaledHeight

                + ", " + refreshRate);

        return new int[]{scaledWidth, scaledHeight, refreshRate};

    }