Fix for 4132872 inefficient export logic.

Also fixes 3371103 Transitions between images takes a long time
to generate.

Redundant transcoding is removed. Decode encode will be done only
once per clip.
For images, conversion to 3gp clip is removed (except for generating
Kenburn image clip).

Change-Id: Id722cd0296641bd643eb5c63f4d8028716259c01

3 files changed, 9 insertions, 0 deletions

diff --git a/vss/inc/M4VSS3GPP_API.h b/vss/inc/M4VSS3GPP_API.h
index 0356805..0bb7141 100755
--- a/vss/inc/M4VSS3GPP_API.h
+++ b/vss/inc/M4VSS3GPP_API.h
@@ -366,6 +366,7 @@ typedef struct
                                                        with M4VSS3GPP_editAnalyseClip */
     M4OSA_UInt32                    uiBeginCutTime;   /**< Begin cut time, in milliseconds */
     M4OSA_UInt32                    uiEndCutTime;     /**< End cut time, in milliseconds */
+    M4OSA_Bool                      bTranscodingRequired;
 
 #ifdef M4VSS_SUPPORT_EXTENDED_FEATURES
     M4xVSS_ClipSettings             xVSS;
diff --git a/vss/inc/M4VSS3GPP_InternalTypes.h b/vss/inc/M4VSS3GPP_InternalTypes.h
index d621a1b..2dd892a 100755
--- a/vss/inc/M4VSS3GPP_InternalTypes.h
+++ b/vss/inc/M4VSS3GPP_InternalTypes.h
@@ -374,6 +374,11 @@ typedef struct
      * Interfaces of the used modules */
      /**< Filesystem and shell reader, decoder functions */
     M4VSS3GPP_MediaAndCodecCtxt ShellAPI;
+    M4VIFI_ImagePlane           *pPlaneYuv;  /* YUV420 image plane, converted from ARGB888 */
+    M4VIFI_ImagePlane*          m_pPreResizeFrame;  /* The decoded image before resize
+                                                   (allocated only if resize needed)*/
+    M4VIFI_ImagePlane           *pPlaneYuvWithEffect; /* YUV420 image plane, with color effect */
+    M4OSA_Bool                  bGetYuvDataFromDecoder;  /* Boolean used to get YUV data from dummy video decoder only for first time */
 } M4VSS3GPP_ClipContext;
 
 
@@ -601,6 +606,8 @@ typedef struct
                                                               external effect is active */
     M4OSA_Int32              iInOutTimeOffset;
     M4OSA_Bool               bEncodeTillEoF;
+    M4xVSS_EditSettings      xVSS;
+    M4OSA_Context            m_air_context;
 } M4VSS3GPP_InternalEditContext;
 
 
diff --git a/vss/inc/M4xVSS_Internal.h b/vss/inc/M4xVSS_Internal.h
index e8013f4..8811beb 100755
--- a/vss/inc/M4xVSS_Internal.h
+++ b/vss/inc/M4xVSS_Internal.h
@@ -347,6 +347,7 @@ typedef struct {
 
     M4MCS_MediaRendering                 MediaRendering;   /**< FB: to crop, resize, or render
                                                                 black borders*/
+    M4OSA_UInt32                         videoclipnumber;
 
 } M4xVSS_MCS_params;