1 diff --git a/.gitignore b/.gitignore
2 index ccfb515..a6f8d11 100644
5 @@ -16,3 +16,4 @@ install-sh
10 diff --git a/main.c b/main.c
11 index 190ff5f..dd22bc4 100644
16 -AiO Dreambox Screengrabber v0.83a
17 +AiO Screengrabber v0.83a
19 written 2006 - 2009 by Seddi
20 Contact: seddi@ihad.tv / http://www.ihad.tv
21 @@ -38,6 +38,7 @@ Feel free to use the code for your own projects. See LICENSE file for details.
23 #include <sys/types.h>
29 @@ -101,10 +102,24 @@ static void combine(unsigned char *output,
30 const unsigned char *video, const unsigned char *osd,
31 unsigned int xres, unsigned int yres);
35 +enum {UNKNOWN,PALLAS,VULCAN,XILLEON,BRCM7401,BRCM7400,BRCM7405,BRCM7335,BRCM7325,BRCM7346,BRCM7425};
36 +char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405","Brcm7335","Brcm7325","Brcm7346","Brcm7425"};
38 enum {UNKNOWN,PALLAS,VULCAN,XILLEON,BRCM7401,BRCM7400,BRCM7405};
39 static const char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405"};
41 static int stb_type=UNKNOWN;
43 +char* upcase(char* mixedstr)
46 + for (j=0; j< strlen(mixedstr); ++j)
47 + mixedstr[j]=toupper(mixedstr[j]);
51 static const char *file_getline(const char *filename)
53 static char *line = NULL;
54 @@ -184,10 +199,9 @@ static int file_scanf_lines(const char *filename, const char *fmt, ...)
59 int main(int argc, char **argv) {
61 - printf("AiO Dreambox Screengrabber " PACKAGE_VERSION "\n\n");
62 + printf("AiO Screengrabber " PACKAGE_VERSION "\n\n");
64 unsigned int xres_v = 0,yres_v = 0,xres_o,yres_o,xres,yres,aspect,width;
65 int c,osd_only,video_only,use_osd_res,use_png,use_jpg,jpg_quality,no_aspect,use_letterbox;
66 @@ -205,11 +219,29 @@ int main(int argc, char **argv) {
67 char filename[256] = { "/tmp/screenshot.bmp" };
70 - const char *line = file_getline("/proc/fb");
71 + char *line = (char*)file_getline("/proc/fb");
75 if (strstr(line, "bcmfb")) {
77 + if((line=(char*)file_getline("/proc/stb/info/chipset")) == NULL)
79 + if (strstr(upcase(line),"7335"))
81 + else if (strstr(upcase(line),"7325"))
83 + else if (strstr(upcase(line),"7405"))
85 + else if (strstr(upcase(line),"7356"))
87 + else if (strstr(upcase(line),"7346"))
89 + else if (strstr(upcase(line),"7424"))
91 + else if (strstr(upcase(line),"7425"))
94 line = file_getline("/proc/stb/info/model");
97 @@ -221,6 +253,7 @@ int main(int argc, char **argv) {
98 !strcmp(line, "dm800se") ||
99 !strcmp(line, "dm7020hd"))
102 } else if (strstr(line, "xilleonfb")) {
104 } else if (strstr(line, "Pallas FB")) {
105 @@ -563,16 +596,34 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
111 + if (stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425)
113 if (stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405)
116 // grab brcm7401 pic from decoder memory
118 + off_t offset_addr = 0x10600000;
124 + case BRCM7325: offset_addr = 0x10100000; break;
126 + unsigned char *memory = mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, offset_addr);
127 + if (memory == MAP_FAILED) {
132 unsigned char *memory = mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, 0x10100000);
133 if (memory == MAP_FAILED) {
139 unsigned char data[100];
141 unsigned int adr,adr2,ofs,ofs2,offset/*,vert_start,vert_end*/;
142 @@ -582,12 +633,30 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
143 memcpy(data,memory,100);
144 //vert_start=data[0x1B]<<8|data[0x1A];
145 //vert_end=data[0x19]<<8|data[0x18];
147 + if(stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325) {
148 + stride=data[0x15]<<8|data[0x14];
149 + ofs=(data[0x28]<<8|data[0x27])>>4;
150 + ofs2=(data[0x2c]<<8|data[0x2b])>>4;
151 + adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00;
152 + adr2=(data[0x23]<<24|data[0x22]<<16|data[0x21]<<8|data[0x20])&0xFFFFFF00;
155 + stride=data[0x15]<<8|data[0x14];
156 + ofs=(data[0x3c]<<8|data[0x3b])>>4;
157 + ofs2=(data[0x40]<<8|data[0x3f])>>4;
158 + adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00;
159 + adr2=(data[0x37]<<24|data[0x36]<<16|data[0x35]<<8|data[0x34])&0xFFFFFF00;
163 stride=data[0x15]<<8|data[0x14];
164 ofs=(data[0x28]<<8|data[0x27])>>4;
165 ofs2=(data[0x2c]<<8|data[0x2b])>>4;
166 adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00;
167 adr2=(data[0x23]<<24|data[0x22]<<16|data[0x21]<<8|data[0x20])&0xFFFFFF00;
173 @@ -609,7 +678,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
176 // grabbing luma & chroma plane from the decoder memory
178 + if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425) {
180 if (stb_type == BRCM7401 || stb_type == BRCM7405) {
182 // on dm800/dm500hd we have direct access to the decoder memory
183 memory = mmap(0, offset + stride*(ofs2+64), PROT_READ, MAP_SHARED, mem_fd, adr);
184 if (memory == MAP_FAILED) {
185 @@ -620,7 +693,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
186 usleep(50000); // we try to get a full picture, its not possible to get a sync from the decoder so we use a delay
187 // and hope we get a good timing. dont ask me why, but every DM800 i tested so far produced a good
188 // result with a 50ms delay
190 + } else if (stb_type == BRCM7400 || stb_type == BRCM7335) {
192 } else if (stb_type == BRCM7400) {
194 // on dm8000 we have to use dma, so dont change anything here until you really know what you are doing !
197 @@ -639,7 +716,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
200 volatile unsigned long *mem_dma;
202 + mem_dma = mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, (stb_type==BRCM7400)?0x10c02000:0x10c01000);
204 mem_dma = mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, 0x10c02000);
206 if (mem_dma == MAP_FAILED) {
209 @@ -675,8 +756,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
210 unsigned int t = 0, t2 = 0, dat1 = 0;
211 unsigned int chr_luma_stride = 0x40;
215 + if (stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425)
217 if (stb_type == BRCM7405)
219 chr_luma_stride *= 2;
221 xsub=chr_luma_stride;
222 @@ -710,10 +794,17 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
228 + if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425) {
230 if (stb_type == BRCM7401 || stb_type == BRCM7405)
232 munmap(memory, offset + stride * (ofs2 + 64));
234 + } else if (stb_type == BRCM7400 || stb_type == BRCM7335) {
236 else if (stb_type == BRCM7400) {
239 munmap(memory, DMA_BLOCKSIZE + 0x1000);