diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-11 19:24:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 19:24:16 +0000 |
| commit | 2590fc421ccf5e8199d511ff3022b428ee9122e9 (patch) | |
| tree | f489352ca8f9921287babe07829720ccc145d9e7 /media/libstagefright/codecs/on2/dec/SoftVPX.cpp | |
| parent | 65575de268f4c0d75e6c1172469001ace765fc14 (diff) | |
| parent | 3e08ca6709b5a75dc3b779cf3eba8196b08a0245 (diff) | |
| download | frameworks_av-2590fc421ccf5e8199d511ff3022b428ee9122e9.zip frameworks_av-2590fc421ccf5e8199d511ff3022b428ee9122e9.tar.gz frameworks_av-2590fc421ccf5e8199d511ff3022b428ee9122e9.tar.bz2 | |
am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp
* commit '3e08ca6709b5a75dc3b779cf3eba8196b08a0245':
stagefright: misc fixes to software video encoders (and decoders)
Diffstat (limited to 'media/libstagefright/codecs/on2/dec/SoftVPX.cpp')
| -rw-r--r-- | media/libstagefright/codecs/on2/dec/SoftVPX.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp index 7f00057..6e6a78a 100644 --- a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp +++ b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp @@ -43,10 +43,13 @@ SoftVPX::SoftVPX( mFrameParallelMode(false), mTimeStampIdx(0), mImg(NULL) { - initPorts(kNumBuffers, 768 * 1024 /* inputBufferSize */, - kNumBuffers, - codingType == OMX_VIDEO_CodingVP8 ? MEDIA_MIMETYPE_VIDEO_VP8 : MEDIA_MIMETYPE_VIDEO_VP9); - + // arbitrary from avc/hevc as vpx does not specify a min compression ratio + const size_t kMinCompressionRatio = mMode == MODE_VP8 ? 2 : 4; + const char *mime = mMode == MODE_VP8 ? MEDIA_MIMETYPE_VIDEO_VP8 : MEDIA_MIMETYPE_VIDEO_VP9; + const size_t kMaxOutputBufferSize = 2048 * 2048 * 3 / 2; + initPorts( + kNumBuffers, kMaxOutputBufferSize / kMinCompressionRatio /* inputBufferSize */, + kNumBuffers, mime, kMinCompressionRatio); CHECK_EQ(initDecoder(), (status_t)OK); } |