History

remove "\n" which shoudl be added by the trace sink

ruil2 committed 12 years ago

Commit 40e952f1 parent bac551116 files · +249 −249Browse files

Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 16 files). Show all

Unified · Split

codec/decoder/core/src/au_parser.cpp+23−23
@@ -146,7 +146,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 145 unmodified lines
146146 || pCtx->bSpsExistAheadFlag)) {
147147 if (pCtx->bPrintFrameErrorTraceFlag) {
148148 WelsLog (pLogCtx, WELS_LOG_WARNING,
149− "parse_nal(), no exist Sequence Parameter Sets ahead of sequence when try to decode NAL(type:%d).\n",
149+ "parse_nal(), no exist Sequence Parameter Sets ahead of sequence when try to decode NAL(type:%d).",
150150 pNalUnitHeader->eNalUnitType);
151151 }
152152 pCtx->iErrorCode = dsNoParamSets;
@@ -156,7 +156,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 3 unmodified lines
156156 || pCtx->bPpsExistAheadFlag)) {
157157 if (pCtx->bPrintFrameErrorTraceFlag) {
158158 WelsLog (pLogCtx, WELS_LOG_WARNING,
159− "parse_nal(), no exist Picture Parameter Sets ahead of sequence when try to decode NAL(type:%d).\n",
159+ "parse_nal(), no exist Picture Parameter Sets ahead of sequence when try to decode NAL(type:%d).",
160160 pNalUnitHeader->eNalUnitType);
161161 }
162162 pCtx->iErrorCode = dsNoParamSets;
@@ -167,7 +167,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 4 unmodified lines
167167 || pCtx->bPpsExistAheadFlag))) {
168168 if (pCtx->bPrintFrameErrorTraceFlag) {
169169 WelsLog (pLogCtx, WELS_LOG_WARNING,
170− "ParseNalHeader(), no exist Parameter Sets ahead of sequence when try to decode slice(type:%d).\n",
170+ "ParseNalHeader(), no exist Parameter Sets ahead of sequence when try to decode slice(type:%d).",
171171 pNalUnitHeader->eNalUnitType);
172172 }
173173 pCtx->iErrorCode |= dsNoParamSets;
@@ -204,7 +204,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 30 unmodified lines
204204 DecodeNalHeaderExt (pCurNal, pNal);
205205 if ((pCurNal->sNalHeaderExt.uiQualityId != 0) || (pCurNal->sNalHeaderExt.bUseRefBasePicFlag != 0)) {
206206 WelsLog (pLogCtx, WELS_LOG_WARNING,
207− "ParseNalHeader() in Prefix Nal Unit:uiQualityId (%d) != 0, bUseRefBasePicFlag (%d) != 0, not supported!\n",
207+ "ParseNalHeader() in Prefix Nal Unit:uiQualityId (%d) != 0, bUseRefBasePicFlag (%d) != 0, not supported!",
208208 pCurNal->sNalHeaderExt.uiQualityId, pCurNal->sNalHeaderExt.bUseRefBasePicFlag);
209209 PAccessUnit pCurAu = pCtx->pAccessUnitList;
210210 uint32_t uiAvailNalNum = pCurAu->uiAvailUnitsNum;
@@ -246,7 +246,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 35 unmodified lines
246246 uint32_t uiAvailNalNum;
247247 pCurNal = MemGetNextNal (&pCtx->pAccessUnitList);
248248 if (NULL == pCurNal) {
249− WelsLog (pLogCtx, WELS_LOG_ERROR, "MemGetNextNal() fail due out of memory.\n");
249+ WelsLog (pLogCtx, WELS_LOG_ERROR, "MemGetNextNal() fail due out of memory.");
250250 pCtx->iErrorCode |= dsOutOfMemory;
251251 return NULL;
252252 }
@@ -274,10 +274,10 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 21 unmodified lines
274274 if (pCurNal->sNalHeaderExt.uiQualityId != 0 ||
275275 pCurNal->sNalHeaderExt.bUseRefBasePicFlag) {
276276 if (pCurNal->sNalHeaderExt.uiQualityId != 0)
277− WelsLog (pLogCtx, WELS_LOG_WARNING, "ParseNalHeader():uiQualityId (%d) != 0, MGS not supported!\n",
277+ WelsLog (pLogCtx, WELS_LOG_WARNING, "ParseNalHeader():uiQualityId (%d) != 0, MGS not supported!",
278278 pCurNal->sNalHeaderExt.uiQualityId);
279279 if (pCurNal->sNalHeaderExt.bUseRefBasePicFlag != 0)
280− WelsLog (pLogCtx, WELS_LOG_WARNING, "ParseNalHeader():bUseRefBasePicFlag (%d) != 0, MGS not supported!\n",
280+ WelsLog (pLogCtx, WELS_LOG_WARNING, "ParseNalHeader():bUseRefBasePicFlag (%d) != 0, MGS not supported!",
281281 pCurNal->sNalHeaderExt.bUseRefBasePicFlag);
282282
283283 ForceClearCurrentNal (pCurAu);
@@ -630,7 +630,7 @@ int32_t DecodeSpsSvcExt (PWelsDecoderContext pCtx, PSubsetSps pSpsExt, PBitStrin · 346 unmodified lines
630630 pExt->uiExtendedSpatialScalability = uiCode;
631631 if (pExt->uiExtendedSpatialScalability > 2) {
632632 WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
633− "DecodeSpsSvcExt():extended_spatial_scalability (%d) != 0, ESS not supported!\n",
633+ "DecodeSpsSvcExt():extended_spatial_scalability (%d) != 0, ESS not supported!",
634634 pExt->uiExtendedSpatialScalability);
635635 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_ESS);
636636 }
@@ -824,21 +824,21 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 187 unmodified lines
824824 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //chroma_format_idc
825825 pSps->uiChromaFormatIdc = uiCode;
826826 if (pSps->uiChromaFormatIdc != 1) {
827− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): chroma_format_idc (%d) = 1 supported.\n",
827+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): chroma_format_idc (%d) = 1 supported.",
828828 pSps->uiChromaFormatIdc);
829829 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
830830 }
831831 pSps->uiChromaArrayType = pSps->uiChromaFormatIdc;
832832 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //bit_depth_luma_minus8
833833 if (uiCode != 0) {
834− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): bit_depth_luma (%d) Only 8 bit supported.\n", 8 + uiCode);
834+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): bit_depth_luma (%d) Only 8 bit supported.", 8 + uiCode);
835835 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
836836 }
837837 pSps->uiBitDepthLuma = 8;
838838
839839 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //bit_depth_chroma_minus8
840840 if (uiCode != 0) {
841− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): bit_depth_chroma (%d). Only 8 bit supported.\n", 8 + uiCode);
841+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): bit_depth_chroma (%d). Only 8 bit supported.", 8 + uiCode);
842842 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
843843 }
844844 pSps->uiBitDepthChroma = 8;
@@ -850,7 +850,7 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 5 unmodified lines
850850
851851 if (pSps->bSeqScalingMatrixPresentFlag) { // For high profile, it is not used in current application. FIXME
852852 WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
853− "ParseSps(): seq_scaling_matrix_present_flag (%d). Feature not supported.\n",
853+ "ParseSps(): seq_scaling_matrix_present_flag (%d). Feature not supported.",
854854 pSps->bSeqScalingMatrixPresentFlag);
855855 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
856856 }
@@ -888,7 +888,7 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 31 unmodified lines
888888 }
889889 }
890890 if (pSps->uiPocType > 2) {
891− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " illegal pic_order_cnt_type: %d ! \n", pSps->uiPocType);
891+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " illegal pic_order_cnt_type: %d ! ", pSps->uiPocType);
892892 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_POC_TYPE);
893893 }
894894
@@ -899,24 +899,24 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 4 unmodified lines
899899 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_width_in_mbs_minus1
900900 pSps->iMbWidth = PIC_WIDTH_IN_MBS_OFFSET + uiCode;
901901 if (pSps->iMbWidth > MAX_MB_SIZE) {
902− WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_width_in_mbs(%d) exceeds the maximum allowed!\n", pSps->iMbWidth);
902+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_width_in_mbs(%d) exceeds the maximum allowed!", pSps->iMbWidth);
903903 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
904904 }
905905 if (((uint64_t)pSps->iMbWidth * (uint64_t)pSps->iMbWidth) > (uint64_t) (8 * pSLevelLimits->uiMaxFS)) {
906− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the pic_width_in_mbs exceeds the level limits!\n");
906+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the pic_width_in_mbs exceeds the level limits!");
907907 }
908908 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_height_in_map_units_minus1
909909 pSps->iMbHeight = PIC_HEIGHT_IN_MAP_UNITS_OFFSET + uiCode;
910910 if (pSps->iMbHeight > MAX_MB_SIZE) {
911− WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_height_in_mbs(%d) exceeds the maximum allowed!\n", pSps->iMbHeight);
911+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_height_in_mbs(%d) exceeds the maximum allowed!", pSps->iMbHeight);
912912 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
913913 }
914914 if (((uint64_t)pSps->iMbHeight * (uint64_t)pSps->iMbHeight) > (uint64_t) (8 * pSLevelLimits->uiMaxFS)) {
915− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the pic_height_in_mbs exceeds the level limits!\n");
915+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the pic_height_in_mbs exceeds the level limits!");
916916 }
917917 uint32_t uiTmp32 = pSps->iMbWidth * pSps->iMbHeight;
918918 if (uiTmp32 > (uint32_t)pSLevelLimits->uiMaxFS) {
919− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the total count of mb exceeds the level limits!\n");
919+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " the total count of mb exceeds the level limits!");
920920 }
921921 pSps->uiTotalMbCount = uiTmp32;
922922 WELS_CHECK_SE_UPPER_ERROR (pSps->iNumRefFrames, SPS_MAX_NUM_REF_FRAMES_MAX, "max_num_ref_frames",
@@ -927,12 +927,12 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 4 unmodified lines
927927 if (uiMaxDpbFrames > SPS_MAX_NUM_REF_FRAMES_MAX)
928928 uiMaxDpbFrames = SPS_MAX_NUM_REF_FRAMES_MAX;
929929 if ((uint32_t)pSps->iNumRefFrames > uiMaxDpbFrames) {
930− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " max_num_ref_frames exceeds level limits!\n");
930+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " max_num_ref_frames exceeds level limits!");
931931 }
932932 WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //frame_mbs_only_flag
933933 pSps->bFrameMbsOnlyFlag = !!uiCode;
934934 if (!pSps->bFrameMbsOnlyFlag) {
935− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): frame_mbs_only_flag (%d) not supported.\n",
935+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): frame_mbs_only_flag (%d) not supported.",
936936 pSps->bFrameMbsOnlyFlag);
937937 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_MBAFF);
938938 }
@@ -946,14 +946,14 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 7 unmodified lines
946946 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_right_offset
947947 pSps->sFrameCrop.iRightOffset = uiCode;
948948 if ((pSps->sFrameCrop.iLeftOffset + pSps->sFrameCrop.iRightOffset) > ((int32_t)pSps->iMbWidth * 16 / 2)) {
949− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "frame_crop_left_offset + frame_crop_right_offset exceeds limits!\n");
949+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "frame_crop_left_offset + frame_crop_right_offset exceeds limits!");
950950 }
951951 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_top_offset
952952 pSps->sFrameCrop.iTopOffset = uiCode;
953953 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_bottom_offset
954954 pSps->sFrameCrop.iBottomOffset = uiCode;
955955 if ((pSps->sFrameCrop.iTopOffset + pSps->sFrameCrop.iBottomOffset) > ((int32_t)pSps->iMbHeight * 16 / 2)) {
956− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "frame_crop_top_offset + frame_crop_right_offset exceeds limits!\n");
956+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "frame_crop_top_offset + frame_crop_right_offset exceeds limits!");
957957 }
958958 } else {
959959 pSps->sFrameCrop.iLeftOffset = 0; // frame_crop_left_offset
@@ -1090,7 +1090,7 @@ int32_t ParsePps (PWelsDecoderContext pCtx, PPps pPpsList, PBitStringAux pBsAux) · 130 unmodified lines
10901090 WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //slice_group_map_type
10911091 pPps->uiSliceGroupMapType = uiCode;
10921092 if (pPps->uiSliceGroupMapType > 1) {
1093− WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParsePps(): slice_group_map_type (%d): support only 0,1.\n",
1093+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParsePps(): slice_group_map_type (%d): support only 0,1.",
10941094 pPps->uiSliceGroupMapType);
10951095 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_FMOTYPE);
10961096 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t