[svn] / trunk / xvidcore / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/vfw/src/codec.c

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

revision 1460, Wed May 26 09:39:00 2004 UTC revision 1510, Sun Jul 18 12:45:57 2004 UTC
# Line 588  Line 588 
588                  return ICERR_UNSUPPORTED;                  return ICERR_UNSUPPORTED;
589          }          }
590    
591            free(create.zones);
592          codec->ehandle = create.handle;          codec->ehandle = create.handle;
593          codec->framenum = 0;          codec->framenum = 0;
594          codec->keyspacing = 0;          codec->keyspacing = 0;
# Line 642  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 710  Line 713 
713          frame.vop_flags |= XVID_VOP_HALFPEL;          frame.vop_flags |= XVID_VOP_HALFPEL;
714          frame.vop_flags |= XVID_VOP_HQACPRED;          frame.vop_flags |= XVID_VOP_HQACPRED;
715    
716            if (codec->config.interlacing && codec->config.tff)
717                    frame.vop_flags |= XVID_VOP_TOPFIELDFIRST;
718    
719    
720          if (codec->config.vop_debug)          if (codec->config.vop_debug)
721                  frame.vop_flags |= XVID_VOP_DEBUG;                  frame.vop_flags |= XVID_VOP_DEBUG;
722    
# Line 735  Line 742 
742    
743          frame.motion |= pmvfast_presets[codec->config.motion_search];          frame.motion |= pmvfast_presets[codec->config.motion_search];
744    
745            if (codec->config.vhq_bframe) frame.vop_flags |= XVID_VOP_RD_BVOP;
746    
747    
748          switch (codec->config.vhq_mode)          switch (codec->config.vhq_mode)
749          {          {
750          case VHQ_MODE_DECISION :          case VHQ_MODE_DECISION :
# Line 771  Line 781 
781          }          }
782    
783          frame.input.plane[0] = icc->lpInput;          frame.input.plane[0] = icc->lpInput;
784          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);
785    
786          if ((frame.input.csp = get_colorspace(inhdr)) == XVID_CSP_NULL)          if ((frame.input.csp = get_colorspace(inhdr)) == XVID_CSP_NULL)
787                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
# Line 924  Line 934 
934          outhdr->biPlanes = 1;          outhdr->biPlanes = 1;
935          outhdr->biBitCount = 24;          outhdr->biBitCount = 24;
936          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 */
937          outhdr->biSizeImage = outhdr->biWidth * outhdr->biHeight * outhdr->biBitCount / 8;          outhdr->biSizeImage = outhdr->biHeight * CALC_BI_STRIDE(outhdr->biWidth, outhdr->biBitCount);
938    
939          outhdr->biXPelsPerMeter = 0;          outhdr->biXPelsPerMeter = 0;
940          outhdr->biYPelsPerMeter = 0;          outhdr->biYPelsPerMeter = 0;
941          outhdr->biClrUsed = 0;          outhdr->biClrUsed = 0;
# Line 1030  Line 1041 
1041    
1042                  convert.input.csp = get_colorspace(icd->lpbiInput);                  convert.input.csp = get_colorspace(icd->lpbiInput);
1043                  convert.input.plane[0] = icd->lpInput;                  convert.input.plane[0] = icd->lpInput;
1044                  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);
1045                  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)
1046                          convert.input.stride[0] = (convert.input.stride[0]*2)/3;                          convert.input.stride[0] = (convert.input.stride[0]*2)/3;
1047    
1048                  convert.output.csp = get_colorspace(icd->lpbiOutput);                  convert.output.csp = get_colorspace(icd->lpbiOutput);
1049                  convert.output.plane[0] = icd->lpOutput;                  convert.output.plane[0] = icd->lpOutput;
1050                  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);
1051                  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)
1052                          convert.output.stride[0] = (convert.output.stride[0]*2)/3;                          convert.output.stride[0] = (convert.output.stride[0]*2)/3;
1053    
# Line 1066  Line 1077 
1077                          return ICERR_BADFORMAT;                          return ICERR_BADFORMAT;
1078                  }                  }
1079                  frame.output.plane[0] = icd->lpOutput;                  frame.output.plane[0] = icd->lpOutput;
1080                  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);
1081                  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)
1082                          frame.output.stride[0] = (frame.output.stride[0]*2)/3;                          frame.output.stride[0] = (frame.output.stride[0]*2)/3;
1083          }          }
Legend:
Removed from v.1460  
changed lines
  Added in v.1510
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4