annotate libmpcodecs/vd_xvid.c @ 7310:d8e2623a2ea1

Don't try to reread from the socket if the server says EOF
author bertrand
date Sat, 07 Sep 2002 20:38:44 +0000
parents 28677d779205
children 800d77666843
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
1 #include <stdio.h>
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
2 #include <stdlib.h>
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
3
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
4 #include "config.h"
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
5 #include "mp_msg.h"
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
6
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
7 #ifdef HAVE_XVID
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
8
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
9 #include "vd_internal.h"
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
10 #include "cfgparser.h"
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
11
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
12 #include <divx4.h>
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
13 #include <xvid.h>
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
14
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
15 static vd_info_t info =
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
16 {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
17 "xvid decoder",
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
18 "xvid",
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
19 "Albeu",
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
20 "Albeu",
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
21 ""
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
22 };
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
23
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
24 LIBVD_EXTERN(xvid)
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
25
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
26 typedef struct {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
27 int cs;
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
28 unsigned char img_type;
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
29 void* hdl;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
30 mp_image_t* mpi;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
31 } priv_t;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
32
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
33 static int do_dr2 = 0;
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
34
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
35 struct config xvid_dec_opts[] = {
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
36 { "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL},
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
37 { "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL},
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
38 {NULL, NULL, 0, 0, 0, 0, NULL}
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
39 };
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
40
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
41 // to set/get/query special features/parameters
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
42 static int control(sh_video_t *sh,int cmd,void* arg,...){
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
43 return CONTROL_UNKNOWN;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
44 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
45
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
46 // init driver
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
47 static int init(sh_video_t *sh){
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
48 XVID_INIT_PARAM ini;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
49 XVID_DEC_PARAM dec_p;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
50 priv_t* p;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
51 int cs;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
52
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
53 memset(&ini,0,sizeof(XVID_INIT_PARAM));
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
54 memset(&dec_p,0,sizeof(XVID_DEC_PARAM));
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
55
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
56 if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12))
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
57 return 0;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
58
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
59 switch(sh->codec->outfmt[sh->outfmtidx]){
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
60 case IMGFMT_YV12:
6767
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
61 #ifdef XVID_CSP_EXTERN
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
62 cs= do_dr2 ? XVID_CSP_EXTERN : XVID_CSP_USER;
6767
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
63 #else
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
64 cs= XVID_CSP_USER;
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
65 #endif
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
66 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
67 case IMGFMT_YUY2:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
68 cs=XVID_CSP_YUY2;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
69 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
70 case IMGFMT_UYVY:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
71 cs=XVID_CSP_UYVY;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
72 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
73 case IMGFMT_I420:
6767
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
74 case IMGFMT_IYUV:
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
75 cs=XVID_CSP_I420;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
76 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
77 case IMGFMT_BGR15:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
78 cs=XVID_CSP_RGB555;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
79 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
80 case IMGFMT_BGR16:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
81 cs=XVID_CSP_RGB565;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
82 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
83 case IMGFMT_BGR24:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
84 cs=XVID_CSP_RGB24;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
85 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
86 case IMGFMT_BGR32:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
87 cs=XVID_CSP_RGB32;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
88 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
89 case IMGFMT_YVYU:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
90 cs=XVID_CSP_YVYU;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
91 break;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
92 default:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
93 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Unsupported out_fmt: 0x%X\n",sh->codec->outfmt[sh->outfmtidx]);
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
94 return 0;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
95 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
96
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
97 if(xvid_init(NULL, 0, &ini, NULL))
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
98 return 0;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
99
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
100 if(ini.api_version != API_VERSION) {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
101 if(ini.api_version < API_VERSION) {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
102 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Too old version of xivd (min. %d)\n",API_VERSION);
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
103 return 0;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
104 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
105 mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Bad xvid version %d was compiled with %d\n",
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
106 ini.api_version,API_VERSION);
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
107 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
108
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
109 dec_p.width = sh->disp_w;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
110 dec_p.height = sh->disp_h;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
111
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
112 if(xvid_decore(NULL, XVID_DEC_CREATE, &dec_p, NULL)) {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
113 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"xvid init failed\n");
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
114 return 0;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
115 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
116
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
117 p = (priv_t*)malloc(sizeof(priv_t));
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
118 p->cs = cs;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
119 p->hdl = dec_p.handle;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
120 sh->context = p;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
121
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
122 switch(cs) {
6767
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
123 #ifdef XVID_CSP_EXTERN
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
124 case XVID_CSP_EXTERN:
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
125 p->img_type = MP_IMGTYPE_STATIC;
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
126 break;
6767
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
127 #endif
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
128 case XVID_CSP_USER:
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
129 p->img_type = MP_IMGTYPE_EXPORT;
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
130 break;
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
131 default:
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
132 p->img_type = MP_IMGTYPE_TEMP;
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
133 break;
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
134 }
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
135
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
136 return 1;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
137 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
138
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
139 // uninit driver
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
140 static void uninit(sh_video_t *sh){
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
141 priv_t* p = sh->context;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
142 if(!p)
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
143 return;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
144 xvid_decore(p->hdl,XVID_DEC_DESTROY, NULL, NULL);
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
145 free(p);
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
146 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
147
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
148 // decode a frame
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
149 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
150 XVID_DEC_FRAME dec;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
151 DEC_PICTURE d4_pic;
6915
5ca9fc4d2994 compilation bug found by Julien Portalier <julien@portalier.com>
arpi
parents: 6767
diff changeset
152 #ifdef XVID_CSP_EXTERN
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
153 XVID_DEC_PICTURE pic;
6915
5ca9fc4d2994 compilation bug found by Julien Portalier <julien@portalier.com>
arpi
parents: 6767
diff changeset
154 #endif
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
155 priv_t* p = sh->context;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
156
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
157 mp_image_t* mpi = mpcodecs_get_image(sh, p->img_type,
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
158 MP_IMGFLAG_ACCEPT_STRIDE,
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
159 sh->disp_w,sh->disp_h);
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
160
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
161 if(!data || !mpi || len <= 0)
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
162 return NULL;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
163
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
164 memset(&dec,0,sizeof(XVID_DEC_FRAME));
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
165
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
166 dec.bitstream = data;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
167 dec.length = len;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
168 switch(p->cs) {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
169 case XVID_CSP_USER:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
170 dec.image = &d4_pic;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
171 break;
6767
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
172 #ifdef XVID_CSP_EXTERN
6756
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
173 case XVID_CSP_EXTERN:
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
174 pic.y = mpi->planes[0];
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
175 pic.u = mpi->planes[1];
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
176 pic.v = mpi->planes[2];
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
177 pic.stride_y = mpi->stride[0];
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
178 pic.stride_u = mpi->stride[1];
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
179 pic.stride_v = mpi->stride[2];
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
180 dec.image = &pic;
6af6d7b40638 Add direct rendering method 2
albeu
parents: 6701
diff changeset
181 break;
6767
a6240ba29795 support for older xvid versions and IMGFMT_IYUV
alex
parents: 6756
diff changeset
182 #endif
6701
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
183 default:
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
184 dec.image = mpi->planes[0];
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
185 if(IMGFMT_IS_BGR(mpi->imgfmt) || IMGFMT_IS_RGB(mpi->imgfmt))
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
186 dec.stride = mpi->width;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
187 else
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
188 dec.stride = mpi->stride[0];
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
189 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
190 dec.colorspace = p->cs;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
191
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
192 if(xvid_decore(p->hdl,XVID_DEC_DECODE,&dec,NULL)) {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
193 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"decoding error\n");
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
194 return NULL;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
195 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
196
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
197 if(p->cs == XVID_CSP_USER) {
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
198 mpi->planes[0] = d4_pic.y;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
199 mpi->planes[1] = d4_pic.u;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
200 mpi->planes[2] = d4_pic.v;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
201 mpi->stride[0] = d4_pic.stride_y;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
202 mpi->stride[1] = mpi->stride[2] = d4_pic.stride_uv;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
203 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
204
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
205 return mpi;
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
206 }
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
207
522713337297 Support for Xvid using their new api. If divx4 compatiblity is disabeled
albeu
parents:
diff changeset
208 #endif