aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test_qnx/dce_enc_test/dce_enc_test.c17
-rw-r--r--test_qnx/dce_test/dce_test.c23
2 files changed, 21 insertions, 19 deletions
diff --git a/test_qnx/dce_enc_test/dce_enc_test.c b/test_qnx/dce_enc_test/dce_enc_test.c
index e9130fd..d5b489e 100644
--- a/test_qnx/dce_enc_test/dce_enc_test.c
+++ b/test_qnx/dce_enc_test/dce_enc_test.c
@@ -545,7 +545,7 @@ int main(int argc, char * *argv)
545 engine = Engine_open("ivahd_vidsvr", NULL, &ec); 545 engine = Engine_open("ivahd_vidsvr", NULL, &ec);
546 546
547 if( !engine ) { 547 if( !engine ) {
548 ERROR("fail"); 548 ERROR("DCE_ENCODE_TEST_FAIL: ENGINE OPEN FAILED");
549 goto out; 549 goto out;
550 } 550 }
551 551
@@ -609,7 +609,7 @@ int main(int argc, char * *argv)
609 609
610 DEBUG("INPUT TILER buf=%p, buf->buf=%p y=%08x, uv=%08x", buf, buf->buf, buf->y, buf->uv); 610 DEBUG("INPUT TILER buf=%p, buf->buf=%p y=%08x, uv=%08x", buf, buf->buf, buf->y, buf->uv);
611 } else { 611 } else {
612 ERROR(" ---------------- tiler_alloc failed --------------------"); 612 ERROR("DCE_ENCODE_TEST_FAIL: TILER ALLOCATION FAILED");
613 free(buf); 613 free(buf);
614 goto shutdown; 614 goto shutdown;
615 } 615 }
@@ -630,7 +630,7 @@ int main(int argc, char * *argv)
630 DEBUG(" ----------------- create NON INPUT TILER buf 0x%x --------------------", (unsigned int)buf); 630 DEBUG(" ----------------- create NON INPUT TILER buf 0x%x --------------------", (unsigned int)buf);
631 err = allocate_nonTiler(&input_nonTiler, width * height * 3/2); 631 err = allocate_nonTiler(&input_nonTiler, width * height * 3/2);
632 if( err < 0 ) { 632 if( err < 0 ) {
633 ERROR(" ---------------- allocate_nonTiler failed --------------------"); 633 ERROR("DCE_ENCODE_TEST_FAIL: NON-TILER ALLOCATION FAILED");
634 free(buf); 634 free(buf);
635 goto shutdown; 635 goto shutdown;
636 } 636 }
@@ -944,7 +944,7 @@ int main(int argc, char * *argv)
944 } 944 }
945 945
946 if( !codec ) { 946 if( !codec ) {
947 ERROR("fail"); 947 ERROR("DCE_ENCODE_TEST_FAIL: CODEC CREATION FAILED");
948 goto out; 948 goto out;
949 } 949 }
950 950
@@ -1146,7 +1146,7 @@ int main(int argc, char * *argv)
1146 } 1146 }
1147 1147
1148 if( err ) { 1148 if( err ) {
1149 ERROR("fail: %d", err); 1149 ERROR("DCE_ENCODE_TEST_FAIL: CODEC CONTROL FAILED %d",err);
1150 goto shutdown; 1150 goto shutdown;
1151 } 1151 }
1152 1152
@@ -1184,7 +1184,7 @@ int main(int argc, char * *argv)
1184 DEBUG("Output allocate through NON-TILER"); 1184 DEBUG("Output allocate through NON-TILER");
1185 err = allocate_nonTiler(&output_nonTiler, output_size); 1185 err = allocate_nonTiler(&output_nonTiler, output_size);
1186 if( err < 0 ) { 1186 if( err < 0 ) {
1187 ERROR("fail: %d", err); 1187 ERROR("DCE_ENCODE_TEST_FAIL: NON_TILER ALLOCATION FAILED %d",err);
1188 goto shutdown; 1188 goto shutdown;
1189 } 1189 }
1190 output = (char*) output_nonTiler.vir_addr; 1190 output = (char*) output_nonTiler.vir_addr;
@@ -1204,7 +1204,7 @@ int main(int argc, char * *argv)
1204 else { 1204 else {
1205 err = allocate_nonTiler(&output_mvbuf_nonTiler, mvbufinfo_size); 1205 err = allocate_nonTiler(&output_mvbuf_nonTiler, mvbufinfo_size);
1206 if( err < 0 ) { 1206 if( err < 0 ) {
1207 ERROR("fail: %d", err); 1207 ERROR("DCE_ENCODE_TEST_FAIL: NON_TILER ALLOCATION FAILED %d",err);
1208 goto shutdown; 1208 goto shutdown;
1209 } 1209 }
1210 output_mvbuf = (char*) output_mvbuf_nonTiler.vir_addr; 1210 output_mvbuf = (char*) output_mvbuf_nonTiler.vir_addr;
@@ -1409,6 +1409,7 @@ int main(int argc, char * *argv)
1409 ERROR("process returned error: %d\n", err); 1409 ERROR("process returned error: %d\n", err);
1410 //ERROR("extendedError: %08x", outArgs->extendedError); 1410 //ERROR("extendedError: %08x", outArgs->extendedError);
1411 ERROR("extendedError: %08x", h264enc_outArgs->videnc2OutArgs.extendedError); 1411 ERROR("extendedError: %08x", h264enc_outArgs->videnc2OutArgs.extendedError);
1412 ERROR("DCE_ENCODE_TEST_FAIL: CODEC FATAL ERROR");
1412 goto shutdown; 1413 goto shutdown;
1413 } else if( eof ) { 1414 } else if( eof ) {
1414 //ERROR("Codec_process returned err=%d, extendedError=%08x", err, outArgs->extendedError); 1415 //ERROR("Codec_process returned err=%d, extendedError=%08x", err, outArgs->extendedError);
@@ -1433,7 +1434,7 @@ int main(int argc, char * *argv)
1433 DEBUG("[DCE_ENC_TEST] VIDENC2_process - err %d", err); 1434 DEBUG("[DCE_ENC_TEST] VIDENC2_process - err %d", err);
1434 if( err < 0 ) { 1435 if( err < 0 ) {
1435 //TODO error handling on MPEG4/H.263 1436 //TODO error handling on MPEG4/H.263
1436 ERROR("Codec_process returned err=%d, extendedError=%08x", err, mpeg4enc_outArgs->videnc2OutArgs.extendedError); 1437 ERROR("DCE_ENCODE_TEST_FAIL: CODEC PROCESS RETURNED ERROR : err=%d, extendedError=%08x", err, mpeg4enc_outArgs->videnc2OutArgs.extendedError);
1437 goto shutdown; 1438 goto shutdown;
1438 } 1439 }
1439 DEBUG("\n bytesGenerated %d", mpeg4enc_outArgs->videnc2OutArgs.bytesGenerated); 1440 DEBUG("\n bytesGenerated %d", mpeg4enc_outArgs->videnc2OutArgs.bytesGenerated);
diff --git a/test_qnx/dce_test/dce_test.c b/test_qnx/dce_test/dce_test.c
index c66598c..3b640a5 100644
--- a/test_qnx/dce_test/dce_test.c
+++ b/test_qnx/dce_test/dce_test.c
@@ -718,7 +718,7 @@ int main(int argc, char * *argv)
718 frameCount++; 718 frameCount++;
719 719
720 if( frameCount >= 64000 ) { 720 if( frameCount >= 64000 ) {
721 DEBUG("Num Frames %d exceeded MAX limit %d \n", frameCount, 64000); 721 ERROR("DCE_TEST_FAIL: Num Frames %d exceeded MAX limit %d \n", frameCount, 64000);
722 goto out; 722 goto out;
723 } 723 }
724 } 724 }
@@ -775,7 +775,7 @@ int main(int argc, char * *argv)
775 engine = Engine_open("ivahd_vidsvr", NULL, &ec); 775 engine = Engine_open("ivahd_vidsvr", NULL, &ec);
776 776
777 if( !engine ) { 777 if( !engine ) {
778 ERROR("fail"); 778 ERROR("DCE_TEST_FAIL: engine open failed");
779 goto out; 779 goto out;
780 } 780 }
781 781
@@ -785,7 +785,7 @@ int main(int argc, char * *argv)
785 case DCE_TEST_H264 : 785 case DCE_TEST_H264 :
786 params = dce_alloc(sizeof(IH264VDEC_Params)); 786 params = dce_alloc(sizeof(IH264VDEC_Params));
787 if( !params ) { 787 if( !params ) {
788 ERROR("dce_alloc fail"); 788 ERROR("DCE_TEST_FAIL: Parameter memory allocation failed");
789 goto out; 789 goto out;
790 } 790 }
791 params->size = sizeof(IH264VDEC_Params); 791 params->size = sizeof(IH264VDEC_Params);
@@ -797,7 +797,7 @@ int main(int argc, char * *argv)
797 case DCE_TEST_MPEG4 : 797 case DCE_TEST_MPEG4 :
798 params = dce_alloc(sizeof(IMPEG4VDEC_Params)); 798 params = dce_alloc(sizeof(IMPEG4VDEC_Params));
799 if( !params ) { 799 if( !params ) {
800 ERROR("dce_alloc fail"); 800 ERROR("DCE_TEST_FAIL: Parameter memory allocation failed");
801 goto out; 801 goto out;
802 } 802 }
803 params->size = sizeof(IMPEG4VDEC_Params); 803 params->size = sizeof(IMPEG4VDEC_Params);
@@ -810,7 +810,7 @@ int main(int argc, char * *argv)
810 case DCE_TEST_VC1AP : 810 case DCE_TEST_VC1AP :
811 params = dce_alloc(sizeof(IVC1VDEC_Params)); 811 params = dce_alloc(sizeof(IVC1VDEC_Params));
812 if( !params ) { 812 if( !params ) {
813 ERROR("dce_alloc fail"); 813 ERROR("DCE_TEST_FAIL: Parameter memory allocation failed");
814 goto out; 814 goto out;
815 } 815 }
816 params->size = sizeof(IVC1VDEC_Params); 816 params->size = sizeof(IVC1VDEC_Params);
@@ -822,7 +822,7 @@ int main(int argc, char * *argv)
822 case DCE_TEST_MJPEG : 822 case DCE_TEST_MJPEG :
823 params = dce_alloc(sizeof(IJPEGVDEC_Params)); 823 params = dce_alloc(sizeof(IJPEGVDEC_Params));
824 if( !params ) { 824 if( !params ) {
825 ERROR("dce_alloc fail"); 825 ERROR("DCE_TEST_FAIL: Parameter memory allocation failed");
826 goto out; 826 goto out;
827 } 827 }
828 params->size = sizeof(IJPEGVDEC_Params); 828 params->size = sizeof(IJPEGVDEC_Params);
@@ -835,7 +835,7 @@ int main(int argc, char * *argv)
835 case DCE_TEST_MPEG2 : 835 case DCE_TEST_MPEG2 :
836 params = dce_alloc(sizeof(IMPEG2VDEC_Params)); 836 params = dce_alloc(sizeof(IMPEG2VDEC_Params));
837 if( !params ) { 837 if( !params ) {
838 ERROR("dce_alloc fail"); 838 ERROR("DCE_TEST_FAIL: Parameter memory allocation failed");
839 goto out; 839 goto out;
840 } 840 }
841 params->size = sizeof(IMPEG2VDEC_Params); 841 params->size = sizeof(IMPEG2VDEC_Params);
@@ -941,7 +941,7 @@ int main(int argc, char * *argv)
941 } 941 }
942 942
943 if( !codec ) { 943 if( !codec ) {
944 ERROR("fail"); 944 ERROR("DCE_TEST_FAIL: codec creation failed");
945 goto out; 945 goto out;
946 } 946 }
947 947
@@ -1136,7 +1136,7 @@ int main(int argc, char * *argv)
1136#endif 1136#endif
1137 1137
1138 if( err ) { 1138 if( err ) {
1139 ERROR("fail: %d", err); 1139 ERROR("DCE_TEST_FAIL: codec control failed %d",err);
1140 goto shutdown; 1140 goto shutdown;
1141 } 1141 }
1142 1142
@@ -1177,7 +1177,7 @@ int main(int argc, char * *argv)
1177#endif 1177#endif
1178 1178
1179 if( err ) { 1179 if( err ) {
1180 ERROR("fail: %d", err); 1180 ERROR("DCE_TEST_FAIL: buffer allocation failed %d", err);
1181 goto shutdown; 1181 goto shutdown;
1182 } 1182 }
1183 1183
@@ -1199,7 +1199,7 @@ int main(int argc, char * *argv)
1199 if( !outBufsInUse ) { 1199 if( !outBufsInUse ) {
1200 buf = output_get(); 1200 buf = output_get();
1201 if( !buf ) { 1201 if( !buf ) {
1202 ERROR("fail: out of buffers"); 1202 ERROR("DCE_TEST_FAIL: out of buffers");
1203 goto shutdown; 1203 goto shutdown;
1204 } 1204 }
1205 } else { 1205 } else {
@@ -1360,6 +1360,7 @@ int main(int argc, char * *argv)
1360 if( XDM_ISFATALERROR(outArgs->extendedError)) { 1360 if( XDM_ISFATALERROR(outArgs->extendedError)) {
1361 ERROR("process returned error: %d\n", err); 1361 ERROR("process returned error: %d\n", err);
1362 ERROR("extendedError: %08x", outArgs->extendedError); 1362 ERROR("extendedError: %08x", outArgs->extendedError);
1363 ERROR("DCE_TEST_FAIL: codec fatal error");
1363 goto shutdown; 1364 goto shutdown;
1364 } else if( eof ) { 1365 } else if( eof ) {
1365 /* 1366 /*