diff options
| author | sahara <keun-o.park@windriver.com> | 2010-01-27 12:00:55 +0900 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:35 -0700 |
| commit | 92d831d5831b56635deb8d23220319b118c4dcb2 (patch) | |
| tree | f349637479bbcb6133c1e42d69b952f5449f9c52 /utils | |
| parent | 913bf911b34fa3d4a961ffb0b5288c5af40b7b81 (diff) | |
| download | wrs_omxil_core-92d831d5831b56635deb8d23220319b118c4dcb2.tar.gz | |
remove getting framerate from vui parser
Signed-off-by: sahara <keun-o.park@windriver.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/inc/h264_parser.h | 4 | ||||
| -rw-r--r-- | utils/src/h264_parser.c | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/utils/inc/h264_parser.h b/utils/inc/h264_parser.h index 8fa4d28..db87b4d 100644 --- a/utils/inc/h264_parser.h +++ b/utils/inc/h264_parser.h @@ -15,6 +15,7 @@ extern "C" { #define USE_PV_BITOPS 1 #define USE_MIXVBP_DEF 1 +#define USE_VUI_PARSER 0 #if USE_PV_BITOPS /* Port from PV OpenCORE 2.02 */ @@ -172,8 +173,7 @@ typedef struct _SPS_t { int nal_sps_parse(unsigned char *buffer, unsigned int len, unsigned int *width, unsigned int *height, - unsigned int *stride, unsigned int *sliceheight, - unsigned int *framerate); + unsigned int *stride, unsigned int *sliceheight); #ifdef __cplusplus } /* extern "C" */ diff --git a/utils/src/h264_parser.c b/utils/src/h264_parser.c index 095ce5d..749bf81 100644 --- a/utils/src/h264_parser.c +++ b/utils/src/h264_parser.c @@ -570,8 +570,7 @@ static int calculate_stride(unsigned int width, int nal_sps_parse(unsigned char *buffer, unsigned int len, unsigned int *width, unsigned int *height, - unsigned int *stride, unsigned int *sliceheight, - unsigned int *framerate) + unsigned int *stride, unsigned int *sliceheight) { SPS sps; VUI vui; @@ -601,6 +600,7 @@ int nal_sps_parse(unsigned char *buffer, unsigned int len, status = _sps_parse(&nalst, &sps); if (status) goto sps_error; +#if USE_VUI_PARSER if (sps.vui_parameters_present_flag) { /* parse VUI */ status = _vui_parse(&nalst, &sps); @@ -609,8 +609,9 @@ int nal_sps_parse(unsigned char *buffer, unsigned int len, LOGE("%s: VUI parameters present flag is OFF from SPS", __func__); goto vui_error; } +#endif - /* calculate width, height, stride, sliceheight, framerate */ + /* calculate width, height, stride, sliceheight */ *width = (sps.pic_width_in_mbs_minus1 + 1) * 16; *height = (sps.pic_height_in_map_units_minus1 + 1) * 16; LOGV("%s: width = %d", __func__, *width); @@ -649,19 +650,12 @@ int nal_sps_parse(unsigned char *buffer, unsigned int len, LOGV("%s: stride = %d", __func__, *stride); LOGV("%s: sliceheight = %d", __func__, *sliceheight); - /* - * FIXME: Generally framerate is in container header - * set static value 30 to framerate. - */ - *framerate = 30; - LOGV("%s: frame rate = %d", __func__, *framerate); return H264_STATUS_OK; sps_error: *width = 0; *height = 0; vui_error: - *framerate = 0; if (sps.seq_scaling_list_present_flag) free(sps.seq_scaling_list_present_flag); if (sps.offset_for_ref_frame) |