]> git.sesse.net Git - vlc/commitdiff
Revert "omxil: Set the WMV type"
authorMartin Storsjö <martin@martin.st>
Sat, 2 Feb 2013 13:24:20 +0000 (15:24 +0200)
committerMartin Storsjö <martin@martin.st>
Sat, 2 Feb 2013 17:37:22 +0000 (19:37 +0200)
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@martin.st>
modules/codec/omxil/omxil.c

index e70609016b7d86e3ee1d8b0bee91390fa122b3fd..4c233286b251783ea53fde755b6f086a7c2c24a1 100644 (file)
@@ -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;
 }