summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-09-02 16:10:12 +0800
committerChih-Chung Chang <chihchung@google.com>2011-09-02 16:15:40 +0800
commit4a5d8c671172fbafe9964d2d71137e7f69a26df9 (patch)
tree9460bfc9a8e2a37edee352bee4380674b56c8529
parent16757d256453f0c765c13ca9d97ca89fc5565420 (diff)
downloadlibvideoeditor-4a5d8c671172fbafe9964d2d71137e7f69a26df9.tar.gz
Fix 5240036: We didn't handle the 1920x1080 resolution.
Change-Id: Id48c7db085bb73625acad365e0a036c8e45567dc
-rwxr-xr-xvss/src/M4VSS3GPP_Edit.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/vss/src/M4VSS3GPP_Edit.c b/vss/src/M4VSS3GPP_Edit.c
index 9ac15a9..b764fef 100755
--- a/vss/src/M4VSS3GPP_Edit.c
+++ b/vss/src/M4VSS3GPP_Edit.c
@@ -940,8 +940,14 @@ M4OSA_ERR M4VSS3GPP_editOpen( M4VSS3GPP_EditContext pContext,
pC->ewc.uiVideoWidth = 960;
pC->ewc.uiVideoHeight = 720;
break;
+ case M4VIDEOEDITING_k1920_1080:
+ pC->ewc.uiVideoWidth = 1920;
+ pC->ewc.uiVideoHeight = 1088; // need to be multiples of 16
+ break;
default: /* If output video size is not given, we take QCIF size */
+ M4OSA_TRACE1_0(
+ "M4VSS3GPP_editOpen: no output video size given, default to QCIF!");
pC->ewc.uiVideoWidth = 176;
pC->ewc.uiVideoHeight = 144;
pC->xVSS.outputVideoSize = M4VIDEOEDITING_kQCIF;