comparison libvo/vo_xvmc.c @ 14635:1c277cafd3b1

Query XV_COLORKEY only when listed in attribute list, fixes displaying with non overlay ports

14634:d92dab9e76b6

   if(keycolor_handling == AUTO_COLORKEY){
   //XV_AUTOPING_COLORKEY doesn't work for XvMC yet(NVidia 43.63)
      attributes = XvQueryPortAttributes(mDisplay, xv_port, &attrib_count);
      if(attributes!=NULL){
         for (i = 0; i < attrib_count; i++){
            if (!strcmp(attributes[i].name, "XV_AUTOPAINT_COLORKEY"))
            {
               xv_atom = XInternAtom(mDisplay, "XV_AUTOPAINT_COLORKEY", False);
               if(xv_atom!=None)
               {
                  rez=XvSetPortAttribute(mDisplay, xv_port, xv_atom, 1);
                  if(rez == Success) 
                     keycolor_handling = AUTOPAINT_COLORKEY;
               }
               break;
            }
	 }
         XFree(attributes);
      }
   }

   xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False);
   if(xv_atom == None) return;
   rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey);
   if(rez == Success){
      keycolor = colorkey;
      if(keycolor_handling == AUTO_COLORKEY){
         keycolor_handling = MANUALFILL_COLORKEY;
      }
   }
}

//from vo_xmga

      return -1;
   }
   surface_render = NULL;
   xv_port = 0;
   number_of_surfaces = 0;
   keycolor_handling = MANUALFILL_COLORKEY;//fixme
   subpicture_alloc = 0;
   
   benchmark = 0; //disable PutImageto allow faster display than screen refresh
   busy_wait = 1;
   use_queue = 0;

14635:1c277cafd3b1

   if(keycolor_handling == AUTO_COLORKEY){
   //XV_AUTOPING_COLORKEY doesn't work for XvMC yet(NVidia 43.63)
      attributes = XvQueryPortAttributes(mDisplay, xv_port, &attrib_count);
      if(attributes!=NULL){
         for (i = 0; i < attrib_count; i++){
            if (!strcmp(attributes[i].name, "XV_COLORKEY"))
            {
               xv_atom = XInternAtom(mDisplay, "XV_COLORKEY", False);
               if(xv_atom!=None)
               {
                  rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey);
                  if(rez == Success){
                     keycolor = colorkey;
                     keycolor_handling = MANUALFILL_COLORKEY;
                   }
               }
               break;
            }
         }
         XFree(attributes);
      }
   }
}

//from vo_xmga

      return -1;
   }
   surface_render = NULL;
   xv_port = 0;
   number_of_surfaces = 0;
   keycolor_handling = AUTO_COLORKEY;
   subpicture_alloc = 0;
   
   benchmark = 0; //disable PutImageto allow faster display than screen refresh
   busy_wait = 1;
   use_queue = 0;