diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /libmpcodecs/vd_theora.c | |
parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'libmpcodecs/vd_theora.c')
-rw-r--r-- | libmpcodecs/vd_theora.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index 35e3edfab8..b8be6d747b 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -41,11 +41,28 @@ LIBVD_EXTERN(theora) #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 static int control(sh_video_t *sh,int cmd,void* arg,...){ + theora_struct_t *context = sh->context; switch(cmd) { case VDCTRL_QUERY_FORMAT: - if (*(int*)arg == IMGFMT_YV12) + if (*(int*)arg == theora_pixelformat2imgfmt(context->inf.pixelformat)) return CONTROL_TRUE; return CONTROL_FALSE; } @@ -53,12 +70,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ return CONTROL_UNKNOWN; } -typedef struct theora_struct_st { - theora_state st; - theora_comment cc; - theora_info inf; -} theora_struct_t; - /* * 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"); - 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: free(context); |