Merge "fix for issue 4142219 Don't hard code platform-specific limitations engine part."

11 files changed, 248 insertions, 268 deletions

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index f94e2b3..b70ff4a 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -1632,78 +1632,12 @@ status_t PreviewPlayer::setMediaRenderingMode(
     /* reset boolean for each clip*/
     mVideoResizedOrCropped = false;
 
-    switch(outputVideoSize) {
-        case M4VIDEOEDITING_kSQCIF:
-            mOutputVideoWidth = 128;
-            mOutputVideoHeight = 96;
-            break;
-
-        case M4VIDEOEDITING_kQQVGA:
-            mOutputVideoWidth = 160;
-            mOutputVideoHeight = 120;
-            break;
-
-        case M4VIDEOEDITING_kQCIF:
-            mOutputVideoWidth = 176;
-            mOutputVideoHeight = 144;
-            break;
-
-        case M4VIDEOEDITING_kQVGA:
-            mOutputVideoWidth = 320;
-            mOutputVideoHeight = 240;
-            break;
-
-        case M4VIDEOEDITING_kCIF:
-            mOutputVideoWidth = 352;
-            mOutputVideoHeight = 288;
-            break;
-
-        case M4VIDEOEDITING_kVGA:
-            mOutputVideoWidth = 640;
-            mOutputVideoHeight = 480;
-            break;
-
-        case M4VIDEOEDITING_kWVGA:
-            mOutputVideoWidth = 800;
-            mOutputVideoHeight = 480;
-            break;
-
-        case M4VIDEOEDITING_kNTSC:
-            mOutputVideoWidth = 720;
-            mOutputVideoHeight = 480;
-            break;
+    status_t err = OK;
+    /* get the video width and height by resolution */
+    err = getVideoSizeByResolution(outputVideoSize,
+              &mOutputVideoWidth, &mOutputVideoHeight);
 
-        case M4VIDEOEDITING_k640_360:
-            mOutputVideoWidth = 640;
-            mOutputVideoHeight = 360;
-            break;
-
-        case M4VIDEOEDITING_k854_480:
-            mOutputVideoWidth = 854;
-            mOutputVideoHeight = 480;
-            break;
-
-        case M4VIDEOEDITING_kHD1280:
-            mOutputVideoWidth = 1280;
-            mOutputVideoHeight = 720;
-            break;
-
-        case M4VIDEOEDITING_kHD1080:
-            mOutputVideoWidth = 1080;
-            mOutputVideoHeight = 720;
-            break;
-
-        case M4VIDEOEDITING_kHD960:
-            mOutputVideoWidth = 960;
-            mOutputVideoHeight = 720;
-            break;
-
-        default:
-            LOGE("unsupported output video size set");
-            return BAD_VALUE;
-    }
-
-    return OK;
+    return err;
 }
 
 M4OSA_ERR PreviewPlayer::doMediaRendering() {
diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
index c174585..f99ca79 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
@@ -1376,85 +1376,18 @@ M4OSA_ERR VideoEditorPreviewController::applyVideoEffect(
     return err;
 }
 
-M4OSA_ERR VideoEditorPreviewController::setPreviewFrameRenderingMode(
+status_t VideoEditorPreviewController::setPreviewFrameRenderingMode(
     M4xVSS_MediaRendering mode, M4VIDEOEDITING_VideoFrameSize outputVideoSize) {
 
     LOGV("setMediaRenderingMode: outputVideoSize = %d", outputVideoSize);
     mRenderingMode = mode;
 
-    switch(outputVideoSize) {
-        case M4VIDEOEDITING_kSQCIF:
-            mOutputVideoWidth = 128;
-            mOutputVideoHeight = 96;
-            break;
-
-        case M4VIDEOEDITING_kQQVGA:
-            mOutputVideoWidth = 160;
-            mOutputVideoHeight = 120;
-            break;
-
-        case M4VIDEOEDITING_kQCIF:
-            mOutputVideoWidth = 176;
-            mOutputVideoHeight = 144;
-            break;
-
-        case M4VIDEOEDITING_kQVGA:
-            mOutputVideoWidth = 320;
-            mOutputVideoHeight = 240;
-            break;
-
-        case M4VIDEOEDITING_kCIF:
-            mOutputVideoWidth = 352;
-            mOutputVideoHeight = 288;
-            break;
-
-        case M4VIDEOEDITING_kVGA:
-            mOutputVideoWidth = 640;
-            mOutputVideoHeight = 480;
-            break;
-
-        case M4VIDEOEDITING_kWVGA:
-            mOutputVideoWidth = 800;
-            mOutputVideoHeight = 480;
-            break;
-
-        case M4VIDEOEDITING_kNTSC:
-            mOutputVideoWidth = 720;
-            mOutputVideoHeight = 480;
-            break;
+    status_t err = OK;
+    /* get the video width and height by resolution */
+    err = getVideoSizeByResolution(outputVideoSize,
+              &mOutputVideoWidth, &mOutputVideoHeight);
 
-        case M4VIDEOEDITING_k640_360:
-            mOutputVideoWidth = 640;
-            mOutputVideoHeight = 360;
-            break;
-
-        case M4VIDEOEDITING_k854_480:
-            mOutputVideoWidth = 854;
-            mOutputVideoHeight = 480;
-            break;
-
-        case M4VIDEOEDITING_kHD1280:
-            mOutputVideoWidth = 1280;
-            mOutputVideoHeight = 720;
-            break;
-
-        case M4VIDEOEDITING_kHD1080:
-            mOutputVideoWidth = 1080;
-            mOutputVideoHeight = 720;
-            break;
-
-        case M4VIDEOEDITING_kHD960:
-            mOutputVideoWidth = 960;
-            mOutputVideoHeight = 720;
-            break;
-
-        default:
-            mOutputVideoWidth = 0;
-            mOutputVideoHeight = 0;
-            break;
-    }
-
-    return OK;
+    return err;
 }
 
 M4OSA_ERR VideoEditorPreviewController::doImageRenderingMode(
diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.h b/libvideoeditor/lvpp/VideoEditorPreviewController.h
index 18b61b5..01fc65b 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.h
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.h
@@ -86,7 +86,7 @@ public:
     M4OSA_Void setJniCallback(void* cookie,
         jni_progress_callback_fct callbackFct);
 
-    M4OSA_ERR setPreviewFrameRenderingMode(M4xVSS_MediaRendering mode,
+    status_t setPreviewFrameRenderingMode(M4xVSS_MediaRendering mode,
         M4VIDEOEDITING_VideoFrameSize outputVideoSize);
 
 private:
diff --git a/libvideoeditor/lvpp/VideoEditorTools.cpp b/libvideoeditor/lvpp/VideoEditorTools.cpp
index 3394b64..c7c3650 100755
--- a/libvideoeditor/lvpp/VideoEditorTools.cpp
+++ b/libvideoeditor/lvpp/VideoEditorTools.cpp
@@ -3575,3 +3575,100 @@ M4OSA_ERR applyEffectsAndRenderingMode(vePostProcessParams *params,
     }
     return M4NO_ERROR;
 }
+
+android::status_t getVideoSizeByResolution(
+                      M4VIDEOEDITING_VideoFrameSize resolution,
+                      uint32_t *pWidth, uint32_t *pHeight) {
+
+    uint32_t frameWidth, frameHeight;
+
+    if (pWidth == NULL) {
+        LOGE("getVideoFrameSizeByResolution invalid pointer for pWidth");
+        return android::BAD_VALUE;
+    }
+    if (pHeight == NULL) {
+        LOGE("getVideoFrameSizeByResolution invalid pointer for pHeight");
+        return android::BAD_VALUE;
+    }
+
+    switch (resolution) {
+        case M4VIDEOEDITING_kSQCIF:
+            frameWidth = 128;
+            frameHeight = 96;
+            break;
+
+        case M4VIDEOEDITING_kQQVGA:
+            frameWidth = 160;
+            frameHeight = 120;
+            break;
+
+        case M4VIDEOEDITING_kQCIF:
+            frameWidth = 176;
+            frameHeight = 144;
+            break;
+
+        case M4VIDEOEDITING_kQVGA:
+            frameWidth = 320;
+            frameHeight = 240;
+            break;
+
+        case M4VIDEOEDITING_kCIF:
+            frameWidth = 352;
+            frameHeight = 288;
+            break;
+
+        case M4VIDEOEDITING_kVGA:
+            frameWidth = 640;
+            frameHeight = 480;
+            break;
+
+        case M4VIDEOEDITING_kWVGA:
+            frameWidth = 800;
+            frameHeight = 480;
+            break;
+
+        case M4VIDEOEDITING_kNTSC:
+            frameWidth = 720;
+            frameHeight = 480;
+            break;
+
+        case M4VIDEOEDITING_k640_360:
+            frameWidth = 640;
+            frameHeight = 360;
+            break;
+
+        case M4VIDEOEDITING_k854_480:
+            frameWidth = 854;
+            frameHeight = 480;
+            break;
+
+        case M4VIDEOEDITING_k1280_720:
+            frameWidth = 1280;
+            frameHeight = 720;
+            break;
+
+        case M4VIDEOEDITING_k1080_720:
+            frameWidth = 1080;
+            frameHeight = 720;
+            break;
+
+        case M4VIDEOEDITING_k960_720:
+            frameWidth = 960;
+            frameHeight = 720;
+            break;
+
+        case M4VIDEOEDITING_k1920_1080:
+            frameWidth = 1920;
+            frameHeight = 1080;
+            break;
+
+        default:
+            LOGE("Unsupported video resolution %d.", resolution);
+            return android::BAD_VALUE;
+    }
+
+    *pWidth = frameWidth;
+    *pHeight = frameHeight;
+
+    return android::OK;
+}
diff --git a/libvideoeditor/lvpp/VideoEditorTools.h b/libvideoeditor/lvpp/VideoEditorTools.h
index 0552799..f39ed90 100755
--- a/libvideoeditor/lvpp/VideoEditorTools.h
+++ b/libvideoeditor/lvpp/VideoEditorTools.h
@@ -29,11 +29,10 @@
 #include "M4VSS3GPP_API.h"
 #include "M4xVSS_API.h"
 #include "M4xVSS_Internal.h"
-
 #include "M4AIR_API.h"
 #include "PreviewRenderer.h"
-#define MEDIA_RENDERING_INVALID 255
 
+#define MEDIA_RENDERING_INVALID 255
 #define TRANSPARENT_COLOR 0x7E0
 #define LUM_FACTOR_MAX 10
 enum {
@@ -137,4 +136,7 @@ M4OSA_ERR applyLumaEffect(M4VSS3GPP_VideoEffectType videoEffect,
 M4OSA_ERR applyEffectsAndRenderingMode(vePostProcessParams *params,
     M4OSA_UInt32 reportedWidth, M4OSA_UInt32 reportedHeight);
 
+android::status_t getVideoSizeByResolution(M4VIDEOEDITING_VideoFrameSize resolution,
+    uint32_t *pWidth, uint32_t *pHeight);
+
 #endif // ANDROID_VE_TOOLS_H
diff --git a/libvideoeditor/vss/common/inc/M4ENCODER_common.h b/libvideoeditor/vss/common/inc/M4ENCODER_common.h
index 61beefe..c94a82e 100755
--- a/libvideoeditor/vss/common/inc/M4ENCODER_common.h
+++ b/libvideoeditor/vss/common/inc/M4ENCODER_common.h
@@ -85,21 +85,21 @@ typedef enum
 */
 typedef enum
 {
-    M4ENCODER_kIYUV420=0,   /**< YUV 4:2:0 planar (standard input for mpeg-4 video) */
-    M4ENCODER_kIYUV422,        /**< YUV422 planar */
-    M4ENCODER_kIYUYV,        /**< YUV422 interlaced, luma first */
-    M4ENCODER_kIUYVY,        /**< YUV422 interlaced, chroma first */
-    M4ENCODER_kIJPEG,        /**< JPEG compressed frames */
-    M4ENCODER_kIRGB444,        /**< RGB 12 bits 4:4:4 */
-    M4ENCODER_kIRGB555,        /**< RGB 15 bits 5:5:5 */
-    M4ENCODER_kIRGB565,        /**< RGB 16 bits 5:6:5 */
-    M4ENCODER_kIRGB24,        /**< RGB 24 bits 8:8:8 */
-    M4ENCODER_kIRGB32,        /**< RGB 32 bits  */
-    M4ENCODER_kIBGR444,        /**< BGR 12 bits 4:4:4 */
-    M4ENCODER_kIBGR555,        /**< BGR 15 bits 5:5:5 */
-    M4ENCODER_kIBGR565,        /**< BGR 16 bits 5:6:5 */
-    M4ENCODER_kIBGR24,        /**< BGR 24 bits 8:8:8 */
-    M4ENCODER_kIBGR32        /**< BGR 32 bits  */
+    M4ENCODER_kIYUV420=0, /**< YUV 4:2:0 planar (standard input for mpeg-4 video) */
+    M4ENCODER_kIYUV422,   /**< YUV422 planar */
+    M4ENCODER_kIYUYV,     /**< YUV422 interlaced, luma first */
+    M4ENCODER_kIUYVY,     /**< YUV422 interlaced, chroma first */
+    M4ENCODER_kIJPEG,     /**< JPEG compressed frames */
+    M4ENCODER_kIRGB444,   /**< RGB 12 bits 4:4:4 */
+    M4ENCODER_kIRGB555,   /**< RGB 15 bits 5:5:5 */
+    M4ENCODER_kIRGB565,   /**< RGB 16 bits 5:6:5 */
+    M4ENCODER_kIRGB24,    /**< RGB 24 bits 8:8:8 */
+    M4ENCODER_kIRGB32,    /**< RGB 32 bits  */
+    M4ENCODER_kIBGR444,   /**< BGR 12 bits 4:4:4 */
+    M4ENCODER_kIBGR555,   /**< BGR 15 bits 5:5:5 */
+    M4ENCODER_kIBGR565,   /**< BGR 16 bits 5:6:5 */
+    M4ENCODER_kIBGR24,    /**< BGR 24 bits 8:8:8 */
+    M4ENCODER_kIBGR32     /**< BGR 32 bits  */
 } M4ENCODER_InputFormat;
 
 /**
@@ -130,29 +130,29 @@ typedef enum
 */
 typedef enum
 {
-    M4ENCODER_SQCIF_Width = 128,    /**< SQCIF 128x96 */
-    M4ENCODER_QQVGA_Width = 160,    /**< QQVGA 160x120 */
-    M4ENCODER_QCIF_Width  = 176,    /**< QCIF 176x144 */
-    M4ENCODER_QVGA_Width  = 320,    /**< QVGA 320x240 */
-    M4ENCODER_CIF_Width   = 352,    /**< CIF 352x288 */
-    M4ENCODER_VGA_Width   = 640,    /**< VGA 640x480 */
-    M4ENCODER_SVGA_Width  = 800,    /**< SVGA 800x600 */
-    M4ENCODER_XGA_Width   = 1024,    /**< XGA 1024x768 */
-    M4ENCODER_XVGA_Width  = 1280,    /**< XVGA 1280x1024 */
+    M4ENCODER_SQCIF_Width = 128, /**< SQCIF 128x96 */
+    M4ENCODER_QQVGA_Width = 160, /**< QQVGA 160x120 */
+    M4ENCODER_QCIF_Width  = 176, /**< QCIF 176x144 */
+    M4ENCODER_QVGA_Width  = 320, /**< QVGA 320x240 */
+    M4ENCODER_CIF_Width   = 352, /**< CIF 352x288 */
+    M4ENCODER_VGA_Width   = 640, /**< VGA 640x480 */
+    M4ENCODER_SVGA_Width  = 800, /**< SVGA 800x600 */
+    M4ENCODER_XGA_Width   = 1024, /**< XGA 1024x768 */
+    M4ENCODER_XVGA_Width  = 1280, /**< XVGA 1280x1024 */
 /* +PR LV5807 */
-    M4ENCODER_WVGA_Width  = 800,    /**< WVGA 800 x 480 */
-    M4ENCODER_NTSC_Width  = 720,    /**< NTSC 720 x 480 */
+    M4ENCODER_WVGA_Width  = 800, /**< WVGA 800 x 480 */
+    M4ENCODER_NTSC_Width  = 720, /**< NTSC 720 x 480 */
 /* -PR LV5807 */
 
 /* +CR Google */
-    M4ENCODER_640_360_Width       = 640,        /**< 640x360 */
+    M4ENCODER_640_360_Width   = 640,  /**< 640x360 */
     // StageFright encoders require %16 resolution
-    M4ENCODER_854_480_Width     = 848, /**< 848x480 */
-    M4ENCODER_HD1280_Width         = 1280,            /**< 720p 1280x720 */
+    M4ENCODER_854_480_Width   = 848,  /**< 848x480 */
+    M4ENCODER_1280_720_Width  = 1280, /**< 720p 1280x720 */
     // StageFright encoders require %16 resolution
-    M4ENCODER_HD1080_Width      = 1088, /**< 720p 1088x720 */
-    M4ENCODER_HD960_Width          = 960            /**< 720p 960x720 */
-
+    M4ENCODER_1080_720_Width  = 1088, /**< 720p 1088x720 */
+    M4ENCODER_960_720_Width   = 960,  /**< 720p 960x720 */
+    M4ENCODER_1920_1080_Width = 1920  /**< 1080p 1920x1080 */
 /* -CR Google */
 
 } M4ENCODER_FrameWidth;
@@ -165,27 +165,28 @@ typedef enum
 */
 typedef enum
 {
-    M4ENCODER_SQCIF_Height = 96,    /**< SQCIF 128x96 */
-    M4ENCODER_QQVGA_Height = 120,    /**< QQVGA 160x120 */
-    M4ENCODER_QCIF_Height  = 144,    /**< QCIF 176x144 */
-    M4ENCODER_QVGA_Height  = 240,    /**< QVGA 320x240 */
-    M4ENCODER_CIF_Height   = 288,    /**< CIF 352x288 */
-    M4ENCODER_VGA_Height   = 480,    /**< VGA 340x480 */
-    M4ENCODER_SVGA_Height  = 600,    /**< SVGA 800x600 */
-    M4ENCODER_XGA_Height   = 768,    /**< XGA 1024x768 */
-    M4ENCODER_XVGA_Height  = 1024,    /**< XVGA 1280x1024 */
+    M4ENCODER_SQCIF_Height = 96,  /**< SQCIF 128x96 */
+    M4ENCODER_QQVGA_Height = 120, /**< QQVGA 160x120 */
+    M4ENCODER_QCIF_Height  = 144, /**< QCIF 176x144 */
+    M4ENCODER_QVGA_Height  = 240, /**< QVGA 320x240 */
+    M4ENCODER_CIF_Height   = 288, /**< CIF 352x288 */
+    M4ENCODER_VGA_Height   = 480, /**< VGA 340x480 */
+    M4ENCODER_SVGA_Height  = 600, /**< SVGA 800x600 */
+    M4ENCODER_XGA_Height   = 768, /**< XGA 1024x768 */
+    M4ENCODER_XVGA_Height  = 1024, /**< XVGA 1280x1024 */
 /* +PR LV5807 */
-    M4ENCODER_WVGA_Height  = 480,    /**< WVGA 800 x 480 */
-    M4ENCODER_NTSC_Height  = 480,    /**< NTSC 720 x 480 */
+    M4ENCODER_WVGA_Height  = 480, /**< WVGA 800 x 480 */
+    M4ENCODER_NTSC_Height  = 480, /**< NTSC 720 x 480 */
 /* -PR LV5807 */
 
 /* +CR Google */
-    M4ENCODER_640_360_Height       = 360,        /**< 640x360 */
-    M4ENCODER_854_480_Height       = 480,        /**< 854x480 */
-    M4ENCODER_HD1280_Height     = 720,        /**< 720p 1280x720 */
-    M4ENCODER_HD1080_Height     = 720,        /**< 720p 1080x720 */
-    M4ENCODER_HD960_Height      = 720        /**< 720p 960x720 */
-
+    M4ENCODER_640_360_Height  = 360, /**< 640x360 */
+    M4ENCODER_854_480_Height  = 480, /**< 854x480 */
+    M4ENCODER_1280_720_Height = 720, /**< 720p 1280x720 */
+    M4ENCODER_1080_720_Height = 720, /**< 720p 1080x720 */
+    M4ENCODER_960_720_Height  = 720, /**< 720p 960x720 */
+    // StageFright encoders require %16 resolution
+    M4ENCODER_1920_1080_Height = 1088 /**< 1080p 1920x1080 */
 /* -CR Google */
 } M4ENCODER_FrameHeight;
 
@@ -197,10 +198,10 @@ typedef enum
 */
 typedef enum
 {
-    M4ENCODER_k28_KBPS    = 28000,
-    M4ENCODER_k40_KBPS    = 40000,
-    M4ENCODER_k64_KBPS    = 64000,
-    M4ENCODER_k96_KBPS    = 96000,
+    M4ENCODER_k28_KBPS  = 28000,
+    M4ENCODER_k40_KBPS  = 40000,
+    M4ENCODER_k64_KBPS  = 64000,
+    M4ENCODER_k96_KBPS  = 96000,
     M4ENCODER_k128_KBPS = 128000,
     M4ENCODER_k192_KBPS = 192000,
     M4ENCODER_k256_KBPS = 256000,
diff --git a/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h b/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
index 007b4b4..027affa 100755
--- a/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
+++ b/libvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
@@ -155,24 +155,24 @@ typedef enum
 */
 typedef enum
 {
-    M4VIDEOEDITING_kSQCIF=0,        /**< SQCIF 128x96  */
-    M4VIDEOEDITING_kQQVGA,            /**< QQVGA 160x120 */
-    M4VIDEOEDITING_kQCIF,            /**< QCIF  176x144 */
-    M4VIDEOEDITING_kQVGA,            /**< QVGA  320x240 */
-    M4VIDEOEDITING_kCIF,            /**< CIF   352x288 */
-    M4VIDEOEDITING_kVGA,
-/* +PR LV5807 */                    /**< VGA   640x480 */
-    M4VIDEOEDITING_kWVGA,            /**< WVGA 800x480 */
-    M4VIDEOEDITING_kNTSC,
-/* -PR LV5807 */                    /**< NTSC 720x480 */
+    M4VIDEOEDITING_kSQCIF=0, /**< SQCIF 128x96  */
+    M4VIDEOEDITING_kQQVGA,   /**< QQVGA 160x120 */
+    M4VIDEOEDITING_kQCIF,    /**< QCIF  176x144 */
+    M4VIDEOEDITING_kQVGA,    /**< QVGA  320x240 */
+    M4VIDEOEDITING_kCIF,     /**< CIF   352x288 */
+    M4VIDEOEDITING_kVGA,     /**< VGA   640x480 */
+/* +PR LV5807 */
+    M4VIDEOEDITING_kWVGA,    /**< WVGA 800x480 */
+    M4VIDEOEDITING_kNTSC,    /**< NTSC 720x480 */
+/* -PR LV5807 */
 
 /* +CR Google */
-    M4VIDEOEDITING_k640_360,            /**< 640x360 */
-    M4VIDEOEDITING_k854_480,            /**< 854x480 */
-    M4VIDEOEDITING_kHD1280,                /**< 720p 1280x720 */
-    M4VIDEOEDITING_kHD1080,                /**< 720p 1080x720 */
-    M4VIDEOEDITING_kHD960                /**< 720p 960x720 */
-
+    M4VIDEOEDITING_k640_360,  /**< 640x360 */
+    M4VIDEOEDITING_k854_480,  /**< 854x480 */
+    M4VIDEOEDITING_k1280_720, /**< 720p 1280x720 */
+    M4VIDEOEDITING_k1080_720, /**< 720p 1080x720 */
+    M4VIDEOEDITING_k960_720,  /**< 720p 960x720 */
+    M4VIDEOEDITING_k1920_1080 /**<1080p 1920x1080*/
 /* -CR Google */
 
 } M4VIDEOEDITING_VideoFrameSize;
diff --git a/libvideoeditor/vss/mcs/src/M4MCS_API.c b/libvideoeditor/vss/mcs/src/M4MCS_API.c
index 4a4008b..7c6f5d5 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_API.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_API.c
@@ -3789,26 +3789,38 @@ M4OSA_ERR M4MCS_setOutputParams( M4MCS_Context pContext,
                     break;
 
                 case M4VIDEOEDITING_k854_480:
-                    uiFrameWidth = pC->EncodingWidth = M4ENCODER_854_480_Width;
+                    uiFrameWidth =
+                        pC->EncodingWidth = M4ENCODER_854_480_Width;
                     uiFrameHeight =
                         pC->EncodingHeight = M4ENCODER_854_480_Height;
                     break;
 
-                case M4VIDEOEDITING_kHD1280:
-                    uiFrameWidth = pC->EncodingWidth = M4ENCODER_HD1280_Width;
+                case M4VIDEOEDITING_k1280_720:
+                    uiFrameWidth =
+                        pC->EncodingWidth = M4ENCODER_1280_720_Width;
                     uiFrameHeight =
-                        pC->EncodingHeight = M4ENCODER_HD1280_Height;
+                        pC->EncodingHeight = M4ENCODER_1280_720_Height;
                     break;
 
-                case M4VIDEOEDITING_kHD1080:
-                    uiFrameWidth = pC->EncodingWidth = M4ENCODER_HD1080_Width;
+                case M4VIDEOEDITING_k1080_720:
+                    uiFrameWidth =
+                        pC->EncodingWidth = M4ENCODER_1080_720_Width;
                     uiFrameHeight =
-                        pC->EncodingHeight = M4ENCODER_HD1080_Height;
+                        pC->EncodingHeight = M4ENCODER_1080_720_Height;
                     break;
 
-                case M4VIDEOEDITING_kHD960:
-                    uiFrameWidth = pC->EncodingWidth = M4ENCODER_HD960_Width;
-                    uiFrameHeight = pC->EncodingHeight = M4ENCODER_HD960_Height;
+                case M4VIDEOEDITING_k960_720:
+                    uiFrameWidth =
+                        pC->EncodingWidth = M4ENCODER_960_720_Width;
+                    uiFrameHeight =
+                        pC->EncodingHeight = M4ENCODER_960_720_Height;
+                    break;
+
+                case M4VIDEOEDITING_k1920_1080:
+                    uiFrameWidth =
+                        pC->EncodingWidth = M4ENCODER_1920_1080_Width;
+                    uiFrameHeight =
+                        pC->EncodingHeight = M4ENCODER_1920_1080_Height;
                     break;
                     /* -CR Google */
                 default:
diff --git a/libvideoeditor/vss/src/M4PTO3GPP_API.c b/libvideoeditor/vss/src/M4PTO3GPP_API.c
index 3ecb2e3..2d4afdf 100755
--- a/libvideoeditor/vss/src/M4PTO3GPP_API.c
+++ b/libvideoeditor/vss/src/M4PTO3GPP_API.c
@@ -312,8 +312,7 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
     if( (M4VIDEOEDITING_kH263 != pParams->OutputVideoFormat) &&
         (M4VIDEOEDITING_kMPEG4 != pParams->OutputVideoFormat) &&
         (M4VIDEOEDITING_kMPEG4_EMP != pParams->OutputVideoFormat) &&
-        (M4VIDEOEDITING_kH264 != pParams->OutputVideoFormat))
-    {
+        (M4VIDEOEDITING_kH264 != pParams->OutputVideoFormat)) {
         M4OSA_TRACE1_0("M4PTO3GPP_Open: Undefined output video format");
         return ERR_PTO3GPP_UNDEFINED_OUTPUT_VIDEO_FORMAT;
      }
@@ -337,8 +336,7 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
          (M4VIDEOEDITING_k2_MBPS        == pParams->OutputVideoBitrate) ||
          (M4VIDEOEDITING_k5_MBPS        == pParams->OutputVideoBitrate) ||
          (M4VIDEOEDITING_k8_MBPS        == pParams->OutputVideoBitrate) ||
-         (M4VIDEOEDITING_kVARIABLE_KBPS == pParams->OutputVideoBitrate)))
-    {
+         (M4VIDEOEDITING_kVARIABLE_KBPS == pParams->OutputVideoBitrate))) {
         M4OSA_TRACE1_0("M4PTO3GPP_Open: Undefined output video bitrate");
         return ERR_PTO3GPP_UNDEFINED_OUTPUT_VIDEO_BITRATE;
     }
@@ -357,11 +355,10 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
 
           (M4VIDEOEDITING_k640_360 == pParams->OutputVideoFrameSize) ||
           (M4VIDEOEDITING_k854_480 == pParams->OutputVideoFrameSize) ||
-          (M4VIDEOEDITING_kHD1280  == pParams->OutputVideoFrameSize) ||
-          (M4VIDEOEDITING_kHD1080  == pParams->OutputVideoFrameSize) ||
-          (M4VIDEOEDITING_kHD960   == pParams->OutputVideoFrameSize)))
-
-    {
+          (M4VIDEOEDITING_k1280_720 == pParams->OutputVideoFrameSize) ||
+          (M4VIDEOEDITING_k1080_720 == pParams->OutputVideoFrameSize) ||
+          (M4VIDEOEDITING_k960_720 == pParams->OutputVideoFrameSize) ||
+          (M4VIDEOEDITING_k1920_1080 == pParams->OutputVideoFrameSize))) {
         M4OSA_TRACE1_0("M4PTO3GPP_Open: Undefined output video frame size");
         return ERR_PTO3GPP_UNDEFINED_OUTPUT_VIDEO_FRAME_SIZE;
     }
@@ -376,20 +373,16 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
           (M4PTO3GPP_k300_KB    == pParams->OutputFileMaxSize) ||
           (M4PTO3GPP_k400_KB    == pParams->OutputFileMaxSize) ||
           (M4PTO3GPP_k500_KB    == pParams->OutputFileMaxSize) ||
-          (M4PTO3GPP_kUNLIMITED == pParams->OutputFileMaxSize)))
-
-    {
+          (M4PTO3GPP_kUNLIMITED == pParams->OutputFileMaxSize))) {
         M4OSA_TRACE1_0("M4PTO3GPP_Open: Undefined output 3GPP file size");
         return ERR_PTO3GPP_UNDEFINED_OUTPUT_FILE_SIZE;
     }
 
     /* Audio padding */
-    if (M4OSA_NULL != pParams->pInputAudioTrackFile)
-    {
+    if (M4OSA_NULL != pParams->pInputAudioTrackFile) {
         if ((!( (M4PTO3GPP_kAudioPaddingMode_None   == pParams->AudioPaddingMode) ||
                 (M4PTO3GPP_kAudioPaddingMode_Silence== pParams->AudioPaddingMode) ||
-                (M4PTO3GPP_kAudioPaddingMode_Loop   == pParams->AudioPaddingMode))))
-        {
+                (M4PTO3GPP_kAudioPaddingMode_Loop   == pParams->AudioPaddingMode)))) {
             M4OSA_TRACE1_0("M4PTO3GPP_Open: Undefined audio padding");
             return ERR_PTO3GPP_UNDEFINED_AUDIO_PADDING;
         }
@@ -399,8 +392,7 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
     if ((M4VIDEOEDITING_kH263 == pParams->OutputVideoFormat) &&
         (M4VIDEOEDITING_kSQCIF != pParams->OutputVideoFrameSize) &&
         (M4VIDEOEDITING_kQCIF != pParams->OutputVideoFrameSize) &&
-        (M4VIDEOEDITING_kCIF != pParams->OutputVideoFrameSize))
-    {
+        (M4VIDEOEDITING_kCIF != pParams->OutputVideoFrameSize)) {
         M4OSA_TRACE1_0("M4PTO3GPP_Open():\
              returning ERR_PTO3GPP_INVALID_VIDEO_FRAME_SIZE_FOR_H263");
         return ERR_PTO3GPP_INVALID_VIDEO_FRAME_SIZE_FOR_H263;
@@ -408,8 +400,7 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
 
     /**
      *  Check state automaton */
-    if (M4PTO3GPP_kState_CREATED != pC->m_State)
-    {
+    if (M4PTO3GPP_kState_CREATED != pC->m_State) {
         M4OSA_TRACE1_1("M4PTO3GPP_Open(): Wrong State (%d), returning M4ERR_STATE", pC->m_State);
         return M4ERR_STATE;
     }
@@ -423,8 +414,7 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
     /***********************************/
     /* Open input file with the reader */
     /***********************************/
-    if (M4OSA_NULL != pC->m_Params.pInputAudioTrackFile)
-    {
+    if (M4OSA_NULL != pC->m_Params.pInputAudioTrackFile) {
         /**
          * Get the reader interface according to the input audio file type */
         switch(pC->m_Params.AudioFileFormat)
@@ -1346,19 +1336,24 @@ M4OSA_ERR M4PTO3GPP_Ready4Processing(M4PTO3GPP_InternalContext* pC)
             EncParams.FrameWidth  = M4ENCODER_854_480_Width;
             break;
 
-        case M4VIDEOEDITING_kHD1280:
-            EncParams.FrameHeight = M4ENCODER_HD1280_Height;
-            EncParams.FrameWidth  = M4ENCODER_HD1280_Width;
+        case M4VIDEOEDITING_k1280_720:
+            EncParams.FrameHeight = M4ENCODER_1280_720_Height;
+            EncParams.FrameWidth  = M4ENCODER_1280_720_Width;
+            break;
+
+        case M4VIDEOEDITING_k1080_720:
+            EncParams.FrameHeight = M4ENCODER_1080_720_Height;
+            EncParams.FrameWidth  = M4ENCODER_1080_720_Width;
             break;
 
-        case M4VIDEOEDITING_kHD1080:
-            EncParams.FrameHeight = M4ENCODER_HD1080_Height;
-            EncParams.FrameWidth  = M4ENCODER_HD1080_Width;
+        case M4VIDEOEDITING_k960_720:
+            EncParams.FrameHeight = M4ENCODER_960_720_Height;
+            EncParams.FrameWidth  = M4ENCODER_960_720_Width;
             break;
 
-        case M4VIDEOEDITING_kHD960:
-            EncParams.FrameHeight = M4ENCODER_HD960_Height;
-            EncParams.FrameWidth  = M4ENCODER_HD960_Width;
+        case M4VIDEOEDITING_k1920_1080:
+            EncParams.FrameHeight = M4ENCODER_1920_1080_Height;
+            EncParams.FrameWidth  = M4ENCODER_1920_1080_Width;
             break;
 /* -CR Google */
         default :
diff --git a/libvideoeditor/vss/src/M4xVSS_API.c b/libvideoeditor/vss/src/M4xVSS_API.c
index 8def0c6..d09b145 100755
--- a/libvideoeditor/vss/src/M4xVSS_API.c
+++ b/libvideoeditor/vss/src/M4xVSS_API.c
@@ -954,24 +954,27 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
             height = 480;
             break;
 
-        case M4VIDEOEDITING_kHD1280:
+        case M4VIDEOEDITING_k1280_720:
             width = 1280;
             height = 720;
             break;
 
-        case M4VIDEOEDITING_kHD1080:
+        case M4VIDEOEDITING_k1080_720:
             // StageFright encoders require %16 resolution
-
-            width = M4ENCODER_HD1080_Width;
-
+            width = M4ENCODER_1080_720_Width;
             height = 720;
             break;
 
-        case M4VIDEOEDITING_kHD960:
+        case M4VIDEOEDITING_k960_720:
             width = 960;
             height = 720;
             break;
 
+        case M4VIDEOEDITING_k1920_1080:
+            width = 1920;
+            height = M4ENCODER_1920_1080_Height;
+            break;
+
             /* -CR Google */
         default: /* If output video size is not given, we take QCIF size */
             width = 176;
diff --git a/libvideoeditor/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c
index a490cdc..e23e703 100755
--- a/libvideoeditor/vss/src/M4xVSS_internal.c
+++ b/libvideoeditor/vss/src/M4xVSS_internal.c
@@ -2136,20 +2136,23 @@ M4OSA_ERR M4xVSS_internalConvertARGB888toYUV420_FrammingEffect(M4OSA_Context pCo
         width_out = M4ENCODER_854_480_Width;
         height_out = 480;
         break;
-    case M4VIDEOEDITING_kHD1280:
+    case M4VIDEOEDITING_k1280_720:
         width_out = 1280;
         height_out = 720;
         break;
-    case M4VIDEOEDITING_kHD1080:
+    case M4VIDEOEDITING_k1080_720:
         // StageFright encoders require %16 resolution
-        width_out = M4ENCODER_HD1080_Width;
+        width_out = M4ENCODER_1080_720_Width;
         height_out = 720;
         break;
-    case M4VIDEOEDITING_kHD960:
+    case M4VIDEOEDITING_k960_720:
         width_out = 960;
         height_out = 720;
         break;
-
+    case M4VIDEOEDITING_k1920_1080:
+        width_out = 1920;
+        height_out = M4ENCODER_1920_1080_Height;
+        break;
     /**
      * If output video size is not given, we take QCIF size,
      * should not happen, because already done in M4xVSS_sendCommand */