Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1ea88c5 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "Use unsigned char to store table of contents retrieved from XING... 

Merge "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."
parents 698a5e08 c2e5ca3c

media/libstagefright/XINGSeeker.cpp

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ namespace android { 
static bool parse_xing_header(

        const sp<DataSource> &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> XINGSeeker::CreateFromSource(
@@ -94,7 +94,7 @@ bool XINGSeeker::getOffsetForTime(int64_t *timeUs, off64_t *pos) { 
static bool parse_xing_header(

        const sp<DataSource> &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;

media/libstagefright/include/XINGSeeker.h

+1 −1
Original line number Diff line number Diff line
@@ -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();