From 6fb40672ac0f0b2f479367fa0ba4e8944df06dad Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Fri, 15 Jul 2011 11:53:17 -0700 Subject: Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail. Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695 --- media/libstagefright/XINGSeeker.cpp | 6 +++--- media/libstagefright/include/XINGSeeker.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'media') diff --git a/media/libstagefright/XINGSeeker.cpp b/media/libstagefright/XINGSeeker.cpp index 0d0d6c2..2091381 100644 --- a/media/libstagefright/XINGSeeker.cpp +++ b/media/libstagefright/XINGSeeker.cpp @@ -24,8 +24,8 @@ namespace android { static bool parse_xing_header( const sp &source, off64_t first_frame_pos, int32_t *frame_number = NULL, int32_t *byte_number = NULL, - char *table_of_contents = NULL, int32_t *quality_indicator = NULL, - int64_t *duration = NULL); + unsigned char *table_of_contents = NULL, + int32_t *quality_indicator = NULL, int64_t *duration = NULL); // static sp XINGSeeker::CreateFromSource( @@ -94,7 +94,7 @@ bool XINGSeeker::getOffsetForTime(int64_t *timeUs, off64_t *pos) { static bool parse_xing_header( const sp &source, off64_t first_frame_pos, int32_t *frame_number, int32_t *byte_number, - char *table_of_contents, int32_t *quality_indicator, + unsigned char *table_of_contents, int32_t *quality_indicator, int64_t *duration) { if (frame_number) { *frame_number = 0; diff --git a/media/libstagefright/include/XINGSeeker.h b/media/libstagefright/include/XINGSeeker.h index d5a484e..ec5bd9b 100644 --- a/media/libstagefright/include/XINGSeeker.h +++ b/media/libstagefright/include/XINGSeeker.h @@ -37,7 +37,7 @@ private: int32_t mSizeBytes; // TOC entries in XING header. Skip the first one since it's always 0. - char mTableOfContents[99]; + unsigned char mTableOfContents[99]; XINGSeeker(); -- cgit v1.1