summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHamsalekha S <hamsalekha.s@ittiam.com>2015-05-22 17:50:10 +0530
committerMarco Nelissen <marcone@google.com>2015-06-25 08:25:42 -0700
commitc080d5799655658eb847b0583f58e5aff3a5cbaa (patch)
tree261b403f78ec747157ff4a9308140fd3f07a48e1
parent9327d0ea03d9b286139cf1e7062a4166a6a0783c (diff)
downloadandroid_external_libavc-c080d5799655658eb847b0583f58e5aff3a5cbaa.tar.gz
android_external_libavc-c080d5799655658eb847b0583f58e5aff3a5cbaa.tar.bz2
android_external_libavc-c080d5799655658eb847b0583f58e5aff3a5cbaa.zip
Moved check for level after check for resolution change.
This is required for DRC tests in CTS . Change-Id: Icd0fe10d97c6ee55f8358682a578bddb58590de4
-rw-r--r--decoder/ih264d_parse_headers.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index f7ae612..37684db 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -545,10 +545,6 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
u1_level_idc = ih264d_get_bits_h264(ps_bitstrm, 8);
- if(ps_dec->u4_level_at_init < u1_level_idc)
- {
- return IH264D_UNSUPPORTED_LEVEL;
- }
COPYTHECONTEXT("SPS: u4_level_idc",u1_level_idc);
@@ -934,6 +930,10 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
ps_dec->u2_disp_width = i4_cropped_wd;
}
+ if(ps_dec->u4_level_at_init < u1_level_idc)
+ {
+ return IH264D_UNSUPPORTED_LEVEL;
+ }
ps_seq->u1_is_valid = TRUE;