[svn] / branches / dev-api-3 / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /branches/dev-api-3/vfw/src/codec.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 716, Sat Dec 14 06:09:33 2002 UTC revision 811, Sun Jan 26 14:59:12 2003 UTC
# Line 386  Line 386 
386          frame.general |= XVID_HALFPEL;          frame.general |= XVID_HALFPEL;
387  //      frame.general |= XVID_ME_EPZS;  //      frame.general |= XVID_ME_EPZS;
388    
   
389          if (codec->config.motion_search > 4)          if (codec->config.motion_search > 4)
390                  frame.general |= XVID_INTER4V;                  frame.general |= XVID_INTER4V;
391    
# Line 405  Line 404 
404                  frame.general |= XVID_GMC;                  frame.general |= XVID_GMC;
405    
406          if (codec->config.chromame)          if (codec->config.chromame)
407                  frame.general |= XVID_ME_COLOUR;                  frame.motion |= PMV_CHROMA16 + PMV_CHROMA8;
408    
409          if (codec->config.reduced_resolution)          if (codec->config.reduced_resolution)
410                  frame.general |= XVID_REDUCED;                  frame.general |= XVID_REDUCED;
# Line 459  Line 458 
458          frame.motion |= pmvfast_presets[codec->config.motion_search];          frame.motion |= pmvfast_presets[codec->config.motion_search];
459    
460          frame.image = icc->lpInput;          frame.image = icc->lpInput;
         // dev-api-3  
461          frame.stride = (((icc->lpbiInput->biWidth * icc->lpbiInput->biBitCount) + 31) & ~31) >> 3;          frame.stride = (((icc->lpbiInput->biWidth * icc->lpbiInput->biBitCount) + 31) & ~31) >> 3;
462    
463          if ((frame.colorspace = get_colorspace(inhdr)) == XVID_CSP_NULL)          if ((frame.colorspace = get_colorspace(inhdr)) == XVID_CSP_NULL)
464                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
465    
466            if (frame.colorspace == XVID_CSP_I420 || frame.colorspace == XVID_CSP_YV12)
467                    frame.stride = (frame.stride*2)/3;
468    
469          frame.bitstream = icc->lpOutput;          frame.bitstream = icc->lpOutput;
470          frame.length = icc->lpbiOutput->biSizeImage;          frame.length = icc->lpbiOutput->biSizeImage;
471    
# Line 660  Line 661 
661          }          }
662          /* --- yv12 --- */          /* --- yv12 --- */
663    
664          result = decompress_query(codec, lpbiInput, lpbiOutput);          result = decompress_query(codec, lpbiInput, NULL);
665          if (result != ICERR_OK)          if (result != ICERR_OK)
666          {          {
667                  return result;                  return result;
668          }          }
669    
         memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER));  
670          outhdr->biSize = sizeof(BITMAPINFOHEADER);          outhdr->biSize = sizeof(BITMAPINFOHEADER);
671          outhdr->biCompression = FOURCC_YUY2;          outhdr->biWidth = inhdr->biWidth;
672            outhdr->biHeight = inhdr->biHeight;
673            outhdr->biPlanes = 1;
674            outhdr->biBitCount = 24;
675            outhdr->biCompression = BI_RGB; /* sonic foundry vegas video v3 only supports BI_RGB */
676          outhdr->biSizeImage = outhdr->biWidth * outhdr->biHeight * outhdr->biBitCount;          outhdr->biSizeImage = outhdr->biWidth * outhdr->biHeight * outhdr->biBitCount;
677          outhdr->biXPelsPerMeter = 0;          outhdr->biXPelsPerMeter = 0;
678          outhdr->biYPelsPerMeter = 0;          outhdr->biYPelsPerMeter = 0;
# Line 736  Line 740 
740                  frame.general |= XVID_DEC_DEBLOCKUV;                  frame.general |= XVID_DEC_DEBLOCKUV;
741    
742          frame.image = icd->lpOutput;          frame.image = icd->lpOutput;
 //      frame.stride = icd->lpbiOutput->biWidth;  
         // dev-api-3:  
743          frame.stride = (((icd->lpbiOutput->biWidth * icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;          frame.stride = (((icd->lpbiOutput->biWidth * icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
744    
745          /* --- yv12 --- */          /* --- yv12 --- */
# Line 751  Line 753 
753                  convert.input.colorspace = get_colorspace(icd->lpbiInput);                  convert.input.colorspace = get_colorspace(icd->lpbiInput);
754                  convert.input.y = icd->lpInput;                  convert.input.y = icd->lpInput;
755                  convert.input.y_stride = (((icd->lpbiInput->biWidth *icd->lpbiInput->biBitCount) + 31) & ~31) >> 3;                  convert.input.y_stride = (((icd->lpbiInput->biWidth *icd->lpbiInput->biBitCount) + 31) & ~31) >> 3;
756                    if (convert.input.colorspace == XVID_CSP_I420 || convert.input.colorspace == XVID_CSP_YV12)
757                            convert.input.y_stride = (convert.input.y_stride*2)/3;
758    
759                  convert.output.colorspace = get_colorspace(icd->lpbiOutput);                  convert.output.colorspace = get_colorspace(icd->lpbiOutput);
760                  convert.output.y = icd->lpOutput;                  convert.output.y = icd->lpOutput;
761                  convert.output.y_stride = (((icd->lpbiOutput->biWidth *icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;                  convert.output.y_stride = (((icd->lpbiOutput->biWidth *icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
762                    if (convert.output.colorspace == XVID_CSP_I420 || convert.output.colorspace == XVID_CSP_YV12)
763                            convert.output.y_stride = (convert.output.y_stride*2)/3;
764    
765                  convert.width = icd->lpbiInput->biWidth;                  convert.width = icd->lpbiInput->biWidth;
766                  convert.height = icd->lpbiInput->biHeight;                  convert.height = icd->lpbiInput->biHeight;
767                  convert.interlacing = 0;                  convert.interlacing = 0;
# Line 780  Line 788 
788                  frame.colorspace = XVID_CSP_NULL;                  frame.colorspace = XVID_CSP_NULL;
789          }          }
790    
791            if (frame.colorspace == XVID_CSP_I420 || frame.colorspace == XVID_CSP_YV12)
792                    frame.stride = (frame.stride*2)/3;
793    
794          switch (xvid_decore(codec->dhandle, XVID_DEC_DECODE, &frame, NULL))          switch (xvid_decore(codec->dhandle, XVID_DEC_DECODE, &frame, NULL))
795          {          {
796          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
Legend:
Removed from v.716  
changed lines
  Added in v.811
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4