haru/libaribb25
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EDCBによるEPG取得時への対応を厳密化

Browse Source 
復号漏れパケット破棄の設定を削除（破棄しない）
This commit is contained in:
epgdatacapbon 2018-11-25 17:46:16 +09:00
parent 19f96edcce
commit 767a55d293
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
aribb25/libaribb25.cpp
View File

@ -145,17 +145,12 @@ const BOOL CB25Decoder::Decode(BYTE *pSrcBuf, const DWORD dwSrcSize, BYTE **ppDs
buf.data = pSrcBuf;
buf.size = dwSrcSize;
const int rc = _b25->put(_b25, &buf);
if (rc > 0) {
if (discard_scramble) {
*ppDstBuf = nullptr;
*pdwDstSize = 0;
} else {
if (*ppDstBuf != pSrcBuf) {
*ppDstBuf = pSrcBuf;
*pdwDstSize = dwSrcSize;
}
if (rc == ARIB_STD_B25_WARN_PAT_NOT_COMPLETE) {
if (*ppDstBuf != pSrcBuf) {
*ppDstBuf = pSrcBuf;
*pdwDstSize = dwSrcSize;
}
return TRUE;
return TRUE; // success
} else if (rc < 0) {
if (rc >= ARIB_STD_B25_ERROR_NO_ECM_IN_HEAD_32M) {
// pass through
@ -239,7 +234,6 @@ void CB25Decoder::DiscardNullPacket(const bool bEnable)
void CB25Decoder::DiscardScramblePacket(const bool bEnable)
{
// 復号漏れパケット破棄の有無を設定
discard_scramble = bEnable;
}
void CB25Decoder::EnableEmmProcess(const bool bEnable)

1
aribb25/libaribb25.h
View File

@ -52,5 +52,4 @@ private:
ARIB_STD_B25 *_b25;
BYTE *_data;
time_t _errtime;
BOOL discard_scramble = TRUE;
};