summaryrefslogtreecommitdiff
path: root/vss/inc
diff options
context:
space:
mode:
authorDanny Fernandes <dannyfernandes@google.com>2011-02-16 21:03:28 -0800
committerDanny Fernandes <dannyfernandes@google.com>2011-02-17 12:10:47 -0800
commit12e6559a6995ccfce0df1aabfd741440f05a4dd9 (patch)
tree39dc48220347a2fa2c653ec5958948176dbc9fca /vss/inc
parentbff75e2e53c4c2c267693e07bc9906df7f53fd64 (diff)
downloadlibvideoeditor-12e6559a6995ccfce0df1aabfd741440f05a4dd9.tar.gz
Fixed issue 3421896 Slide transition causes images to jump in exported movie playback
Change-Id: I78cbe7e3509f65ce651de926267fad4f65c3c263
Diffstat (limited to 'vss/inc')
-rwxr-xr-xvss/inc/M4VSS3GPP_InternalTypes.h24
1 files changed, 16 insertions, 8 deletions
diff --git a/vss/inc/M4VSS3GPP_InternalTypes.h b/vss/inc/M4VSS3GPP_InternalTypes.h
index bc29b2a..570b654 100755
--- a/vss/inc/M4VSS3GPP_InternalTypes.h
+++ b/vss/inc/M4VSS3GPP_InternalTypes.h
@@ -84,14 +84,21 @@ M4VSS3GPP_EditState;
typedef enum
{
- M4VSS3GPP_kEditVideoState_READ_WRITE = 10, /**< Doing Read/Write operation
- (no decoding/encoding) */
- M4VSS3GPP_kEditVideoState_BEGIN_CUT = 11, /**< Decode encode to create an I frame */
- M4VSS3GPP_kEditVideoState_DECODE_ENCODE = 12, /**< Doing Read-Decode/Filter/
- Encode-Write operation */
- M4VSS3GPP_kEditVideoState_TRANSITION = 13, /**< Transition; blending of two videos */
- M4VSS3GPP_kEditVideoState_AFTER_CUT = 14 /**< Special Read/Write mode after a
- begin cut (time frozen) */
+ /**< Doing Read/Write operation. This operation will have no processing
+ * on input frames. Only time stamp manipulations in output file. */
+ M4VSS3GPP_kEditVideoState_READ_WRITE = 10,
+ /**< Decode encode to create an I frame. This is done for a single frame
+ * to create a new reference frame. */
+ M4VSS3GPP_kEditVideoState_BEGIN_CUT = 11,
+ /**< Doing Read->Decode->Filter->Encode->Write operation on the input file
+ * to create the output file. */
+ M4VSS3GPP_kEditVideoState_DECODE_ENCODE = 12,
+ /**< Applied when Transition is active and blending of two videos is
+ * required. */
+ M4VSS3GPP_kEditVideoState_TRANSITION = 13,
+ /**< Special Read/Write mode used after BEGIN_CUT state. The frame
+ * is already coded as I frame in BEGIN_CUT state; so skip it. */
+ M4VSS3GPP_kEditVideoState_AFTER_CUT = 14
}
M4VSS3GPP_EditVideoState;
@@ -611,6 +618,7 @@ typedef struct
M4OSA_Bool m_bClipExternalHasStarted; /**< Flag to indicate that an
external effect is active */
M4OSA_Int32 iInOutTimeOffset;
+ M4OSA_Bool bEncodeTillEoF;
} M4VSS3GPP_InternalEditContext;