diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-09-02 16:10:12 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2011-09-02 16:15:40 +0800 |
| commit | e02eee1a408656be9beaf1b0ba656dd1ee103799 (patch) | |
| tree | 2d016be4b0f25075cb09be88259b07eb9de5ad19 /libvideoeditor | |
| parent | e9eec0e0975c57c0dac91eb5b4cbb052b7dd011a (diff) | |
| download | frameworks_av-e02eee1a408656be9beaf1b0ba656dd1ee103799.zip frameworks_av-e02eee1a408656be9beaf1b0ba656dd1ee103799.tar.gz frameworks_av-e02eee1a408656be9beaf1b0ba656dd1ee103799.tar.bz2 | |
Fix 5240036: We didn't handle the 1920x1080 resolution.
Change-Id: Id48c7db085bb73625acad365e0a036c8e45567dc
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/vss/src/M4VSS3GPP_Edit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_Edit.c b/libvideoeditor/vss/src/M4VSS3GPP_Edit.c index 9ac15a9..b764fef 100755 --- a/libvideoeditor/vss/src/M4VSS3GPP_Edit.c +++ b/libvideoeditor/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; |