videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

codec: fix i_level -1 detected as VPx with alpha

pull/162/head
Steve Lhomme 2 years ago
parent
f5556fb02a
commit
bc8308fd6e
11 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/codec/avcodec/fourcc.c
  2. 4
      modules/codec/gstreamer/gstdecode.c
  3. 4
      modules/codec/omxil/mediacodec.c
  4. 8
      modules/codec/omxil/utils.c
  5. 8
      modules/codec/vpx.c
  6. 2
      modules/codec/vpx_alpha.c
  7. 2
      modules/hw/mmal/codec.c
  8. 4
      modules/hw/nvdec/nvdec.c
  9. 2
      modules/packetizer/avparser.c
  10. 4
      modules/stream_out/chromecast/cast.cpp
  11. 2
      modules/stream_out/rtpfmt.c

4
modules/codec/avcodec/fourcc.c
View File

@ -563,9 +563,9 @@ bool GetFfmpegCodec( const es_format_t *es,
const struct vlc_avcodec_fourcc *base;
size_t count;
if (es->i_codec == VLC_CODEC_VP8 && es->i_level) // contains alpha extradata
if (es->i_codec == VLC_CODEC_VP8 && es->i_level != 0 && es->i_level != -1) // contains alpha extradata
return false;
if (es->i_codec == VLC_CODEC_VP9 && es->i_level) // contains alpha extradata
if (es->i_codec == VLC_CODEC_VP9 && es->i_level != 0 && es->i_level != -1) // contains alpha extradata
return false;
switch( es->i_cat )

4
modules/codec/gstreamer/gstdecode.c
View File

@ -408,12 +408,12 @@ static GstStructure* vlc_to_gst_fmt( const es_format_t *p_fmt )
"systemstream", G_TYPE_BOOLEAN, FALSE, NULL );
break;
case VLC_CODEC_VP8:
if (p_fmt->i_level) // contains alpha extradata
if (p_fmt->i_level != 0 && p_fmt->i_level != -1) // contains alpha extradata
return NULL;
p_str = gst_structure_new_empty( "video/x-vp8" );
break;
case VLC_CODEC_VP9:
if (p_fmt->i_level) // contains alpha extradata
if (p_fmt->i_level != 0 && p_fmt->i_level != -1) // contains alpha extradata
return NULL;
p_str = gst_structure_new_empty( "video/x-vp9" );
break;

4
modules/codec/omxil/mediacodec.c
View File

@ -809,11 +809,11 @@ static int OpenDecoder(vlc_object_t *p_this, pf_MediaCodecApi_init pf_init)
case VLC_CODEC_WMV3: mime = "video/x-ms-wmv"; break;
case VLC_CODEC_VC1: mime = "video/wvc1"; break;
case VLC_CODEC_VP8:
if (p_dec->fmt_in->i_level) // contains alpha extradata
if (p_dec->fmt_in->i_level != 0 && p_dec->fmt_in->i_level != -1) // contains alpha extradata
return VLC_ENOTSUP;
mime = "video/x-vnd.on2.vp8"; break;
case VLC_CODEC_VP9:
if (p_dec->fmt_in->i_level) // contains alpha extradata
if (p_dec->fmt_in->i_level != 0 && p_dec->fmt_in->i_level != -1) // contains alpha extradata
return VLC_ENOTSUP;
mime = "video/x-vnd.on2.vp9"; break;
}

8
modules/codec/omxil/utils.c
View File

@ -598,9 +598,9 @@ OMX_VIDEO_CODINGTYPE GetOmxVideoFormat( const es_format_t *es )
for( size_t i = 0; i < ARRAY_SIZE(video_format_table); i++ )
if( video_format_table[i].i_fourcc == i_fourcc )
{
if (es->i_codec == VLC_CODEC_VP8 && es->i_level) // contains alpha extradata
if (es->i_codec == VLC_CODEC_VP8 && es->i_level != 0 && es->i_level != -1) // contains alpha extradata
continue;
if (es->i_codec == VLC_CODEC_VP9 && es->i_level) // contains alpha extradata
if (es->i_codec == VLC_CODEC_VP9 && es->i_level != 0 && es->i_level != -1) // contains alpha extradata
continue;
return video_format_table[i].i_codec;
@ -628,9 +628,9 @@ static const char *GetOmxVideoRole( const es_format_t *es )
for( size_t i = 0; i < ARRAY_SIZE(video_format_table); i++ )
if( video_format_table[i].i_fourcc == i_fourcc )
{
if (es->i_codec == VLC_CODEC_VP8 && es->i_level) // contains alpha extradata
if (es->i_codec == VLC_CODEC_VP8 && es->i_level != 0 && es->i_level != -1) // contains alpha extradata
continue;
if (es->i_codec == VLC_CODEC_VP9 && es->i_level) // contains alpha extradata
if (es->i_codec == VLC_CODEC_VP9 && es->i_level != 0 && es->i_level != -1) // contains alpha extradata
continue;
return video_format_table[i].psz_role;

8
modules/codec/vpx.c
View File

@ -310,7 +310,7 @@ static int OpenDecoder(vlc_object_t *p_this)
{
#ifdef ENABLE_VP8_DECODER
case VLC_CODEC_VP8:
if (dec->fmt_in->i_level) // contains alpha extradata
if (dec->fmt_in->i_level != 0 && dec->fmt_in->i_level != -1) // contains alpha extradata
return VLC_ENOTSUP;
// fallthrough
case VLC_CODEC_WEBP:
@ -321,7 +321,7 @@ static int OpenDecoder(vlc_object_t *p_this)
#endif
#ifdef ENABLE_VP9_DECODER
case VLC_CODEC_VP9:
if (dec->fmt_in->i_level) // contains alpha extradata
if (dec->fmt_in->i_level != 0 && dec->fmt_in->i_level != -1) // contains alpha extradata
return VLC_ENOTSUP;
// fallthrough
case VLC_CODEC_VP9ALPHA_ES:
@ -413,7 +413,7 @@ static int OpenEncoder(vlc_object_t *p_this)
{
#ifdef ENABLE_VP8_ENCODER
case VLC_CODEC_VP8:
if (p_enc->fmt_out.i_level) // contains alpha extradata
if (p_enc->fmt_out.i_level != 0 && p_enc->fmt_out.i_level != -1) // contains alpha extradata
return VLC_ENOTSUP;
// fallthrough
case VLC_CODEC_WEBP:
@ -423,7 +423,7 @@ static int OpenEncoder(vlc_object_t *p_this)
#endif
#ifdef ENABLE_VP9_ENCODER
case VLC_CODEC_VP9:
if (p_enc->fmt_out.i_level) // contains alpha extradata
if (p_enc->fmt_out.i_level != 0 && p_enc->fmt_out.i_level != -1) // contains alpha extradata
return VLC_ENOTSUP;
iface = &vpx_codec_vp9_cx_algo;
vp_version = 9;

2
modules/codec/vpx_alpha.c
View File

@ -438,7 +438,7 @@ int OpenDecoder(vlc_object_t *o)
decoder_t *dec = container_of(o, decoder_t, obj);
if (dec->fmt_in->i_codec != VLC_CODEC_VP8 && dec->fmt_in->i_codec != VLC_CODEC_VP9)
return VLC_ENOTSUP;
if (dec->fmt_in->i_level == 0)
if (dec->fmt_in->i_level == 0 || dec->fmt_in->i_level == -1)
return VLC_ENOTSUP;
vpx_alpha *p_sys = vlc_obj_calloc(o, 1, sizeof(*p_sys));

2
modules/hw/mmal/codec.c
View File

@ -151,7 +151,7 @@ static MMAL_FOURCC_T vlc_to_mmal_es_fourcc(const es_format_t *es)
case VLC_CODEC_VP6:
return MMAL_ENCODING_VP6;
case VLC_CODEC_VP8:
if (es->i_level) // contains alpha extradata
if (es->i_level != 0 && es->i_level != -1) // contains alpha extradata
return 0;
return MMAL_ENCODING_VP8;
case VLC_CODEC_WMV1:

4
modules/hw/nvdec/nvdec.c
View File

@ -815,7 +815,7 @@ static int OpenDecoder(vlc_object_t *p_this)
case VLC_CODEC_MP4V:
break;
case VLC_CODEC_VP8:
if (p_dec->fmt_in->i_level) // contains alpha extradata
if (p_dec->fmt_in->i_level != 0 && p_dec->fmt_in->i_level != -1) // contains alpha extradata
goto early_exit;
break;
case VLC_CODEC_VP9:
@ -824,7 +824,7 @@ static int OpenDecoder(vlc_object_t *p_this)
msg_Warn(p_dec, "Unsupported VP9 profile %d", p_dec->fmt_in->i_profile);
goto early_exit;
}
if (p_dec->fmt_in->i_level) // contains alpha extradata
if (p_dec->fmt_in->i_level != 0 && p_dec->fmt_in->i_level != -1) // contains alpha extradata
goto early_exit;
break;
default:

2
modules/packetizer/avparser.c
View File

@ -88,7 +88,7 @@ int avparser_OpenPacketizer( vlc_object_t *p_this )
/* Restrict to VP9 for now */
if( p_dec->fmt_in->i_codec != VLC_CODEC_VP9 )
return VLC_ENOTSUP;
if( p_dec->fmt_in->i_level ) // contains alpha extradata
if( p_dec->fmt_in->i_level != 0 && p_dec->fmt_in->i_level != -1 ) // contains alpha extradata
return VLC_ENOTSUP;
enum AVCodecID i_avcodec_id;

4
modules/stream_out/chromecast/cast.cpp
View File

@ -773,11 +773,11 @@ bool sout_stream_sys_t::canDecodeVideo( const es_format_t *es ) const
case VLC_CODEC_HEVC:
return true;
case VLC_CODEC_VP8:
if (es->i_level) // contains alpha extradata
if (es->i_level != 0 && es->i_level != -1) // contains alpha extradata
return false;
return true;
case VLC_CODEC_VP9:
if (es->i_level) // contains alpha extradata
if (es->i_level != 0 && es->i_level != -1) // contains alpha extradata
return false;
return true;
default:

2
modules/stream_out/rtpfmt.c
View File

@ -644,7 +644,7 @@ int rtp_get_fmt( vlc_object_t *obj, const es_format_t *p_fmt, const char *mux,
rtp_fmt->fmtp = strdup( "sprop-stereo=1" );
break;
case VLC_CODEC_VP8:
if (p_fmt->i_level) // contains alpha extradata
if (p_fmt->i_level != 0 && p_fmt->i_level != -1) // contains alpha extradata
return VLC_ENOTSUP;
rtp_fmt->ptname = "VP8";
rtp_fmt->pf_packetize = rtp_packetize_vp8;

Write Preview
Loading…
Cancel
Save