aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBuddy Liong2015-10-27 17:40:33 -0500
committerBuddy Liong2015-10-27 17:40:33 -0500
commite05d0b506a8f5e9218449d3952ee6c1d327fddb5 (patch)
treedef84668a8d548c87da23978498cae52563bae5c
parent5c45f781d307f799af9dceb5ff636d5477694e16 (diff)
downloadrepo-libdce-e05d0b506a8f5e9218449d3952ee6c1d327fddb5.tar.gz
repo-libdce-e05d0b506a8f5e9218449d3952ee6c1d327fddb5.tar.xz
repo-libdce-e05d0b506a8f5e9218449d3952ee6c1d327fddb5.zip
[DCE_TEST] Revert 5c45f781
Commit id: 5c45f781d307f799af9dceb5ff636d5477694e16 [DCE_TEST] Fixing the decoded output resolution Only fixing H.264 1920x1080 for non-tiler. The patch brokes MPEG2 decoding and H.264 1920x1080 with TILER. Reverting the changes. Change-Id: Ibf91c40e330c5eb56e804628db3a0e4ece469e8a Signed-off-by: Buddy Liong <buddy.liong@ti.com>
-rw-r--r--test_qnx/dce_test/dce_test.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/test_qnx/dce_test/dce_test.c b/test_qnx/dce_test/dce_test.c
index 17fbd44..7e60dd0 100644
--- a/test_qnx/dce_test/dce_test.c
+++ b/test_qnx/dce_test/dce_test.c
@@ -725,6 +725,10 @@ int main(int argc, char * *argv)
725 725
726 DEBUG("Num Frames is %d width=%d, height=%d", frameCount, width, height); 726 DEBUG("Num Frames is %d width=%d, height=%d", frameCount, width, height);
727 727
728 /* calculate output buffer parameters: */
729 width = ALIGN2(width, 4); /* round up to MB */
730 height = ALIGN2(height, 4); /* round up to MB */
731
728 switch( codec_switch ) { 732 switch( codec_switch ) {
729 case DCE_TEST_H264 : 733 case DCE_TEST_H264 :
730 padded_width = ALIGN2(width + (2 * PADX_H264), 7); 734 padded_width = ALIGN2(width + (2 * PADX_H264), 7);
@@ -788,7 +792,7 @@ int main(int argc, char * *argv)
788 params->maxBitRate = 10000000; 792 params->maxBitRate = 10000000;
789 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_AUTO; 793 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_AUTO;
790 params->numOutputDataUnits = 0; 794 params->numOutputDataUnits = 0;
791 params->maxWidth = ALIGN2(width, 4); 795 params->maxWidth = width;
792 break; 796 break;
793 case DCE_TEST_MPEG4 : 797 case DCE_TEST_MPEG4 :
794 params = dce_alloc(sizeof(IMPEG4VDEC_Params)); 798 params = dce_alloc(sizeof(IMPEG4VDEC_Params));
@@ -800,7 +804,7 @@ int main(int argc, char * *argv)
800 params->maxBitRate = 10000000; 804 params->maxBitRate = 10000000;
801 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_1; 805 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_1;
802 params->numOutputDataUnits = 0; 806 params->numOutputDataUnits = 0;
803 params->maxWidth = ALIGN2(width, 4); 807 params->maxWidth = width;
804 break; 808 break;
805 case DCE_TEST_VC1SMP : 809 case DCE_TEST_VC1SMP :
806 case DCE_TEST_VC1AP : 810 case DCE_TEST_VC1AP :
@@ -813,7 +817,7 @@ int main(int argc, char * *argv)
813 params->maxBitRate = 45000000; 817 params->maxBitRate = 45000000;
814 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_1; 818 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_1;
815 params->numOutputDataUnits = 0; 819 params->numOutputDataUnits = 0;
816 params->maxWidth = ALIGN2(width, 4); 820 params->maxWidth = width;
817 break; 821 break;
818 case DCE_TEST_MJPEG : 822 case DCE_TEST_MJPEG :
819 params = dce_alloc(sizeof(IJPEGVDEC_Params)); 823 params = dce_alloc(sizeof(IJPEGVDEC_Params));
@@ -825,7 +829,7 @@ int main(int argc, char * *argv)
825 params->maxBitRate = 10000000; 829 params->maxBitRate = 10000000;
826 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_1; 830 params->displayDelay = IVIDDEC3_DISPLAY_DELAY_1;
827 params->numOutputDataUnits = 1; 831 params->numOutputDataUnits = 1;
828 params->maxWidth = ALIGN2(width, 4); 832 params->maxWidth = width;
829 break; 833 break;
830 834
831 case DCE_TEST_MPEG2 : 835 case DCE_TEST_MPEG2 :
@@ -843,7 +847,7 @@ int main(int argc, char * *argv)
843 847
844 } 848 }
845 849
846 params->maxHeight = ALIGN2(height, 4); 850 params->maxHeight = height;
847 params->maxFrameRate = 30000; 851 params->maxFrameRate = 30000;
848 params->dataEndianness = XDM_BYTE; 852 params->dataEndianness = XDM_BYTE;
849 params->forceChromaFormat = XDM_YUV_420SP; 853 params->forceChromaFormat = XDM_YUV_420SP;