fillerの有無を切り替えるオプションを追加する。(--filler)

rigaya · Feb 13, 2017 · dfc4f10 · dfc4f10
1 parent 664ebb0
commit dfc4f10
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/VCECore/VCECore.cpp b/VCECore/VCECore.cpp
@@ -1464,8 +1464,8 @@ AMF_RESULT VCECore::initEncoder(VCEParam *prm) {
  m_Params.SetParam(AMF_PARAM_VBV_BUFFER_SIZE(prm->nCodecId), (amf_int64)prm->nVBVBufferSize * 1000);
  m_Params.SetParam(AMF_PARAM_INITIAL_VBV_BUFFER_FULLNESS(prm->nCodecId), (amf_int64)prm->nInitialVBVPercent);
 
- //m_Params.SetParam(AMF_PARAM_FILLER_DATA_ENABLE(prm->nCodecId), false);
  m_Params.SetParam(AMF_PARAM_ENFORCE_HRD(prm->nCodecId), prm->bEnforceHRD != 0);
+ m_Params.SetParam(AMF_PARAM_FILLER_DATA_ENABLE(prm->nCodecId), prm->bFiller != 0);
  if (prm->bVBAQ) m_Params.SetParam(AMF_PARAM_ENABLE_VBAQ(prm->nCodecId), true);
  m_Params.SetParam(AMF_PARAM_SLICES_PER_FRAME(prm->nCodecId), (amf_int64)prm->nSlices);
  m_Params.SetParam(AMF_PARAM_GOP_SIZE(prm->nCodecId), (amf_int64)nGOPLen);

diff --git a/VCECore/VCEParam.cpp b/VCECore/VCEParam.cpp
@@ -78,4 +78,5 @@ void init_vce_param(VCEParam *prm) {
  prm->vui.infoPresent = false;
 
  prm->bEnforceHRD = FALSE;
+ prm->bFiller = FALSE;
 }
diff --git a/VCECore/VCEParam.h b/VCECore/VCEParam.h
@@ -580,7 +580,7 @@ typedef struct {
  int nPAR[2];
  int nRefFrames;
  int nLTRFrames;
- int __reserved__[1];
+ int bFiller;
  bool bReserved;
 
  int nVideoTrack;

diff --git a/VCECore/VCEVersion.h b/VCECore/VCEVersion.h
@@ -27,9 +27,9 @@
 
 #pragma once
 
-#define VER_FILEVERSION 0,3,4,0
-#define VER_STR_FILEVERSION "3.04"
-#define VER_STR_FILEVERSION_TCHAR _T("3.04")
+#define VER_FILEVERSION 0,3,5,0
+#define VER_STR_FILEVERSION "3.05"
+#define VER_STR_FILEVERSION_TCHAR _T("3.05")
 
 #define VCE_AMD_APP_SDK "3.0"
 

diff --git a/VCEEncC/VCEEncC.cpp b/VCEEncC/VCEEncC.cpp
@@ -409,6 +409,7 @@ static tstring help() {
  _T(" set crop pixels of left, up, right, bottom.\n")
  _T("\n")
  _T(" --enforce-hrd enforce hrd compatibility of bitstream\n")
+ _T(" --filler use filler data\n")
  );
  //str += PrintListOptions(_T("--videoformat <string>"), list_videoformat, 0);
  //str += PrintListOptions(_T("--colormatrix <string>"), list_colormatrix, 0);
@@ -1521,6 +1522,10 @@ int ParseOneOption(const TCHAR *option_name, const TCHAR* strInput[], int& i, in
  return 0;
  }
 #endif
+ if (IS_OPTION("filler")) {
+ pParams->bFiller = TRUE;
+ return 0;
+ }
  if (IS_OPTION("enforce-hrd")) {
  pParams->bEnforceHRD = TRUE;
  return 0;