code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-vuplus/aio-grab/aio-grab/aio-grab_vuplus_f66b4be472fba59c4ea5b606478ef1a92864a2cd.patch

   1 diff --git a/.gitignore b/.gitignore
   2 index ccfb515..a6f8d11 100644
   3 --- a/.gitignore
   4 +++ b/.gitignore
   5 @@ -16,3 +16,4 @@ install-sh
   6  *.o
   7  missing
   8  stamp-h1
   9 +aio-grab_vuplus_*
  10 diff --git a/main.c b/main.c
  11 index 190ff5f..a984ff3 100644
  12 --- a/main.c
  13 +++ b/main.c
  14 @@ -1,5 +1,5 @@
  15  /*
  16 -AiO Dreambox Screengrabber v0.83a
  17 +AiO Screengrabber v0.83a
  18
  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.
  22  #include <sys/stat.h>
  23  #include <sys/types.h>
  24  #include <unistd.h>
  25 +#include <ctype.h>
  26
  27  #include <linux/fb.h>
  28
  29 @@ -80,6 +81,8 @@ static const int yuv2rgbtable_bv[256] = {
  30  };
  31
  32  static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yres);
  33 +static bool getvideo2(unsigned char *video, unsigned int *xres, unsigned int *yres);
  34 +
  35  static bool getosd(unsigned char *osd, unsigned int *xres, unsigned int *yres);
  36
  37  static void smooth_resize(const unsigned char *source, unsigned char *dest,
  38 @@ -101,10 +104,24 @@ static void combine(unsigned char *output,
  39                     const unsigned char *video, const unsigned char *osd,
  40                     unsigned int xres, unsigned int yres);
  41
  42 +#define IS_VUPLUS 1
  43 +#if IS_VUPLUS
  44 +enum {UNKNOWN,PALLAS,VULCAN,XILLEON,BRCM7401,BRCM7400,BRCM7405,BRCM7335,BRCM7325,BRCM7346,BRCM7425,BRCM7362,BRCM7366};
  45 +char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405","Brcm7335","Brcm7325","Brcm7346","Brcm7425\/7241","Brcm7362", "Brcm7366"};
  46 +#else
  47  enum {UNKNOWN,PALLAS,VULCAN,XILLEON,BRCM7401,BRCM7400,BRCM7405};
  48  static const char *stb_name[]={"unknown","Pallas","Vulcan","Xilleon","Brcm7401","Brcm7400","Brcm7405"};
  49 +#endif
  50  static int stb_type=UNKNOWN;
  51
  52 +char* upcase(char* mixedstr)
  53 +{
  54 +       size_t j;
  55 +       for (j=0; j< strlen(mixedstr); ++j)
  56 +               mixedstr[j]=toupper(mixedstr[j]);
  57 +       return mixedstr;
  58 +}
  59 +
  60  static const char *file_getline(const char *filename)
  61  {
  62         static char *line = NULL;
  63 @@ -184,10 +201,9 @@ static int file_scanf_lines(const char *filename, const char *fmt, ...)
  64  }
  65
  66  // main program
  67 -
  68  int main(int argc, char **argv) {
  69
  70 -       printf("AiO Dreambox Screengrabber " PACKAGE_VERSION "\n\n");
  71 +       printf("AiO Screengrabber " PACKAGE_VERSION "\n\n");
  72
  73         unsigned int xres_v = 0,yres_v = 0,xres_o,yres_o,xres,yres,aspect,width;
  74         int c,osd_only,video_only,use_osd_res,use_png,use_jpg,jpg_quality,no_aspect,use_letterbox;
  75 @@ -205,11 +221,37 @@ int main(int argc, char **argv) {
  76         char filename[256] = { "/tmp/screenshot.bmp" };
  77
  78         // detect STB
  79 -       const char *line = file_getline("/proc/fb");
  80 +       char *line = (char*)file_getline("/proc/fb");
  81         if (line == NULL)
  82                 return 1;
  83
  84         if (strstr(line, "bcmfb")) {
  85 +#if IS_VUPLUS
  86 +               if((line=(char*)file_getline("/proc/stb/info/chipset")) == NULL)
  87 +                       return 1;
  88 +               if (strstr(upcase(line),"7335"))
  89 +                       stb_type=BRCM7335;
  90 +               else if (strstr(upcase(line),"7325"))
  91 +                       stb_type=BRCM7325;
  92 +               else if (strstr(upcase(line),"7405"))
  93 +                       stb_type=BRCM7405;
  94 +               else if (strstr(upcase(line),"7356"))
  95 +                       stb_type=BRCM7346;
  96 +               else if (strstr(upcase(line),"7346"))
  97 +                       stb_type=BRCM7346;
  98 +               else if (strstr(upcase(line),"7424"))
  99 +                       stb_type=BRCM7425;
 100 +               else if (strstr(upcase(line),"7425"))
 101 +                       stb_type=BRCM7425;
 102 +               else if (strstr(upcase(line),"7241"))
 103 +                       stb_type=BRCM7425;
 104 +               else if (strstr(upcase(line),"7362"))
 105 +                       stb_type=BRCM7362;
 106 +               else if (strstr(upcase(line),"7366"))
 107 +                       stb_type=BRCM7366;
 108 +               else if (strstr(upcase(line),"7376"))
 109 +                       stb_type=BRCM7366;
 110 +#else
 111                 line = file_getline("/proc/stb/info/model");
 112                 if (line == NULL)
 113                         return 1;
 114 @@ -221,6 +263,7 @@ int main(int argc, char **argv) {
 115                          !strcmp(line, "dm800se") ||
 116                          !strcmp(line, "dm7020hd"))
 117                         stb_type = BRCM7405;
 118 +#endif
 119         } else if (strstr(line, "xilleonfb")) {
 120                 stb_type = XILLEON;
 121         } else if (strstr(line, "Pallas FB")) {
 122 @@ -325,9 +368,18 @@ int main(int argc, char **argv) {
 123         if (!video_only && !getosd(osd, &xres_o, &yres_o))
 124                 return 1;
 125
 126 -       // get video
 127 -       if (!osd_only && !getvideo(video, &xres_v, &yres_v))
 128 -               return 1;
 129 +       if (stb_type == BRCM7366)
 130 +       {
 131 +               if (!osd_only && !getvideo2(video, &xres_v, &yres_v))
 132 +                       return 1;
 133 +       }
 134 +       else
 135 +       {
 136 +               if (!osd_only && !getvideo(video, &xres_v, &yres_v))
 137 +                       return 1;
 138 +       }
 139 +
 140 +
 141
 142         // get aspect ratio
 143         if (stb_type == VULCAN || stb_type == PALLAS)
 144 @@ -549,6 +601,22 @@ int main(int argc, char **argv) {
 145  }
 146
 147  // grabing the video picture
 148 +static bool getvideo2(unsigned char *video, unsigned int *xres, unsigned int *yres)
 149 +{
 150 +       int fd_video = open("/dev/dvb/adapter0/video0", O_RDONLY);
 151 +       if (fd_video < 0) {
 152 +               perror("/dev/dvb/adapter0/video0");
 153 +               return false;
 154 +       }
 155 +
 156 +       ssize_t r = read(fd_video, video, 1920 * 1080 * 3);
 157 +       close(fd_video);
 158 +
 159 +       *xres = 1920;
 160 +       *yres = 1080;
 161 +
 162 +       return true;
 163 +}
 164
 165  static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yres)
 166  {
 167 @@ -563,16 +631,34 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 168                 perror("/dev/mem");
 169                 return false;
 170         }
 171 -
 172 +#if IS_VUPLUS
 173 +       if (stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425 || stb_type == BRCM7362)
 174 +#else
 175         if (stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405)
 176 +#endif
 177         {
 178                 // grab brcm7401 pic from decoder memory
 179 +#if IS_VUPLUS
 180 +               off_t offset_addr = 0x10600000;
 181 +               switch(stb_type) {
 182 +               case BRCM7401:
 183 +               case BRCM7400:
 184 +               case BRCM7405:
 185 +               case BRCM7335:
 186 +               case BRCM7325: offset_addr = 0x10100000; break;
 187 +               }
 188 +               unsigned char *memory = mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, offset_addr);
 189 +               if (memory == MAP_FAILED) {
 190 +                       perror("mmap");
 191 +                       return false;
 192 +               }
 193 +#else
 194                 unsigned char *memory = mmap(0, 100, PROT_READ, MAP_SHARED, mem_fd, 0x10100000);
 195                 if (memory == MAP_FAILED) {
 196                         perror("mmap");
 197                         return false;
 198                 }
 199 -
 200 +#endif
 201                 unsigned char data[100];
 202
 203                 unsigned int adr,adr2,ofs,ofs2,offset/*,vert_start,vert_end*/;
 204 @@ -582,12 +668,30 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 205                 memcpy(data,memory,100);
 206                 //vert_start=data[0x1B]<<8|data[0x1A];
 207                 //vert_end=data[0x19]<<8|data[0x18];
 208 +#if IS_VUPLUS
 209 +               if(stb_type == BRCM7401 || stb_type == BRCM7400 || stb_type == BRCM7405 || stb_type == BRCM7335 || stb_type == BRCM7325) {
 210 +                       stride=data[0x15]<<8|data[0x14];
 211 +                       ofs=(data[0x28]<<8|data[0x27])>>4;
 212 +                       ofs2=(data[0x2c]<<8|data[0x2b])>>4;
 213 +                       adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00;
 214 +                       adr2=(data[0x23]<<24|data[0x22]<<16|data[0x21]<<8|data[0x20])&0xFFFFFF00;
 215 +                       offset=adr2-adr;
 216 +               } else {
 217 +                       stride=data[0x15]<<8|data[0x14];
 218 +                       ofs=(data[0x3c]<<8|data[0x3b])>>4;
 219 +                       ofs2=(data[0x40]<<8|data[0x3f])>>4;
 220 +                       adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00;
 221 +                       adr2=(data[0x37]<<24|data[0x36]<<16|data[0x35]<<8|data[0x34])&0xFFFFFF00;
 222 +                       offset=adr2-adr;
 223 +               }
 224 +#else
 225                 stride=data[0x15]<<8|data[0x14];
 226                 ofs=(data[0x28]<<8|data[0x27])>>4;
 227                 ofs2=(data[0x2c]<<8|data[0x2b])>>4;
 228                 adr=(data[0x1f]<<24|data[0x1e]<<16|data[0x1d]<<8|data[0x1c])&0xFFFFFF00;
 229                 adr2=(data[0x23]<<24|data[0x22]<<16|data[0x21]<<8|data[0x20])&0xFFFFFF00;
 230                 offset=adr2-adr;
 231 +#endif
 232
 233                 munmap(memory, 100);
 234
 235 @@ -609,7 +713,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 236                 assert(chroma);
 237
 238                 // grabbing luma & chroma plane from the decoder memory
 239 +#if IS_VUPLUS
 240 +               if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425 || stb_type == BRCM7362 ) {
 241 +#else
 242                 if (stb_type == BRCM7401 || stb_type == BRCM7405) {
 243 +#endif
 244                         // on dm800/dm500hd we have direct access to the decoder memory
 245                         memory = mmap(0, offset + stride*(ofs2+64), PROT_READ, MAP_SHARED, mem_fd, adr);
 246                         if (memory == MAP_FAILED) {
 247 @@ -620,7 +728,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 248                         usleep(50000);  // we try to get a full picture, its not possible to get a sync from the decoder so we use a delay
 249                                         // and hope we get a good timing. dont ask me why, but every DM800 i tested so far produced a good
 250                                         // result with a 50ms delay
 251 +#if IS_VUPLUS
 252 +               } else if (stb_type == BRCM7400 || stb_type == BRCM7335) {
 253 +#else
 254                 } else if (stb_type == BRCM7400) {
 255 +#endif
 256                         // on dm8000 we have to use dma, so dont change anything here until you really know what you are doing !
 257
 258                         unsigned int i = 0;
 259 @@ -639,7 +751,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 260                         }
 261
 262                         volatile unsigned long *mem_dma;
 263 +#if IS_VUPLUS
 264 +                       mem_dma = mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, (stb_type==BRCM7400)?0x10c02000:0x10c01000);
 265 +#else
 266                         mem_dma = mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, 0x10c02000);
 267 +#endif
 268                         if (mem_dma == MAP_FAILED) {
 269                                 perror("mmap");
 270                                 return false;
 271 @@ -675,8 +791,11 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 272                 unsigned int t = 0, t2 = 0, dat1 = 0;
 273                 unsigned int chr_luma_stride = 0x40;
 274                 unsigned int sw;
 275 -
 276 +#if IS_VUPLUS
 277 +               if (stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425)
 278 +#else
 279                 if (stb_type == BRCM7405)
 280 +#endif
 281                         chr_luma_stride *= 2;
 282
 283                 xsub=chr_luma_stride;
 284 @@ -692,6 +811,7 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 285                         for (ytmp = 0; ytmp < ofs; ytmp++)
 286                         {
 287                                 memcpy(luma + dat1, memory + t, xsub); // luma
 288 +
 289                                 t += chr_luma_stride;
 290
 291                                 switch (ofs2-ytmp) // the two switch commands are much faster than one if statement
 292 @@ -710,10 +830,17 @@ static bool getvideo(unsigned char *video, unsigned int *xres, unsigned int *yre
 293                                 dat1+=stride;
 294                         }
 295                 }
 296 -
 297 +#if IS_VUPLUS
 298 +               if (stb_type == BRCM7401 || stb_type == BRCM7405 || stb_type == BRCM7325 || stb_type == BRCM7346 || stb_type == BRCM7425 || stb_type == BRCM7362) {
 299 +#else
 300                 if (stb_type == BRCM7401 || stb_type == BRCM7405)
 301 +#endif
 302                         munmap(memory, offset + stride * (ofs2 + 64));
 303 +#if IS_VUPLUS
 304 +               } else if (stb_type == BRCM7400 || stb_type == BRCM7335) {
 305 +#else
 306                 else if (stb_type == BRCM7400) {
 307 +#endif
 308                         memory -= 0x1000;
 309                         munmap(memory, DMA_BLOCKSIZE + 0x1000);
 310                 }