diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-07 16:57:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-07 16:57:34 +0000 |
| commit | b288e591b5546b00c17dc78634c87aeee6af4746 (patch) | |
| tree | 1bca85935788654055cf665af42a53634cef23bf /libs/nativewindow/ANativeWindow.cpp | |
| parent | 3ee6879e91eb132e0b24e2adefd4d8eae2491a62 (diff) | |
| parent | 38afbfd13622e10b8e74b9c114fa05f30ba480bb (diff) | |
| download | native-b288e591b5546b00c17dc78634c87aeee6af4746.tar.gz | |
Snap for 7803083 from 38afbfd13622e10b8e74b9c114fa05f30ba480bb to mainline-tzdata2-release
Change-Id: Ic05c46aa04f9072b3dc93e023a17408956f14474
Diffstat (limited to 'libs/nativewindow/ANativeWindow.cpp')
| -rw-r--r-- | libs/nativewindow/ANativeWindow.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libs/nativewindow/ANativeWindow.cpp b/libs/nativewindow/ANativeWindow.cpp index fd1793b6bc..75f2385174 100644 --- a/libs/nativewindow/ANativeWindow.cpp +++ b/libs/nativewindow/ANativeWindow.cpp @@ -159,10 +159,8 @@ int32_t ANativeWindow_getBuffersDataSpace(ANativeWindow* window) { } int32_t ANativeWindow_setFrameRate(ANativeWindow* window, float frameRate, int8_t compatibility) { - if (!window || !query(window, NATIVE_WINDOW_IS_VALID)) { - return -EINVAL; - } - return native_window_set_frame_rate(window, frameRate, compatibility); + return ANativeWindow_setFrameRateWithChangeStrategy(window, frameRate, compatibility, + ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS); } void ANativeWindow_tryAllocateBuffers(ANativeWindow* window) { @@ -172,6 +170,13 @@ void ANativeWindow_tryAllocateBuffers(ANativeWindow* window) { window->perform(window, NATIVE_WINDOW_ALLOCATE_BUFFERS); } +int32_t ANativeWindow_setFrameRateWithChangeStrategy(ANativeWindow* window, float frameRate, + int8_t compatibility, int8_t changeFrameRateStrategy) { + if (!window || !query(window, NATIVE_WINDOW_IS_VALID)) { + return -EINVAL; + } + return native_window_set_frame_rate(window, frameRate, compatibility, changeFrameRateStrategy); +} /************************************************************************************************** * vndk-stable @@ -208,6 +213,7 @@ int ANativeWindow_query(const ANativeWindow* window, ANativeWindowQuery what, in case ANATIVEWINDOW_QUERY_DEFAULT_WIDTH: case ANATIVEWINDOW_QUERY_DEFAULT_HEIGHT: case ANATIVEWINDOW_QUERY_TRANSFORM_HINT: + case ANATIVEWINDOW_QUERY_BUFFER_AGE: // these are part of the VNDK API break; case ANATIVEWINDOW_QUERY_MIN_SWAP_INTERVAL: |