mirror of https://github.com/mpv-player/mpv
Add support for decoding 4:2:2 and 4:4:4 Theora files.
Patch by Giorgio Vazzana [mywing81 gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30585 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c2c64b459f
commit
f452c1262f
|
@ -584,7 +584,7 @@ videocodec theora
|
||||||
fourcc theo,Thra
|
fourcc theo,Thra
|
||||||
driver theora
|
driver theora
|
||||||
dll libtheora
|
dll libtheora
|
||||||
out YV12
|
out YV12,422P,444P
|
||||||
|
|
||||||
; prefer native codecs over win32?
|
; prefer native codecs over win32?
|
||||||
; the win32 codecs probably are (better) optimized and support direct
|
; the win32 codecs probably are (better) optimized and support direct
|
||||||
|
|
|
@ -41,11 +41,28 @@ LIBVD_EXTERN(theora)
|
||||||
|
|
||||||
#define THEORA_NUM_HEADER_PACKETS 3
|
#define THEORA_NUM_HEADER_PACKETS 3
|
||||||
|
|
||||||
|
typedef struct theora_struct_st {
|
||||||
|
theora_state st;
|
||||||
|
theora_comment cc;
|
||||||
|
theora_info inf;
|
||||||
|
} theora_struct_t;
|
||||||
|
|
||||||
|
/** Convert Theora pixelformat to the corresponding IMGFMT_ */
|
||||||
|
static uint32_t theora_pixelformat2imgfmt(theora_pixelformat fmt){
|
||||||
|
switch(fmt) {
|
||||||
|
case OC_PF_420: return IMGFMT_YV12;
|
||||||
|
case OC_PF_422: return IMGFMT_422P;
|
||||||
|
case OC_PF_444: return IMGFMT_444P;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
// to set/get/query special features/parameters
|
// to set/get/query special features/parameters
|
||||||
static int control(sh_video_t *sh,int cmd,void* arg,...){
|
static int control(sh_video_t *sh,int cmd,void* arg,...){
|
||||||
|
theora_struct_t *context = sh->context;
|
||||||
switch(cmd) {
|
switch(cmd) {
|
||||||
case VDCTRL_QUERY_FORMAT:
|
case VDCTRL_QUERY_FORMAT:
|
||||||
if (*(int*)arg == IMGFMT_YV12)
|
if (*(int*)arg == theora_pixelformat2imgfmt(context->inf.pixelformat))
|
||||||
return CONTROL_TRUE;
|
return CONTROL_TRUE;
|
||||||
return CONTROL_FALSE;
|
return CONTROL_FALSE;
|
||||||
}
|
}
|
||||||
|
@ -53,12 +70,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
|
||||||
return CONTROL_UNKNOWN;
|
return CONTROL_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct theora_struct_st {
|
|
||||||
theora_state st;
|
|
||||||
theora_comment cc;
|
|
||||||
theora_info inf;
|
|
||||||
} theora_struct_t;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* init driver
|
* init driver
|
||||||
*/
|
*/
|
||||||
|
@ -104,7 +115,7 @@ static int init(sh_video_t *sh){
|
||||||
|
|
||||||
mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n");
|
mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n");
|
||||||
|
|
||||||
return mpcodecs_config_vo (sh,context->inf.frame_width,context->inf.frame_height,IMGFMT_YV12);
|
return mpcodecs_config_vo (sh,context->inf.frame_width,context->inf.frame_height,theora_pixelformat2imgfmt(context->inf.pixelformat));
|
||||||
|
|
||||||
err_out:
|
err_out:
|
||||||
free(context);
|
free(context);
|
||||||
|
|
Loading…
Reference in New Issue