Commit 51ad7ca7 authored by Martin Storsjö's avatar Martin Storsjö Committed by Jean-Baptiste Kempf

omxil: Ignore nSliceHeight on Galaxy S II

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 6d71b5c0)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent a65956a5
...@@ -445,6 +445,18 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port, ...@@ -445,6 +445,18 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
strlen("OMX.qcom.video.decoder"))) strlen("OMX.qcom.video.decoder")))
def->format.video.eColorFormat = OMX_QCOM_COLOR_FormatYVU420SemiPlanar; def->format.video.eColorFormat = OMX_QCOM_COLOR_FormatYVU420SemiPlanar;
/* Hack: Galaxy S II (stock firmware) gives a slice height larger
* than the video height, but this doesn't imply padding between
* the video planes. Nexus S also has a slice height larger than
* the video height, but there it actually is real padding, thus
* Galaxy S II is the buggy one. The Galaxy S II decoder is
* named OMX.SEC.avcdec while the one on Nexus S is
* OMX.SEC.AVC.Decoder. Thus do this for any OMX.SEC. that don't
* contain the string ".Decoder". */
if(!strncmp(p_sys->psz_component, "OMX.SEC.", strlen("OMX.SEC.")) &&
!strstr(p_sys->psz_component, ".Decoder"))
def->format.video.nSliceHeight = 0;
if(!GetVlcVideoFormat( def->format.video.eCompressionFormat, if(!GetVlcVideoFormat( def->format.video.eCompressionFormat,
&p_fmt->i_codec, 0 ) ) &p_fmt->i_codec, 0 ) )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment