[vlc-commits] omxil: all video decoders need a valid size
Thomas Guillem
git at videolan.org
Thu May 26 11:57:09 CEST 2016
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu May 26 10:56:31 2016 +0200| [500774f33ad6617187583068bcc57c883f8732af] | committer: Thomas Guillem
omxil: all video decoders need a valid size
Therefore, this is not a quirk.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=500774f33ad6617187583068bcc57c883f8732af
---
modules/codec/omxil/mediacodec.h | 5 ++---
modules/codec/omxil/omxil_utils.h | 5 ++---
modules/codec/omxil/utils.c | 1 -
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/modules/codec/omxil/mediacodec.h b/modules/codec/omxil/mediacodec.h
index 4adbd56..e68b66f 100644
--- a/modules/codec/omxil/mediacodec.h
+++ b/modules/codec/omxil/mediacodec.h
@@ -41,9 +41,8 @@ int MediaCodecNdk_Init(mc_api*);
/* in sync with OMXCODEC QUIRKS */
#define MC_API_NO_QUIRKS 0
#define MC_API_QUIRKS_NEED_CSD 0x1
-#define MC_API_VIDEO_QUIRKS_NEED_SIZE 0x2
-#define MC_API_VIDEO_QUIRKS_IGNORE_PADDING 0x4
-#define MC_API_AUDIO_QUIRKS_NEED_CHANNELS 0x8
+#define MC_API_VIDEO_QUIRKS_IGNORE_PADDING 0x2
+#define MC_API_AUDIO_QUIRKS_NEED_CHANNELS 0x4
struct mc_api_out
{
diff --git a/modules/codec/omxil/omxil_utils.h b/modules/codec/omxil/omxil_utils.h
index 5273b8e..eefc4c1 100644
--- a/modules/codec/omxil/omxil_utils.h
+++ b/modules/codec/omxil/omxil_utils.h
@@ -227,9 +227,8 @@ bool OMXCodec_IsBlacklisted( const char *p_name, unsigned int i_name_len );
enum {
OMXCODEC_NO_QUIRKS = 0,
OMXCODEC_QUIRKS_NEED_CSD = 0x1,
- OMXCODEC_VIDEO_QUIRKS_NEED_SIZE = 0x2,
- OMXCODEC_VIDEO_QUIRKS_IGNORE_PADDING = 0x4,
- OMXCODEC_AUDIO_QUIRKS_NEED_CHANNELS = 0x8,
+ OMXCODEC_VIDEO_QUIRKS_IGNORE_PADDING = 0x2,
+ OMXCODEC_AUDIO_QUIRKS_NEED_CHANNELS = 0x4,
};
int OMXCodec_GetQuirks( int i_cat, vlc_fourcc_t i_codec,
const char *p_name, unsigned int i_name_len );
diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c
index 37e8546..aa2cb5f 100644
--- a/modules/codec/omxil/utils.c
+++ b/modules/codec/omxil/utils.c
@@ -380,7 +380,6 @@ int OMXCodec_GetQuirks( int i_cat, vlc_fourcc_t i_codec,
if( i_cat == VIDEO_ES )
{
- i_quirks |= OMXCODEC_VIDEO_QUIRKS_NEED_SIZE;
switch( i_codec )
{
case VLC_CODEC_H264:
More information about the vlc-commits
mailing list