[svn] / branches / release-1_3-branch / xvidcore / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/vfw/src/codec.c

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

revision 1487, Sun Jul 11 08:54:38 2004 UTC revision 1495, Thu Jul 15 11:53:46 2004 UTC
# Line 643  Line 643 
643  }  }
644    
645    
646    #define CALC_BI_STRIDE(width,bitcount)  ((((width * bitcount) + 31) & ~31) >> 3)
647    
648  LRESULT compress(CODEC * codec, ICCOMPRESS * icc)  LRESULT compress(CODEC * codec, ICCOMPRESS * icc)
649  {  {
650          BITMAPINFOHEADER * inhdr = icc->lpbiInput;          BITMAPINFOHEADER * inhdr = icc->lpbiInput;
# Line 776  Line 778 
778          }          }
779    
780          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
781          frame.input.stride[0] = (((icc->lpbiInput->biWidth * icc->lpbiInput->biBitCount) + 31) & ~31) >> 3;          frame.input.stride[0] = CALC_BI_STRIDE(icc->lpbiInput->biWidth, icc->lpbiInput->biBitCount);
782    
783          if ((frame.input.csp = get_colorspace(inhdr)) == XVID_CSP_NULL)          if ((frame.input.csp = get_colorspace(inhdr)) == XVID_CSP_NULL)
784                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
# Line 929  Line 931 
931          outhdr->biPlanes = 1;          outhdr->biPlanes = 1;
932          outhdr->biBitCount = 24;          outhdr->biBitCount = 24;
933          outhdr->biCompression = BI_RGB; /* sonic foundry vegas video v3 only supports BI_RGB */          outhdr->biCompression = BI_RGB; /* sonic foundry vegas video v3 only supports BI_RGB */
934          outhdr->biSizeImage = outhdr->biWidth * outhdr->biHeight * outhdr->biBitCount / 8;          outhdr->biSizeImage = outhdr->biHeight * CALC_BI_STRIDE(outhdr->biWidth, outhdr->biBitCount);
935    
936          outhdr->biXPelsPerMeter = 0;          outhdr->biXPelsPerMeter = 0;
937          outhdr->biYPelsPerMeter = 0;          outhdr->biYPelsPerMeter = 0;
938          outhdr->biClrUsed = 0;          outhdr->biClrUsed = 0;
# Line 1035  Line 1038 
1038    
1039                  convert.input.csp = get_colorspace(icd->lpbiInput);                  convert.input.csp = get_colorspace(icd->lpbiInput);
1040                  convert.input.plane[0] = icd->lpInput;                  convert.input.plane[0] = icd->lpInput;
1041                  convert.input.stride[0] = (((icd->lpbiInput->biWidth *icd->lpbiInput->biBitCount) + 31) & ~31) >> 3;                  convert.input.stride[0] = CALC_BI_STRIDE(icd->lpbiInput->biWidth, icd->lpbiInput->biBitCount);
1042                  if (convert.input.csp == XVID_CSP_I420 || convert.input.csp == XVID_CSP_YV12)                  if (convert.input.csp == XVID_CSP_I420 || convert.input.csp == XVID_CSP_YV12)
1043                          convert.input.stride[0] = (convert.input.stride[0]*2)/3;                          convert.input.stride[0] = (convert.input.stride[0]*2)/3;
1044    
1045                  convert.output.csp = get_colorspace(icd->lpbiOutput);                  convert.output.csp = get_colorspace(icd->lpbiOutput);
1046                  convert.output.plane[0] = icd->lpOutput;                  convert.output.plane[0] = icd->lpOutput;
1047                  convert.output.stride[0] = (((icd->lpbiOutput->biWidth *icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;                  convert.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);
1048                  if (convert.output.csp == XVID_CSP_I420 || convert.output.csp == XVID_CSP_YV12)                  if (convert.output.csp == XVID_CSP_I420 || convert.output.csp == XVID_CSP_YV12)
1049                          convert.output.stride[0] = (convert.output.stride[0]*2)/3;                          convert.output.stride[0] = (convert.output.stride[0]*2)/3;
1050    
# Line 1071  Line 1074 
1074                          return ICERR_BADFORMAT;                          return ICERR_BADFORMAT;
1075                  }                  }
1076                  frame.output.plane[0] = icd->lpOutput;                  frame.output.plane[0] = icd->lpOutput;
1077                  frame.output.stride[0] = (((icd->lpbiOutput->biWidth * icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;                  frame.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);
1078                  if (frame.output.csp == XVID_CSP_I420 || frame.output.csp == XVID_CSP_YV12)                  if (frame.output.csp == XVID_CSP_I420 || frame.output.csp == XVID_CSP_YV12)
1079                          frame.output.stride[0] = (frame.output.stride[0]*2)/3;                          frame.output.stride[0] = (frame.output.stride[0]*2)/3;
1080          }          }

Legend:
Removed from v.1487  
changed lines
  Added in v.1495

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4