Merge "Rename DisplayMode::refreshRate to peakRefreshRate" into main (ae9055c2) · Commits · e / os / android_frameworks_av

cmds/screenrecord/screenrecord.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -893,7 +893,7 @@ static status_t recordScreen(const char* fileName) {
		if (gVerbose) {
		printf("Display is %dx%d @%.2ffps (orientation=%s), layerStack=%u\n",
		layerStackSpaceRect.getWidth(), layerStackSpaceRect.getHeight(),
		displayMode.refreshRate, toCString(displayState.orientation),
		displayMode.peakRefreshRate, toCString(displayState.orientation),
		displayState.layerStack.id);
		fflush(stdout);
		}
		@@ -911,7 +911,8 @@ static status_t recordScreen(const char* fileName) {
		sp<FrameOutput> frameOutput;
		sp<IGraphicBufferProducer> encoderInputSurface;
		if (gOutputFormat != FORMAT_FRAMES && gOutputFormat != FORMAT_RAW_FRAMES) {
		err = prepareEncoder(displayMode.refreshRate, &recordingData.encoder, &encoderInputSurface);
		err = prepareEncoder(displayMode.peakRefreshRate, &recordingData.encoder,
		&encoderInputSurface);

		if (err != NO_ERROR && !gSizeSpecified) {
		// fallback is defined for landscape; swap if we're in portrait
		@@ -924,7 +925,7 @@ static status_t recordScreen(const char* fileName) {
		gVideoWidth, gVideoHeight, newWidth, newHeight);
		gVideoWidth = newWidth;
		gVideoHeight = newHeight;
		err = prepareEncoder(displayMode.refreshRate, &recordingData.encoder,
		err = prepareEncoder(displayMode.peakRefreshRate, &recordingData.encoder,
		&encoderInputSurface);
		}
		}