diff options
author | wm4 <wm4@nowhere> | 2012-11-05 19:27:38 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-01-13 17:39:31 +0100 |
commit | 06ccd9f6716ffb5220941bea12f345154545862e (patch) | |
tree | 26c2ebdd4e202d0888e76737d79fa9888f4f096d /core/codec-cfg.h | |
parent | 42e0afe641de6eb15d89164e82671b6207402190 (diff) | |
download | mpv-06ccd9f6716ffb5220941bea12f345154545862e.tar.bz2 mpv-06ccd9f6716ffb5220941bea12f345154545862e.tar.xz |
video: simplify decoder pixel format handling
Simplify the decoder pixel format handling by making it handle only
the case vd_lavc needs: a video stream always decodes to a single
pixel format.
Remove the handling for multiple pixel formats, and remove the
codecs.conf pixel format declarations that are left.
Remove the handling of "ambiguous" pixel formats like YV12 vs. I420 (via
VDCTRL_QUERY_FORMAT etc.). This is only a problem if the video chain
supports I420, but not YV12, which doesn't seem to be the case anywhere,
and in fact would not have any advantage.
Make the "flip" flag a global per-codec flag, rather than a pixel format
specific flag. (Some ffmpeg decoders still return a flipped image, so
this has to be done manually.) Also fix handling of the flip operation:
do not overwrite the global flip option, and make the --flip option
invert the codec flip option rather than overriding it.
Diffstat (limited to 'core/codec-cfg.h')
-rw-r--r-- | core/codec-cfg.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/core/codec-cfg.h b/core/codec-cfg.h index 480f570bba..01af497c3d 100644 --- a/core/codec-cfg.h +++ b/core/codec-cfg.h @@ -22,19 +22,9 @@ #include <stdbool.h> #define CODECS_MAX_FOURCC 92 -#define CODECS_MAX_OUTFMT 16 -#define CODECS_MAX_INFMT 16 // Global flags: -#define CODECS_FLAG_SEEKABLE (1<<0) -#define CODECS_FLAG_ALIGN16 (1<<1) - -// Outfmt flags: #define CODECS_FLAG_FLIP (1<<0) -#define CODECS_FLAG_NOFLIP (1<<1) -#define CODECS_FLAG_YUVHACK (1<<2) -#define CODECS_FLAG_QUERY (1<<3) -#define CODECS_FLAG_STATIC (1<<4) #define CODECS_STATUS__MIN 0 #define CODECS_STATUS_NOT_WORKING -1 @@ -59,10 +49,6 @@ typedef struct { typedef struct codecs { unsigned int fourcc[CODECS_MAX_FOURCC]; unsigned int fourccmap[CODECS_MAX_FOURCC]; - unsigned int outfmt[CODECS_MAX_OUTFMT]; - unsigned char outflags[CODECS_MAX_OUTFMT]; - unsigned int infmt[CODECS_MAX_INFMT]; - unsigned char inflags[CODECS_MAX_INFMT]; char *name; char *info; char *comment; |