annotate libmpcodecs/vf_palette.c @ 22616:09dc129234a0

Matroska seeking fixes If a relative seek forward went past the last index position the Matroska demuxer did not seek to any index position. It did however set the mkv_d->skip_to_timecode variable which meant that the next fill_buffer() call would read from the current position until the target position (probably the end of the file). Fix this by changing the code to seek to the last index position if that is between the current and target positions. Also change backwards relative seek to accept an exactly matching index position (<= vs <) and reorganize the seeking conditionals to allow making the above change without turning the code into a complete mess.
author uau
date Fri, 16 Mar 2007 14:55:41 +0000
parents 8579acff875e
children 3cfff0f1d9b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
1 #include <stdio.h>
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
2 #include <stdlib.h>
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
3 #include <string.h>
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
4 #include <inttypes.h>
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
5
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 13641
diff changeset
6 #include "config.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 13641
diff changeset
7 #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
8 #include "help_mp.h"
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
9
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
10 #include "img_format.h"
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
11 #include "mp_image.h"
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
12 #include "vf.h"
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
13
18861
8579acff875e Move postproc ---> libswscale
lucabe
parents: 18004
diff changeset
14 #include "libswscale/rgb2rgb.h"
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
15
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
16 //===========================================================================//
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
17
11512
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
18 // commented out 16 and 15 bit output support, because the conversion
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
19 // routines are incorrrect. they assume the palette to be of the same
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
20 // depth as the output, which is incorrect. --Joey
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
21
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
22 static unsigned int bgr_list[]={
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
23 IMGFMT_BGR32,
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
24 IMGFMT_BGR24,
11512
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
25 // IMGFMT_BGR16,
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
26 // IMGFMT_BGR15,
6188
39a9515c633a warning fixes, patch by Ulrich Hecht <uli@suse.de>
arpi
parents: 5774
diff changeset
27 0
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
28 };
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
29 static unsigned int rgb_list[]={
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
30 IMGFMT_RGB32,
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
31 IMGFMT_RGB24,
11512
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
32 // IMGFMT_RGB16,
4ff38d168c2f fix for vf_palette, because paletted 8-bit to BGR{15,16} conversion is incorrect.
joey
parents: 9593
diff changeset
33 // IMGFMT_RGB15,
6188
39a9515c633a warning fixes, patch by Ulrich Hecht <uli@suse.de>
arpi
parents: 5774
diff changeset
34 0
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
35 };
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
36
6232
f8e0eac1256c grayscaled palette support
arpi
parents: 6188
diff changeset
37 static unsigned int gray_pal[256];
f8e0eac1256c grayscaled palette support
arpi
parents: 6188
diff changeset
38
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
39 static unsigned int find_best(struct vf_instance_s* vf, unsigned int fmt){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
40 unsigned int best=0;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
41 int ret;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
42 unsigned int* p;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
43 if(fmt==IMGFMT_BGR8) p=bgr_list;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
44 else if(fmt==IMGFMT_RGB8) p=rgb_list;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
45 else return 0;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
46 while(*p){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
47 ret=vf->next->query_format(vf->next,*p);
9276
9fd44bc91631 move some verbose msg to dbg2
arpi
parents: 7368
diff changeset
48 mp_msg(MSGT_VFILTER,MSGL_DBG2,"[%s] query(%s) -> %d\n",vf->info->name,vo_format_name(*p),ret&3);
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
49 if(ret&VFCAP_CSP_SUPPORTED_BY_HW){ best=*p; break;} // no conversion -> bingo!
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
50 if(ret&VFCAP_CSP_SUPPORTED && !best) best=*p; // best with conversion
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
51 ++p;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
52 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
53 return best;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
54 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
55
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
56 //===========================================================================//
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
57
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
58 struct vf_priv_s {
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
59 unsigned int fmt;
9276
9fd44bc91631 move some verbose msg to dbg2
arpi
parents: 7368
diff changeset
60 int pal_msg;
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
61 };
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
62
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
63 static int config(struct vf_instance_s* vf,
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
64 int width, int height, int d_width, int d_height,
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
65 unsigned int flags, unsigned int outfmt){
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
66 if (!vf->priv->fmt)
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
67 vf->priv->fmt=find_best(vf,outfmt);
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
68 if(!vf->priv->fmt){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
69 // no matching fmt, so force one...
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
70 if(outfmt==IMGFMT_RGB8) vf->priv->fmt=IMGFMT_RGB32;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
71 else if(outfmt==IMGFMT_BGR8) vf->priv->fmt=IMGFMT_BGR32;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
72 else return 0;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
73 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
74 return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
75 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
76
17906
20aca9baf5d8 passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents: 17012
diff changeset
77 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
78 mp_image_t *dmpi;
6481
24465b749d2a report if no palette
alex
parents: 6232
diff changeset
79
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
80 // hope we'll get DR buffer:
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
81 dmpi=vf_get_image(vf->next,vf->priv->fmt,
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
82 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
83 mpi->w, mpi->h);
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
84
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
85 if (!mpi->planes[1])
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
86 {
9276
9fd44bc91631 move some verbose msg to dbg2
arpi
parents: 7368
diff changeset
87 if(!vf->priv->pal_msg){
9fd44bc91631 move some verbose msg to dbg2
arpi
parents: 7368
diff changeset
88 mp_msg(MSGT_VFILTER,MSGL_V,"[%s] no palette given, assuming builtin grayscale one\n",vf->info->name);
9fd44bc91631 move some verbose msg to dbg2
arpi
parents: 7368
diff changeset
89 vf->priv->pal_msg=1;
9fd44bc91631 move some verbose msg to dbg2
arpi
parents: 7368
diff changeset
90 }
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
91 mpi->planes[1] = (unsigned char*)gray_pal;
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
92 }
6232
f8e0eac1256c grayscaled palette support
arpi
parents: 6188
diff changeset
93
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
94 if(mpi->w==mpi->stride[0] && dmpi->w*(dmpi->bpp>>3)==dmpi->stride[0]){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
95 // no stride conversion needed
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
96 switch(dmpi->imgfmt&255){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
97 case 15:
7333
alex
parents: 7160
diff changeset
98 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
99 palette8tobgr15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
100 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
101 palette8torgb15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
102 break;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
103 case 16:
7333
alex
parents: 7160
diff changeset
104 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
105 palette8tobgr16(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
106 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
107 palette8torgb16(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
108 break;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
109 case 24:
7333
alex
parents: 7160
diff changeset
110 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
111 palette8tobgr24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
112 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
113 palette8torgb24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
114 break;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
115 case 32:
7333
alex
parents: 7160
diff changeset
116 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
117 palette8tobgr32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
118 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
119 palette8torgb32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
120 break;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
121 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
122 } else {
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
123 int y;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
124 for(y=0;y<mpi->h;y++){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
125 unsigned char* src=mpi->planes[0]+y*mpi->stride[0];
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
126 unsigned char* dst=dmpi->planes[0]+y*dmpi->stride[0];
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
127 switch(dmpi->imgfmt&255){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
128 case 15:
7333
alex
parents: 7160
diff changeset
129 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
130 palette8tobgr15(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
131 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
132 palette8torgb15(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
133 break;
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
134 case 16:
7333
alex
parents: 7160
diff changeset
135 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
136 palette8tobgr16(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
137 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
138 palette8torgb16(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
139 break;
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
140 case 24:
7333
alex
parents: 7160
diff changeset
141 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
142 palette8tobgr24(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
143 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
144 palette8torgb24(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
145 break;
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
146 case 32:
7333
alex
parents: 7160
diff changeset
147 if (dmpi->flags & MP_IMGFLAG_SWAPPED)
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
148 palette8tobgr32(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
149 else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
150 palette8torgb32(src,dst,mpi->w,mpi->planes[1]);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
151 break;
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
152 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
153 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
154 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
155
17906
20aca9baf5d8 passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents: 17012
diff changeset
156 return vf_next_put_image(vf,dmpi, pts);
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
157 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
158
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
159 //===========================================================================//
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
160
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
161 static int query_format(struct vf_instance_s* vf, unsigned int fmt){
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
162 int best=find_best(vf,fmt);
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
163 if(!best) return 0; // no match
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
164 return vf->next->query_format(vf->next,best);
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
165 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
166
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 11512
diff changeset
167 static void uninit(vf_instance_t *vf) {
a22f1b86ec0f some memory leaks fixed
reimar
parents: 11512
diff changeset
168 free(vf->priv);
a22f1b86ec0f some memory leaks fixed
reimar
parents: 11512
diff changeset
169 }
a22f1b86ec0f some memory leaks fixed
reimar
parents: 11512
diff changeset
170
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
171 static int open(vf_instance_t *vf, char* args){
6232
f8e0eac1256c grayscaled palette support
arpi
parents: 6188
diff changeset
172 unsigned int i;
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
173 vf->config=config;
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 11512
diff changeset
174 vf->uninit=uninit;
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
175 vf->put_image=put_image;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
176 vf->query_format=query_format;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
177 vf->priv=malloc(sizeof(struct vf_priv_s));
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
178 memset(vf->priv, 0, sizeof(struct vf_priv_s));
6232
f8e0eac1256c grayscaled palette support
arpi
parents: 6188
diff changeset
179 for(i=0;i<256;i++) gray_pal[i]=0x01010101*i;
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
180 if (args)
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
181 {
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
182 if (!strcasecmp(args,"rgb15")) vf->priv->fmt=IMGFMT_RGB15; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
183 if (!strcasecmp(args,"rgb16")) vf->priv->fmt=IMGFMT_RGB16; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
184 if (!strcasecmp(args,"rgb24")) vf->priv->fmt=IMGFMT_RGB24; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
185 if (!strcasecmp(args,"rgb32")) vf->priv->fmt=IMGFMT_RGB32; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
186 if (!strcasecmp(args,"bgr15")) vf->priv->fmt=IMGFMT_BGR15; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
187 if (!strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
188 if (!strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
189 if (!strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
190 {
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
191 mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
192 return(0);
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
193 }
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
194 }
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
195 return 1;
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
196 }
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
197
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
198 vf_info_t vf_info_palette = {
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
199 "8bpp indexed (using palette) -> BGR 15/16/24/32 conversion",
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
200 "palette",
7160
447066802e64 added bgr support and support for forcing output format
alex
parents: 7127
diff changeset
201 "A'rpi & Alex",
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
202 "",
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9276
diff changeset
203 open,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9276
diff changeset
204 NULL
5774
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
205 };
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
206
a300966abeb6 8bpp paletted -> 15/16/24/32 converter
arpi
parents:
diff changeset
207 //===========================================================================//