mirror of https://github.com/mpv-player/mpv
Reformat dec_video.c
"indent -kr -l79 -nut dec_video.c --ignore-newlines dec_video.c", fix some "unknown_typedef * arg" in parameter lists by hand to "unrecognized_typedef *arg".
This commit is contained in:
Uoti Urpala
parent
3fa6f2d3e1
commit
e5b3655e90
|
|
@ -40,104 +40,109 @@ extern double vout_time_usage;
|
|||
|
||||
#include "cpudetect.h"
|
||||
|
||||
int field_dominance=-1;
|
||||
int field_dominance = -1;
|
||||
|
||||
int divx_quality=0;
|
||||
int divx_quality = 0;
|
||||
|
||||
vd_functions_t* mpvdec=NULL;
|
||||
vd_functions_t *mpvdec = NULL;
|
||||
|
||||
int get_video_quality_max(sh_video_t *sh_video){
|
||||
vf_instance_t* vf=sh_video->vfilter;
|
||||
if(vf){
|
||||
int ret=vf->control(vf,VFCTRL_QUERY_MAX_PP_LEVEL,NULL);
|
||||
if(ret>0){
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_UsingExternalPP,ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
if(mpvdec){
|
||||
int ret=mpvdec->control(sh_video,VDCTRL_QUERY_MAX_PP_LEVEL,NULL);
|
||||
if(ret>0){
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_UsingCodecPP,ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
// mp_msg(MSGT_DECVIDEO,MSGL_INFO,"[PP] Sorry, postprocessing is not available\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
void set_video_quality(sh_video_t *sh_video,int quality){
|
||||
vf_instance_t* vf=sh_video->vfilter;
|
||||
if(vf){
|
||||
int ret=vf->control(vf,VFCTRL_SET_PP_LEVEL, (void*)(&quality));
|
||||
if(ret==CONTROL_TRUE) return; // success
|
||||
}
|
||||
if(mpvdec)
|
||||
mpvdec->control(sh_video,VDCTRL_SET_PP_LEVEL, (void*)(&quality));
|
||||
}
|
||||
|
||||
int set_video_colors(sh_video_t *sh_video,const char *item,int value)
|
||||
int get_video_quality_max(sh_video_t *sh_video)
|
||||
{
|
||||
vf_instance_t* vf=sh_video->vfilter;
|
||||
vf_instance_t *vf = sh_video->vfilter;
|
||||
if (vf) {
|
||||
int ret = vf->control(vf, VFCTRL_QUERY_MAX_PP_LEVEL, NULL);
|
||||
if (ret > 0) {
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_UsingExternalPP, ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
if (mpvdec) {
|
||||
int ret = mpvdec->control(sh_video, VDCTRL_QUERY_MAX_PP_LEVEL, NULL);
|
||||
if (ret > 0) {
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_UsingCodecPP, ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
// mp_msg(MSGT_DECVIDEO,MSGL_INFO,"[PP] Sorry, postprocessing is not available\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
void set_video_quality(sh_video_t *sh_video, int quality)
|
||||
{
|
||||
vf_instance_t *vf = sh_video->vfilter;
|
||||
if (vf) {
|
||||
int ret = vf->control(vf, VFCTRL_SET_PP_LEVEL, (void *) (&quality));
|
||||
if (ret == CONTROL_TRUE)
|
||||
return; // success
|
||||
}
|
||||
if (mpvdec)
|
||||
mpvdec->control(sh_video, VDCTRL_SET_PP_LEVEL, (void *) (&quality));
|
||||
}
|
||||
|
||||
int set_video_colors(sh_video_t *sh_video, const char *item, int value)
|
||||
{
|
||||
vf_instance_t *vf = sh_video->vfilter;
|
||||
vf_equalizer_t data;
|
||||
|
||||
data.item = item;
|
||||
data.value = value;
|
||||
|
||||
mp_dbg(MSGT_DECVIDEO,MSGL_V,"set video colors %s=%d \n", item, value);
|
||||
if (vf)
|
||||
{
|
||||
int ret = vf->control(vf, VFCTRL_SET_EQUALIZER, &data);
|
||||
if (ret == CONTROL_TRUE)
|
||||
return(1);
|
||||
mp_dbg(MSGT_DECVIDEO, MSGL_V, "set video colors %s=%d \n", item, value);
|
||||
if (vf) {
|
||||
int ret = vf->control(vf, VFCTRL_SET_EQUALIZER, &data);
|
||||
if (ret == CONTROL_TRUE)
|
||||
return (1);
|
||||
}
|
||||
/* try software control */
|
||||
if(mpvdec)
|
||||
if( mpvdec->control(sh_video,VDCTRL_SET_EQUALIZER, item, (int *)value)
|
||||
== CONTROL_OK) return 1;
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_VideoAttributeNotSupportedByVO_VD,item);
|
||||
if (mpvdec)
|
||||
if (mpvdec->
|
||||
control(sh_video, VDCTRL_SET_EQUALIZER, item, (int *) value)
|
||||
== CONTROL_OK)
|
||||
return 1;
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_VideoAttributeNotSupportedByVO_VD,
|
||||
item);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_video_colors(sh_video_t *sh_video,const char *item,int *value)
|
||||
int get_video_colors(sh_video_t *sh_video, const char *item, int *value)
|
||||
{
|
||||
vf_instance_t* vf=sh_video->vfilter;
|
||||
vf_instance_t *vf = sh_video->vfilter;
|
||||
vf_equalizer_t data;
|
||||
|
||||
data.item = item;
|
||||
|
||||
mp_dbg(MSGT_DECVIDEO,MSGL_V,"get video colors %s \n", item);
|
||||
if (vf)
|
||||
{
|
||||
mp_dbg(MSGT_DECVIDEO, MSGL_V, "get video colors %s \n", item);
|
||||
if (vf) {
|
||||
int ret = vf->control(vf, VFCTRL_GET_EQUALIZER, &data);
|
||||
if (ret == CONTROL_TRUE){
|
||||
*value = data.value;
|
||||
return(1);
|
||||
}
|
||||
if (ret == CONTROL_TRUE) {
|
||||
*value = data.value;
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
/* try software control */
|
||||
if(mpvdec) return mpvdec->control(sh_video,VDCTRL_GET_EQUALIZER, item, value);
|
||||
if (mpvdec)
|
||||
return mpvdec->control(sh_video, VDCTRL_GET_EQUALIZER, item, value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int set_rectangle(sh_video_t *sh_video,int param,int value)
|
||||
int set_rectangle(sh_video_t *sh_video, int param, int value)
|
||||
{
|
||||
vf_instance_t* vf=sh_video->vfilter;
|
||||
int data[] = {param, value};
|
||||
vf_instance_t *vf = sh_video->vfilter;
|
||||
int data[] = { param, value };
|
||||
|
||||
mp_dbg(MSGT_DECVIDEO,MSGL_V,"set rectangle \n");
|
||||
if (vf)
|
||||
{
|
||||
mp_dbg(MSGT_DECVIDEO, MSGL_V, "set rectangle \n");
|
||||
if (vf) {
|
||||
int ret = vf->control(vf, VFCTRL_CHANGE_RECTANGLE, data);
|
||||
if (ret)
|
||||
return(1);
|
||||
if (ret)
|
||||
return (1);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void resync_video_stream(sh_video_t *sh_video)
|
||||
{
|
||||
if(mpvdec) mpvdec->control(sh_video, VDCTRL_RESYNC_STREAM, NULL);
|
||||
if (mpvdec)
|
||||
mpvdec->control(sh_video, VDCTRL_RESYNC_STREAM, NULL);
|
||||
}
|
||||
|
||||
int get_current_video_decoder_lag(sh_video_t *sh_video)
|
||||
|
|
@ -145,192 +150,226 @@ int get_current_video_decoder_lag(sh_video_t *sh_video)
|
|||
int ret;
|
||||
|
||||
if (!mpvdec)
|
||||
return -1;
|
||||
return -1;
|
||||
ret = mpvdec->control(sh_video, VDCTRL_QUERY_UNSEEN_FRAMES, NULL);
|
||||
if (ret >= 10)
|
||||
return ret-10;
|
||||
return ret - 10;
|
||||
return -1;
|
||||
}
|
||||
|
||||
void uninit_video(sh_video_t *sh_video){
|
||||
if(!sh_video->initialized) return;
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideoStr,sh_video->codec->drv);
|
||||
void uninit_video(sh_video_t *sh_video)
|
||||
{
|
||||
if (!sh_video->initialized)
|
||||
return;
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_UninitVideoStr, sh_video->codec->drv);
|
||||
mpvdec->uninit(sh_video);
|
||||
#ifdef DYNAMIC_PLUGINS
|
||||
if (sh_video->dec_handle)
|
||||
dlclose(sh_video->dec_handle);
|
||||
dlclose(sh_video->dec_handle);
|
||||
#endif
|
||||
vf_uninit_filter_chain(sh_video->vfilter);
|
||||
sh_video->initialized=0;
|
||||
sh_video->initialized = 0;
|
||||
}
|
||||
|
||||
void vfm_help(void){
|
||||
void vfm_help(void)
|
||||
{
|
||||
int i;
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_AvailableVideoFm);
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_AvailableVideoFm);
|
||||
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_DRIVERS\n");
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO," vfm: info: (comment)\n");
|
||||
for (i=0; mpcodecs_vd_drivers[i] != NULL; i++)
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,"%8s %s (%s)\n",
|
||||
mpcodecs_vd_drivers[i]->info->short_name,
|
||||
mpcodecs_vd_drivers[i]->info->name,
|
||||
mpcodecs_vd_drivers[i]->info->comment);
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, " vfm: info: (comment)\n");
|
||||
for (i = 0; mpcodecs_vd_drivers[i] != NULL; i++)
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, "%8s %s (%s)\n",
|
||||
mpcodecs_vd_drivers[i]->info->short_name,
|
||||
mpcodecs_vd_drivers[i]->info->name,
|
||||
mpcodecs_vd_drivers[i]->info->comment);
|
||||
}
|
||||
|
||||
static int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status,
|
||||
stringset_t *selected){
|
||||
static int init_video(sh_video_t *sh_video, char *codecname, char *vfm,
|
||||
int status, stringset_t *selected)
|
||||
{
|
||||
int force = 0;
|
||||
unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0;
|
||||
sh_video->codec=NULL;
|
||||
sh_video->vf_initialized=0;
|
||||
unsigned int orig_fourcc =
|
||||
sh_video->bih ? sh_video->bih->biCompression : 0;
|
||||
sh_video->codec = NULL;
|
||||
sh_video->vf_initialized = 0;
|
||||
if (codecname && codecname[0] == '+') {
|
||||
codecname = &codecname[1];
|
||||
force = 1;
|
||||
codecname = &codecname[1];
|
||||
force = 1;
|
||||
}
|
||||
|
||||
while(1){
|
||||
int i;
|
||||
int orig_w, orig_h;
|
||||
// restore original fourcc:
|
||||
if(sh_video->bih) sh_video->bih->biCompression=orig_fourcc;
|
||||
if(!(sh_video->codec=find_video_codec(sh_video->format,
|
||||
sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,
|
||||
sh_video->codec,force) )) break;
|
||||
// ok we found one codec
|
||||
if(stringset_test(selected, sh_video->codec->name)) continue; // already tried & failed
|
||||
if(codecname && strcmp(sh_video->codec->name,codecname)) continue; // -vc
|
||||
if(vfm && strcmp(sh_video->codec->drv,vfm)) continue; // vfm doesn't match
|
||||
if(!force && sh_video->codec->status<status) continue; // too unstable
|
||||
stringset_add(selected, sh_video->codec->name); // tagging it
|
||||
// ok, it matches all rules, let's find the driver!
|
||||
for (i=0; mpcodecs_vd_drivers[i] != NULL; i++)
|
||||
// if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break;
|
||||
if(!strcmp(mpcodecs_vd_drivers[i]->info->short_name,sh_video->codec->drv)) break;
|
||||
mpvdec=mpcodecs_vd_drivers[i];
|
||||
while (1) {
|
||||
int i;
|
||||
int orig_w, orig_h;
|
||||
// restore original fourcc:
|
||||
if (sh_video->bih)
|
||||
sh_video->bih->biCompression = orig_fourcc;
|
||||
if (!
|
||||
(sh_video->codec =
|
||||
find_video_codec(sh_video->format,
|
||||
sh_video->bih ? ((unsigned int *) &sh_video->
|
||||
bih->biCompression) : NULL,
|
||||
sh_video->codec, force)))
|
||||
break;
|
||||
// ok we found one codec
|
||||
if (stringset_test(selected, sh_video->codec->name))
|
||||
continue; // already tried & failed
|
||||
if (codecname && strcmp(sh_video->codec->name, codecname))
|
||||
continue; // -vc
|
||||
if (vfm && strcmp(sh_video->codec->drv, vfm))
|
||||
continue; // vfm doesn't match
|
||||
if (!force && sh_video->codec->status < status)
|
||||
continue; // too unstable
|
||||
stringset_add(selected, sh_video->codec->name); // tagging it
|
||||
// ok, it matches all rules, let's find the driver!
|
||||
for (i = 0; mpcodecs_vd_drivers[i] != NULL; i++)
|
||||
// if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break;
|
||||
if (!strcmp
|
||||
(mpcodecs_vd_drivers[i]->info->short_name,
|
||||
sh_video->codec->drv))
|
||||
break;
|
||||
mpvdec = mpcodecs_vd_drivers[i];
|
||||
#ifdef DYNAMIC_PLUGINS
|
||||
if (!mpvdec)
|
||||
{
|
||||
/* try to open shared decoder plugin */
|
||||
int buf_len;
|
||||
char *buf;
|
||||
vd_functions_t *funcs_sym;
|
||||
vd_info_t *info_sym;
|
||||
if (!mpvdec) {
|
||||
/* try to open shared decoder plugin */
|
||||
int buf_len;
|
||||
char *buf;
|
||||
vd_functions_t *funcs_sym;
|
||||
vd_info_t *info_sym;
|
||||
|
||||
buf_len = strlen(MPLAYER_LIBDIR)+strlen(sh_video->codec->drv)+16;
|
||||
buf = malloc(buf_len);
|
||||
if (!buf)
|
||||
break;
|
||||
snprintf(buf, buf_len, "%s/mplayer/vd_%s.so", MPLAYER_LIBDIR, sh_video->codec->drv);
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Trying to open external plugin: %s\n", buf);
|
||||
sh_video->dec_handle = dlopen(buf, RTLD_LAZY);
|
||||
if (!sh_video->dec_handle)
|
||||
break;
|
||||
snprintf(buf, buf_len, "mpcodecs_vd_%s", sh_video->codec->drv);
|
||||
funcs_sym = dlsym(sh_video->dec_handle, buf);
|
||||
if (!funcs_sym || !funcs_sym->info || !funcs_sym->init ||
|
||||
!funcs_sym->uninit || !funcs_sym->control || !funcs_sym->decode)
|
||||
break;
|
||||
info_sym = funcs_sym->info;
|
||||
if (strcmp(info_sym->short_name, sh_video->codec->drv))
|
||||
break;
|
||||
free(buf);
|
||||
mpvdec = funcs_sym;
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_V, "Using external decoder plugin (%s/mplayer/vd_%s.so)!\n",
|
||||
MPLAYER_LIBDIR, sh_video->codec->drv);
|
||||
}
|
||||
buf_len =
|
||||
strlen(MPLAYER_LIBDIR) + strlen(sh_video->codec->drv) + 16;
|
||||
buf = malloc(buf_len);
|
||||
if (!buf)
|
||||
break;
|
||||
snprintf(buf, buf_len, "%s/mplayer/vd_%s.so", MPLAYER_LIBDIR,
|
||||
sh_video->codec->drv);
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_DBG2,
|
||||
"Trying to open external plugin: %s\n", buf);
|
||||
sh_video->dec_handle = dlopen(buf, RTLD_LAZY);
|
||||
if (!sh_video->dec_handle)
|
||||
break;
|
||||
snprintf(buf, buf_len, "mpcodecs_vd_%s", sh_video->codec->drv);
|
||||
funcs_sym = dlsym(sh_video->dec_handle, buf);
|
||||
if (!funcs_sym || !funcs_sym->info || !funcs_sym->init
|
||||
|| !funcs_sym->uninit || !funcs_sym->control
|
||||
|| !funcs_sym->decode)
|
||||
break;
|
||||
info_sym = funcs_sym->info;
|
||||
if (strcmp(info_sym->short_name, sh_video->codec->drv))
|
||||
break;
|
||||
free(buf);
|
||||
mpvdec = funcs_sym;
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_V,
|
||||
"Using external decoder plugin (%s/mplayer/vd_%s.so)!\n",
|
||||
MPLAYER_LIBDIR, sh_video->codec->drv);
|
||||
}
|
||||
#endif
|
||||
if(!mpvdec){ // driver not available (==compiled in)
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_VideoCodecFamilyNotAvailableStr,
|
||||
sh_video->codec->name, sh_video->codec->drv);
|
||||
continue;
|
||||
}
|
||||
orig_w = sh_video->bih ? sh_video->bih->biWidth : sh_video->disp_w;
|
||||
orig_h = sh_video->bih ? sh_video->bih->biHeight : sh_video->disp_h;
|
||||
sh_video->disp_w = orig_w;
|
||||
sh_video->disp_h = orig_h;
|
||||
// it's available, let's try to init!
|
||||
if(sh_video->codec->flags & CODECS_FLAG_ALIGN16){
|
||||
// align width/height to n*16
|
||||
sh_video->disp_w=(sh_video->disp_w+15)&(~15);
|
||||
sh_video->disp_h=(sh_video->disp_h+15)&(~15);
|
||||
}
|
||||
if (sh_video->bih) {
|
||||
sh_video->bih->biWidth = sh_video->disp_w;
|
||||
sh_video->bih->biHeight = sh_video->disp_h;
|
||||
}
|
||||
// init()
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_OpeningVideoDecoder,mpvdec->info->short_name,mpvdec->info->name);
|
||||
// clear vf init error, it is no longer relevant
|
||||
if (sh_video->vf_initialized < 0)
|
||||
sh_video->vf_initialized = 0;
|
||||
if(!mpvdec->init(sh_video)){
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VDecoderInitFailed);
|
||||
sh_video->disp_w=orig_w;
|
||||
sh_video->disp_h=orig_h;
|
||||
if (sh_video->bih) {
|
||||
sh_video->bih->biWidth = sh_video->disp_w;
|
||||
sh_video->bih->biHeight = sh_video->disp_h;
|
||||
}
|
||||
continue; // try next...
|
||||
}
|
||||
// Yeah! We got it!
|
||||
sh_video->initialized=1;
|
||||
return 1;
|
||||
if (!mpvdec) { // driver not available (==compiled in)
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_WARN,
|
||||
MSGTR_VideoCodecFamilyNotAvailableStr,
|
||||
sh_video->codec->name, sh_video->codec->drv);
|
||||
continue;
|
||||
}
|
||||
orig_w = sh_video->bih ? sh_video->bih->biWidth : sh_video->disp_w;
|
||||
orig_h = sh_video->bih ? sh_video->bih->biHeight : sh_video->disp_h;
|
||||
sh_video->disp_w = orig_w;
|
||||
sh_video->disp_h = orig_h;
|
||||
// it's available, let's try to init!
|
||||
if (sh_video->codec->flags & CODECS_FLAG_ALIGN16) {
|
||||
// align width/height to n*16
|
||||
sh_video->disp_w = (sh_video->disp_w + 15) & (~15);
|
||||
sh_video->disp_h = (sh_video->disp_h + 15) & (~15);
|
||||
}
|
||||
if (sh_video->bih) {
|
||||
sh_video->bih->biWidth = sh_video->disp_w;
|
||||
sh_video->bih->biHeight = sh_video->disp_h;
|
||||
}
|
||||
// init()
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_OpeningVideoDecoder,
|
||||
mpvdec->info->short_name, mpvdec->info->name);
|
||||
// clear vf init error, it is no longer relevant
|
||||
if (sh_video->vf_initialized < 0)
|
||||
sh_video->vf_initialized = 0;
|
||||
if (!mpvdec->init(sh_video)) {
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_VDecoderInitFailed);
|
||||
sh_video->disp_w = orig_w;
|
||||
sh_video->disp_h = orig_h;
|
||||
if (sh_video->bih) {
|
||||
sh_video->bih->biWidth = sh_video->disp_w;
|
||||
sh_video->bih->biHeight = sh_video->disp_h;
|
||||
}
|
||||
continue; // try next...
|
||||
}
|
||||
// Yeah! We got it!
|
||||
sh_video->initialized = 1;
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int init_best_video_codec(sh_video_t *sh_video,char** video_codec_list,char** video_fm_list){
|
||||
char* vc_l_default[2]={"",(char*)NULL};
|
||||
stringset_t selected;
|
||||
int init_best_video_codec(sh_video_t *sh_video, char **video_codec_list,
|
||||
char **video_fm_list)
|
||||
{
|
||||
char *vc_l_default[2] = { "", (char *) NULL };
|
||||
stringset_t selected;
|
||||
// hack:
|
||||
if(!video_codec_list) video_codec_list=vc_l_default;
|
||||
if (!video_codec_list)
|
||||
video_codec_list = vc_l_default;
|
||||
// Go through the codec.conf and find the best codec...
|
||||
sh_video->initialized=0;
|
||||
stringset_init(&selected);
|
||||
while(!sh_video->initialized && *video_codec_list){
|
||||
char* video_codec=*(video_codec_list++);
|
||||
if(video_codec[0]){
|
||||
if(video_codec[0]=='-'){
|
||||
// disable this codec:
|
||||
stringset_add(&selected, video_codec+1);
|
||||
} else {
|
||||
// forced codec by name:
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_ForcedVideoCodec,video_codec);
|
||||
init_video(sh_video,video_codec,NULL,-1, &selected);
|
||||
sh_video->initialized = 0;
|
||||
stringset_init(&selected);
|
||||
while (!sh_video->initialized && *video_codec_list) {
|
||||
char *video_codec = *(video_codec_list++);
|
||||
if (video_codec[0]) {
|
||||
if (video_codec[0] == '-') {
|
||||
// disable this codec:
|
||||
stringset_add(&selected, video_codec + 1);
|
||||
} else {
|
||||
// forced codec by name:
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_ForcedVideoCodec,
|
||||
video_codec);
|
||||
init_video(sh_video, video_codec, NULL, -1, &selected);
|
||||
}
|
||||
} else {
|
||||
int status;
|
||||
// try in stability order: UNTESTED, WORKING, BUGGY. never try CRASHING.
|
||||
if (video_fm_list) {
|
||||
char **fmlist = video_fm_list;
|
||||
// try first the preferred codec families:
|
||||
while (!sh_video->initialized && *fmlist) {
|
||||
char *video_fm = *(fmlist++);
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_TryForceVideoFmtStr,
|
||||
video_fm);
|
||||
for (status = CODECS_STATUS__MAX;
|
||||
status >= CODECS_STATUS__MIN; --status)
|
||||
if (init_video
|
||||
(sh_video, NULL, video_fm, status, &selected))
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!sh_video->initialized)
|
||||
for (status = CODECS_STATUS__MAX; status >= CODECS_STATUS__MIN;
|
||||
--status)
|
||||
if (init_video(sh_video, NULL, NULL, status, &selected))
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int status;
|
||||
// try in stability order: UNTESTED, WORKING, BUGGY. never try CRASHING.
|
||||
if(video_fm_list){
|
||||
char** fmlist=video_fm_list;
|
||||
// try first the preferred codec families:
|
||||
while(!sh_video->initialized && *fmlist){
|
||||
char* video_fm=*(fmlist++);
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_TryForceVideoFmtStr,video_fm);
|
||||
for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status)
|
||||
if(init_video(sh_video,NULL,video_fm,status, &selected)) break;
|
||||
}
|
||||
stringset_free(&selected);
|
||||
|
||||
if (!sh_video->initialized) {
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantFindVideoCodec,
|
||||
sh_video->format);
|
||||
mp_msg(MSGT_DECAUDIO, MSGL_HINT, MSGTR_RTFMCodecs);
|
||||
return 0; // failed
|
||||
}
|
||||
if(!sh_video->initialized)
|
||||
for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status)
|
||||
if(init_video(sh_video,NULL,NULL,status, &selected)) break;
|
||||
}
|
||||
}
|
||||
stringset_free(&selected);
|
||||
|
||||
if(!sh_video->initialized){
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
|
||||
mp_msg(MSGT_DECAUDIO,MSGL_HINT, MSGTR_RTFMCodecs);
|
||||
return 0; // failed
|
||||
}
|
||||
|
||||
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_SelectedVideoCodec,
|
||||
sh_video->codec->name,sh_video->codec->drv,sh_video->codec->info);
|
||||
return 1; // success
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_SelectedVideoCodec,
|
||||
sh_video->codec->name, sh_video->codec->drv, sh_video->codec->info);
|
||||
return 1; // success
|
||||
}
|
||||
|
||||
void *decode_video(sh_video_t *sh_video, unsigned char *start, int in_size,
|
||||
int drop_frame, double pts)
|
||||
int drop_frame, double pts)
|
||||
{
|
||||
mp_image_t *mpi = NULL;
|
||||
unsigned int t = GetTimer();
|
||||
|
|
@ -339,33 +378,33 @@ void *decode_video(sh_video_t *sh_video, unsigned char *start, int in_size,
|
|||
struct MPOpts *opts = sh_video->opts;
|
||||
|
||||
if (opts->correct_pts && pts != MP_NOPTS_VALUE) {
|
||||
int delay = get_current_video_decoder_lag(sh_video);
|
||||
if (delay >= 0) {
|
||||
if (delay > sh_video->num_buffered_pts)
|
||||
int delay = get_current_video_decoder_lag(sh_video);
|
||||
if (delay >= 0) {
|
||||
if (delay > sh_video->num_buffered_pts)
|
||||
#if 0
|
||||
// this is disabled because vd_ffmpeg reports the same lag
|
||||
// after seek even when there are no buffered frames,
|
||||
// leading to incorrect error messages
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Not enough buffered pts\n");
|
||||
// this is disabled because vd_ffmpeg reports the same lag
|
||||
// after seek even when there are no buffered frames,
|
||||
// leading to incorrect error messages
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Not enough buffered pts\n");
|
||||
#else
|
||||
;
|
||||
;
|
||||
#endif
|
||||
else
|
||||
sh_video->num_buffered_pts = delay;
|
||||
}
|
||||
if (sh_video->num_buffered_pts ==
|
||||
sizeof(sh_video->buffered_pts)/sizeof(double))
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Too many buffered pts\n");
|
||||
else {
|
||||
int i, j;
|
||||
for (i = 0; i < sh_video->num_buffered_pts; i++)
|
||||
if (sh_video->buffered_pts[i] < pts)
|
||||
break;
|
||||
for (j = sh_video->num_buffered_pts; j > i; j--)
|
||||
sh_video->buffered_pts[j] = sh_video->buffered_pts[j-1];
|
||||
sh_video->buffered_pts[i] = pts;
|
||||
sh_video->num_buffered_pts++;
|
||||
}
|
||||
else
|
||||
sh_video->num_buffered_pts = delay;
|
||||
}
|
||||
if (sh_video->num_buffered_pts ==
|
||||
sizeof(sh_video->buffered_pts) / sizeof(double))
|
||||
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Too many buffered pts\n");
|
||||
else {
|
||||
int i, j;
|
||||
for (i = 0; i < sh_video->num_buffered_pts; i++)
|
||||
if (sh_video->buffered_pts[i] < pts)
|
||||
break;
|
||||
for (j = sh_video->num_buffered_pts; j > i; j--)
|
||||
sh_video->buffered_pts[j] = sh_video->buffered_pts[j - 1];
|
||||
sh_video->buffered_pts[i] = pts;
|
||||
sh_video->num_buffered_pts++;
|
||||
}
|
||||
}
|
||||
|
||||
mpi = mpvdec->decode(sh_video, start, in_size, drop_frame);
|
||||
|
|
@ -376,35 +415,34 @@ void *decode_video(sh_video_t *sh_video, unsigned char *start, int in_size,
|
|||
// some codecs are broken, and doesn't restore MMX state :(
|
||||
// it happens usually with broken/damaged files.
|
||||
if (gCpuCaps.has3DNow) {
|
||||
__asm __volatile ("femms\n\t":::"memory");
|
||||
}
|
||||
else if (gCpuCaps.hasMMX) {
|
||||
__asm __volatile ("emms\n\t":::"memory");
|
||||
__asm __volatile("femms\n\t":::"memory");
|
||||
} else if (gCpuCaps.hasMMX) {
|
||||
__asm __volatile("emms\n\t":::"memory");
|
||||
}
|
||||
#endif
|
||||
|
||||
t2 = GetTimer(); t = t2-t;
|
||||
tt = t*0.000001f;
|
||||
t2 = GetTimer();
|
||||
t = t2 - t;
|
||||
tt = t * 0.000001f;
|
||||
video_time_usage += tt;
|
||||
|
||||
if (!mpi || drop_frame)
|
||||
return NULL; // error / skipped frame
|
||||
return NULL; // error / skipped frame
|
||||
|
||||
if (field_dominance == 0)
|
||||
mpi->fields |= MP_IMGFIELD_TOP_FIRST;
|
||||
mpi->fields |= MP_IMGFIELD_TOP_FIRST;
|
||||
else if (field_dominance == 1)
|
||||
mpi->fields &= ~MP_IMGFIELD_TOP_FIRST;
|
||||
mpi->fields &= ~MP_IMGFIELD_TOP_FIRST;
|
||||
|
||||
if (opts->correct_pts) {
|
||||
if (sh_video->num_buffered_pts) {
|
||||
sh_video->num_buffered_pts--;
|
||||
sh_video->pts = sh_video->buffered_pts[sh_video->num_buffered_pts];
|
||||
}
|
||||
else {
|
||||
mp_msg(MSGT_CPLAYER, MSGL_ERR, "No pts value from demuxer to "
|
||||
"use for frame!\n");
|
||||
sh_video->pts = MP_NOPTS_VALUE;
|
||||
}
|
||||
if (sh_video->num_buffered_pts) {
|
||||
sh_video->num_buffered_pts--;
|
||||
sh_video->pts = sh_video->buffered_pts[sh_video->num_buffered_pts];
|
||||
} else {
|
||||
mp_msg(MSGT_CPLAYER, MSGL_ERR,
|
||||
"No pts value from demuxer to " "use for frame!\n");
|
||||
sh_video->pts = MP_NOPTS_VALUE;
|
||||
}
|
||||
}
|
||||
return mpi;
|
||||
}
|
||||
|
|
@ -417,14 +455,14 @@ int filter_video(sh_video_t *sh_video, void *frame, double pts)
|
|||
// apply video filters and call the leaf vo/ve
|
||||
int ret = vf->put_image(vf, mpi, pts);
|
||||
if (ret > 0) {
|
||||
vf->control(vf, VFCTRL_DRAW_OSD, NULL);
|
||||
vf->control(vf, VFCTRL_DRAW_OSD, NULL);
|
||||
#ifdef USE_ASS
|
||||
vf->control(vf, VFCTRL_DRAW_EOSD, NULL);
|
||||
vf->control(vf, VFCTRL_DRAW_EOSD, NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
t2 = GetTimer()-t2;
|
||||
vout_time_usage += t2*0.000001;
|
||||
t2 = GetTimer() - t2;
|
||||
vout_time_usage += t2 * 0.000001;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue