Mercurial > mplayer.hg
annotate libmpcodecs/ve_raw.c @ 33307:552f1f7731c8
Set GUI initialization flag earlier.
So far, the flag is set after the call of guiInit(), but there are calls
to GUI functions (like reading the GUI config) before that. As MPlayer
(when exiting) only calls GUI's cleanup function guiDone() if the flag
is set, it neglects calling guiDone() on any error between the first GUI
function call and execution of guiInit(). Now the flag is set before the
first GUI function call.
As a result, GUI's own exit function (also used for fatal GUI errors, and
thus also for errors occurring before guiInit() properly finishes) doesn't
have to handle cleanup any longer. The code can be moved to guiDone().
author | ib |
---|---|
date | Sat, 07 May 2011 15:30:14 +0000 |
parents | a6eb88882b9f |
children |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
18 |
11966 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
21 #include <string.h> | |
22 | |
17012 | 23 #include "config.h" |
24 #include "mp_msg.h" | |
18004
bcd805923554
Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
reynaldo
parents:
17906
diff
changeset
|
25 #include "help_mp.h" |
11966 | 26 |
27 #include "codec-cfg.h" | |
22600
3c2b4a866c6a
Add explicit location for headers from the stream/ directory.
diego
parents:
21660
diff
changeset
|
28 #include "stream/stream.h" |
22601
ed8f90096c65
Add explicit location for headers from the libmpdemux/ directory.
diego
parents:
22600
diff
changeset
|
29 #include "libmpdemux/demuxer.h" |
ed8f90096c65
Add explicit location for headers from the libmpdemux/ directory.
diego
parents:
22600
diff
changeset
|
30 #include "libmpdemux/stheader.h" |
11966 | 31 |
22600
3c2b4a866c6a
Add explicit location for headers from the stream/ directory.
diego
parents:
21660
diff
changeset
|
32 #include "stream/stream.h" |
22601
ed8f90096c65
Add explicit location for headers from the libmpdemux/ directory.
diego
parents:
22600
diff
changeset
|
33 #include "libmpdemux/muxer.h" |
11966 | 34 |
35 #include "img_format.h" | |
36 #include "mp_image.h" | |
37 #include "vf.h" | |
38 | |
39 | |
40 //===========================================================================// | |
41 | |
42 struct vf_priv_s { | |
43 muxer_stream_t* mux; | |
44 }; | |
45 #define mux_v (vf->priv->mux) | |
46 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30421
diff
changeset
|
47 static int set_format(struct vf_instance *vf, unsigned int fmt) { |
27366
067da68b5b16
change ve_raw.c:set_format to not overwrite biCompression if force_fourcc is set.
compn
parents:
22958
diff
changeset
|
48 if (!force_fourcc) |
27367 | 49 mux_v->bih->biCompression = fmt; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27367
diff
changeset
|
50 |
11966 | 51 mux_v->bih->biPlanes = 1; |
52 if (IMGFMT_IS_RGB(fmt)) { | |
53 if (IMGFMT_RGB_DEPTH(fmt) < 8 && !(fmt&128)) | |
54 mux_v->bih->biBitCount = IMGFMT_RGB_DEPTH(fmt); | |
55 else | |
56 mux_v->bih->biBitCount = (IMGFMT_RGB_DEPTH(fmt)+7)&(~7); | |
57 return 1; | |
58 } | |
59 if (IMGFMT_IS_BGR(fmt)) { | |
60 if (IMGFMT_BGR_DEPTH(fmt) < 8 && !(fmt&128)) | |
61 mux_v->bih->biBitCount = IMGFMT_BGR_DEPTH(fmt); | |
62 else | |
63 mux_v->bih->biBitCount = (IMGFMT_BGR_DEPTH(fmt)+7)&(~7); | |
64 return 1; | |
65 } | |
66 switch (fmt) { | |
32490 | 67 case IMGFMT_NV12: |
68 case IMGFMT_NV21: | |
69 case IMGFMT_HM12: | |
70 mux_v->bih->biPlanes = 2; | |
71 mux_v->bih->biBitCount = 12; | |
72 break; | |
11966 | 73 case IMGFMT_I420: |
74 case IMGFMT_IYUV: | |
75 case IMGFMT_YV12: | |
76 case IMGFMT_411P: | |
77 mux_v->bih->biPlanes = 3; | |
78 mux_v->bih->biBitCount = 12; | |
79 break; | |
80 case IMGFMT_444P: | |
81 mux_v->bih->biPlanes = 3; | |
82 mux_v->bih->biBitCount = 24; | |
83 break; | |
84 case IMGFMT_422P: | |
85 mux_v->bih->biPlanes = 3; | |
86 mux_v->bih->biBitCount = 16; | |
87 break; | |
88 case IMGFMT_IF09: | |
89 mux_v->bih->biPlanes = 4; | |
90 case IMGFMT_YVU9: | |
91 mux_v->bih->biBitCount = 9; | |
92 break; | |
93 case IMGFMT_UYVY: | |
94 case IMGFMT_YUY2: | |
95 mux_v->bih->biBitCount = 16; | |
96 break; | |
22958 | 97 case IMGFMT_Y8: |
98 mux_v->bih->biBitCount = 8; | |
99 break; | |
11966 | 100 default: |
18004
bcd805923554
Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
reynaldo
parents:
17906
diff
changeset
|
101 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_MPCODECS_OutputWithFourccNotSupported, fmt); |
11966 | 102 mux_v->bih->biCompression = 0; |
103 return 0; | |
104 } | |
105 return 1; | |
106 } | |
107 | |
108 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30421
diff
changeset
|
109 static int config(struct vf_instance *vf, |
11966 | 110 int width, int height, int d_width, int d_height, |
111 unsigned int flags, unsigned int outfmt) | |
112 { | |
113 int ret; | |
114 mux_v->bih->biWidth = width; | |
115 mux_v->bih->biHeight = height; | |
12061 | 116 mux_v->aspect = (float)d_width/d_height; |
11966 | 117 ret = set_format(vf, outfmt); |
118 if (!ret) return 0; | |
119 | |
120 mux_v->bih->biSizeImage = mux_v->bih->biWidth*mux_v->bih->biHeight*mux_v->bih->biBitCount/8; | |
121 return 1; | |
122 } | |
123 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30421
diff
changeset
|
124 static int control(struct vf_instance *vf, int request, void *data) { |
11966 | 125 return CONTROL_UNKNOWN; |
126 } | |
127 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30421
diff
changeset
|
128 static int query_format(struct vf_instance *vf, unsigned int fmt) { |
11966 | 129 if (IMGFMT_IS_RGB(fmt) || IMGFMT_IS_BGR(fmt)) |
130 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; | |
131 switch (fmt) { | |
32902
a6eb88882b9f
Missing part of r32577: Add NV12/NV21/HM12 to query_format so they really
reimar
parents:
32490
diff
changeset
|
132 case IMGFMT_NV12: |
a6eb88882b9f
Missing part of r32577: Add NV12/NV21/HM12 to query_format so they really
reimar
parents:
32490
diff
changeset
|
133 case IMGFMT_NV21: |
a6eb88882b9f
Missing part of r32577: Add NV12/NV21/HM12 to query_format so they really
reimar
parents:
32490
diff
changeset
|
134 case IMGFMT_HM12: |
11966 | 135 case IMGFMT_I420: |
136 case IMGFMT_IYUV: | |
137 case IMGFMT_YV12: | |
138 case IMGFMT_411P: | |
139 case IMGFMT_444P: | |
140 case IMGFMT_422P: | |
141 case IMGFMT_UYVY: | |
142 case IMGFMT_YUY2: | |
143 case IMGFMT_YVU9: | |
144 case IMGFMT_IF09: | |
22958 | 145 case IMGFMT_Y8: |
11966 | 146 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; |
147 } | |
148 | |
149 return 0; | |
150 } | |
151 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30421
diff
changeset
|
152 static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { |
11966 | 153 mux_v->buffer = mpi->planes[0]; |
17906
20aca9baf5d8
passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents:
17487
diff
changeset
|
154 muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, pts, pts); |
11966 | 155 return 1; |
156 } | |
157 | |
158 //===========================================================================// | |
159 | |
160 static int vf_open(vf_instance_t *vf, char* args){ | |
161 vf->config = config; | |
14878 | 162 vf->default_caps = VFCAP_CONSTANT; |
11966 | 163 vf->control = control; |
164 vf->query_format = query_format; | |
165 vf->put_image = put_image; | |
14303 | 166 vf->default_caps = 0; |
11966 | 167 vf->priv = malloc(sizeof(struct vf_priv_s)); |
168 memset(vf->priv, 0, sizeof(struct vf_priv_s)); | |
169 vf->priv->mux = (muxer_stream_t*)args; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
27367
diff
changeset
|
170 |
32105 | 171 mux_v->bih = calloc(1, sizeof(*mux_v->bih)); |
172 mux_v->bih->biSize = sizeof(*mux_v->bih); | |
11966 | 173 mux_v->bih->biWidth = 0; |
174 mux_v->bih->biHeight = 0; | |
175 | |
176 return 1; | |
177 } | |
178 | |
32033 | 179 const vf_info_t ve_info_raw = { |
11966 | 180 "raw encoder", |
181 "raw", | |
182 "jwe21@cam.ac.uk", | |
183 "Based on rawrgb", | |
184 vf_open | |
185 }; | |
186 | |
187 //===========================================================================// |