diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2019-03-21 17:59:49 -0700 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2019-05-01 13:25:38 -0700 |
| commit | 3ea8f1d536da8f09f3e663cf173fe4f1b0fe4130 (patch) | |
| tree | d0ba55fd46cb12b1197726bb18effab6d9c9c421 /decoder | |
| parent | 4c747e2e9afa6a4852be37f97d17d9a19d8fea34 (diff) | |
| download | platform_external_libmpeg2-3ea8f1d536da8f09f3e663cf173fe4f1b0fe4130.tar.gz platform_external_libmpeg2-3ea8f1d536da8f09f3e663cf173fe4f1b0fe4130.tar.bz2 platform_external_libmpeg2-3ea8f1d536da8f09f3e663cf173fe4f1b0fe4130.zip | |
Allow setting stride equal to width of the clipandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
Current check did not allow stride to be set equal to width of the clip,
once it was set to a larger value.
In one of the AdaptivePlaybackTests, stride is set to a value larger
than current width before decoding the header and then set to value
equal to width as buffers are allocated as per the new width.
Decoder was expecting the stride to be larger value, thus resulting in
buffer size errors.
Bug: 124531341
Test: cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases \
-t android.media.cts.AdaptivePlaybackTest#testMpeg2_adaptiveDrc
Change-Id: I056aa943ab4281d268926a670bef7e9503227cb5
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/impeg2d_api_main.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/decoder/impeg2d_api_main.c b/decoder/impeg2d_api_main.c index d14b019..33a7281 100644 --- a/decoder/impeg2d_api_main.c +++ b/decoder/impeg2d_api_main.c @@ -1087,18 +1087,7 @@ IV_API_CALL_STATUS_T impeg2d_api_set_params(iv_obj_t *ps_dechdl,void *pv_api_ip, if(ps_ctl_dec_ip->s_ivd_ctl_set_config_ip_t.u4_disp_wd != 0) { - if(ps_dec_state->u2_header_done == 1) - { - if (ps_ctl_dec_ip->s_ivd_ctl_set_config_ip_t.u4_disp_wd > ps_dec_state->u2_frame_width) - { - ps_dec_state->u4_frm_buf_stride = ps_ctl_dec_ip->s_ivd_ctl_set_config_ip_t.u4_disp_wd; - } - } - else - { - ps_dec_state->u4_frm_buf_stride = ps_ctl_dec_ip->s_ivd_ctl_set_config_ip_t.u4_disp_wd; - } - + ps_dec_state->u4_frm_buf_stride = ps_ctl_dec_ip->s_ivd_ctl_set_config_ip_t.u4_disp_wd; } else { |