Fix incorrect OpenCore component parameter negotiation timing for frame size and frame rate

bug 2024374

1 files changed, 18 insertions, 20 deletions

diff --git a/android/author/authordriver.cpp b/android/author/authordriver.cpp
index 27fb5a1d0..80b24f4d4 100644
--- a/android/author/authordriver.cpp
+++ b/android/author/authordriver.cpp
@@ -569,6 +569,24 @@ void AuthorDriver::handleSetVideoEncoder(set_video_encoder_command *ac)
     }
 
     mVideoEncoder = ac->ve;
+    // Set video encoding frame rate and video frame size only when the
+    // video input MIO is set.
+    if (mVideoInputMIO) {
+        if (mVideoFrameRate == 0) {
+            mVideoFrameRate = DEFAULT_VIDEO_FRAME_RATE;
+        }
+        clipVideoFrameRate();
+        ((AndroidCameraInput *)mVideoInputMIO)->SetFrameRate(mVideoFrameRate);
+
+        if (mVideoWidth == 0) {
+            mVideoWidth = DEFAULT_VIDEO_WIDTH;
+        }
+        if (mVideoHeight == 0) {
+            mVideoHeight = DEFAULT_VIDEO_HEIGHT;
+        }
+        clipVideoFrameSize();
+        ((AndroidCameraInput *)mVideoInputMIO)->SetFrameSize(mVideoWidth, mVideoHeight);
+    }
 
     OSCL_TRY(error, mAuthor->AddMediaTrack(*mVideoNode, iVideoEncoderMimeType, mSelectedComposer, mVideoEncoderConfig, ac));
     OSCL_FIRST_CATCH_ANY(error, commandFailed(ac));
@@ -905,26 +923,6 @@ void AuthorDriver::handleSetParameters(set_parameters_command *ac) {
 void AuthorDriver::handlePrepare(author_command *ac)
 {
     LOGV("handlePrepare");
-
-    // Set video encoding frame rate and video frame size only when the
-    // video input MIO is set.
-    if (mVideoInputMIO) {
-        if (mVideoFrameRate == 0) {
-            mVideoFrameRate = DEFAULT_VIDEO_FRAME_RATE;
-        }
-        clipVideoFrameRate();
-        ((AndroidCameraInput *)mVideoInputMIO)->SetFrameRate(mVideoFrameRate);
-
-        if (mVideoWidth == 0) {
-            mVideoWidth = DEFAULT_VIDEO_WIDTH;
-        }
-        if (mVideoHeight == 0) {
-            mVideoHeight = DEFAULT_VIDEO_HEIGHT;
-        }
-        clipVideoFrameSize();
-        ((AndroidCameraInput *)mVideoInputMIO)->SetFrameSize(mVideoWidth, mVideoHeight);
-    }
-
     int error = 0;
     OSCL_TRY(error, mAuthor->Init(ac));
     OSCL_FIRST_CATCH_ANY(error, commandFailed(ac));