[vlc-commits] Revert "omxil: Set the WMV type"
Martin Storsjö
git at videolan.org
Sat Feb 2 18:42:50 CET 2013
vlc | branch: master | Martin Storsjö <martin at martin.st> | Sat Feb 2 15:24:20 2013 +0200| [9d5daca226178bb1bdffa017082be29a4fdc84a8] | committer: Martin Storsjö
Revert "omxil: Set the WMV type"
This reverts commit c73e88ce9a79f1b76e7e6a9ec1cf5781555994a5.
The WMV1/2 decoders use a different role name, and this parameter
is unsupported on them. Therefore, there's not much use in trying to
set it at all.
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d5daca226178bb1bdffa017082be29a4fdc84a8
---
modules/codec/omxil/omxil.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index e706090..4c23328 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -437,27 +437,6 @@ static OMX_ERRORTYPE SetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
def->nBufferSize *= 2;
}
- if (def->format.video.eCompressionFormat == OMX_VIDEO_CodingWMV) {
- OMX_VIDEO_PARAM_WMVTYPE wmvtype = { 0 };
- OMX_INIT_STRUCTURE(wmvtype);
- wmvtype.nPortIndex = def->nPortIndex;
- switch (p_dec->fmt_in.i_codec) {
- case VLC_CODEC_WMV1:
- wmvtype.eFormat = OMX_VIDEO_WMVFormat7;
- break;
- case VLC_CODEC_WMV2:
- wmvtype.eFormat = OMX_VIDEO_WMVFormat8;
- break;
- case VLC_CODEC_WMV3:
- case VLC_CODEC_VC1:
- wmvtype.eFormat = OMX_VIDEO_WMVFormat9;
- break;
- }
- omx_error = OMX_SetParameter(p_port->omx_handle, OMX_IndexParamVideoWmv, &wmvtype);
- CHECK_ERROR(omx_error, "OMX_SetParameter OMX_IndexParamVideoWmv failed (%x : %s)",
- omx_error, ErrorToString(omx_error));
- }
-
error:
return omx_error;
}
More information about the vlc-commits
mailing list