diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-04-25 19:20:44 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-04-26 09:06:05 +1200 |
| commit | d3ab242d090eed70909d388840d7805cc3343bd6 (patch) | |
| tree | 5f6ac15655bd95781b43321203e15b6f26cada15 | |
| parent | 39396856395abe1d467ce157a11093a56c5c871c (diff) | |
Merge pull request #4576 from koying/fixamcart
FIX: [mediacodec] ART is not happy with non-existent values in map
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp index 2eaea8d97f..22ca60a185 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp @@ -911,15 +911,34 @@ int CDVDVideoCodecAndroidMediaCodec::GetOutputPicture(void) void CDVDVideoCodecAndroidMediaCodec::ConfigureOutputFormat(CJNIMediaFormat* mediaformat) { - int width = mediaformat->getInteger("width"); - int height = mediaformat->getInteger("height"); - int stride = mediaformat->getInteger("stride"); - int slice_height= mediaformat->getInteger("slice-height"); - int color_format= mediaformat->getInteger("color-format"); - int crop_left = mediaformat->getInteger("crop-left"); - int crop_top = mediaformat->getInteger("crop-top"); - int crop_right = mediaformat->getInteger("crop-right"); - int crop_bottom = mediaformat->getInteger("crop-bottom"); + int width = 0; + int height = 0; + int stride = 0; + int slice_height= 0; + int color_format= 0; + int crop_left = 0; + int crop_top = 0; + int crop_right = 0; + int crop_bottom = 0; + + if (mediaformat->containsKey("width")) + width = mediaformat->getInteger("width"); + if (mediaformat->containsKey("height")) + height = mediaformat->getInteger("height"); + if (mediaformat->containsKey("stride")) + stride = mediaformat->getInteger("stride"); + if (mediaformat->containsKey("slice-height")) + slice_height= mediaformat->getInteger("slice-height"); + if (mediaformat->containsKey("color-format")) + color_format= mediaformat->getInteger("color-format"); + if (mediaformat->containsKey("crop-left")) + crop_left = mediaformat->getInteger("crop-left"); + if (mediaformat->containsKey("crop-top")) + crop_top = mediaformat->getInteger("crop-top"); + if (mediaformat->containsKey("crop-right")) + crop_right = mediaformat->getInteger("crop-right"); + if (mediaformat->containsKey("crop-bottom")) + crop_bottom = mediaformat->getInteger("crop-bottom"); CLog::Log(LOGDEBUG, "CDVDVideoCodecAndroidMediaCodec:: " "width(%d), height(%d), stride(%d), slice-height(%d), color-format(%d)", |