Commit beec7a39 authored by Antoine Cellerier's avatar Antoine Cellerier Committed by Jean-Paul Saman

Slight fix in VLC to XDM chroma conversion code.

Signed-off-by: Jean-Paul Saman's avatarJean-Paul Saman <jean-paul.saman@m2x.nl>
parent 354bc77a
...@@ -268,6 +268,6 @@ XDAS_Int32 VlcChromaToXdm( vlc_fourcc_t i_chroma ) ...@@ -268,6 +268,6 @@ XDAS_Int32 VlcChromaToXdm( vlc_fourcc_t i_chroma )
#endif #endif
default: default:
return 0; return XDM_CHROMA_NA;
} }
} }
...@@ -152,8 +152,12 @@ int OpenVideoDecoder( vlc_object_t *p_this ) ...@@ -152,8 +152,12 @@ int OpenVideoDecoder( vlc_object_t *p_this )
params.maxBitRate = 0; /* in bits per second */ params.maxBitRate = 0; /* in bits per second */
params.dataEndianness = XDM_BYTE;//LE_32; params.dataEndianness = XDM_BYTE;//LE_32;
params.forceChromaFormat = VlcChromaToXdm( i_chroma ); params.forceChromaFormat = VlcChromaToXdm( i_chroma );
/* Or do we want to output directly to XDM_YUV_422ILE as that's what the if( params.forceChromaFormat == XDM_CHROMA_NA )
* frame buffer likes? */ {
msg_Err( p_dec, "Unsupported output chroma (%4.4s).",
(const char *)&i_chroma );
goto error;
}
p_sys->d = VIDDEC_create( p_sys->e, (String)psz_codec, &params ); p_sys->d = VIDDEC_create( p_sys->e, (String)psz_codec, &params );
if( !p_sys->d ) if( !p_sys->d )
......
...@@ -148,7 +148,7 @@ int OpenVideoEncoder( vlc_object_t *p_this ) ...@@ -148,7 +148,7 @@ int OpenVideoEncoder( vlc_object_t *p_this )
params.dataEndianness = XDM_BYTE; params.dataEndianness = XDM_BYTE;
params.maxInterFrameInterval = p_enc->i_iframes; /* FIXME? */ params.maxInterFrameInterval = p_enc->i_iframes; /* FIXME? */
params.inputChromaFormat = VlcChromaToXdm( p_enc->fmt_in.video.i_chroma ); params.inputChromaFormat = VlcChromaToXdm( p_enc->fmt_in.video.i_chroma );
if( !params.inputChromaFormat ) if( params.inputChromaFormat == XDM_CHROMA_NA )
{ {
msg_Err( p_enc, "Unsupported input chroma (%4.4s).", msg_Err( p_enc, "Unsupported input chroma (%4.4s).",
(const char *)&p_enc->fmt_in.video.i_chroma ); (const char *)&p_enc->fmt_in.video.i_chroma );
......
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