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

Commit d96a068c authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder,... 

am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread

Merge commit 'bb245d35' into gingerbread-plus-aosp

* commit 'bb245d35':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
parents 77880ae4 bb245d35

media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ 
    int32 xr[ ],                rescaled data

    int32 xr[ ],                rescaled data

    struct gr_info_s *gr_info,  granule structure

    struct gr_info_s *gr_info,  granule structure

    mp3Header *info,            mp3 header info

    mp3Header *info,            mp3 header info

    int32  Scratch_mem[168]     for temporary usage

    int32  Scratch_mem[198]     for temporary usage





 Outputs:

 Outputs:
@@ -120,7 +120,7 @@ void pvmp3_reorder(int32 xr[SUBBANDS_NUMBER*FILTERBANK_BANDS], 
                   granuleInfo *gr_info,

                   granuleInfo *gr_info,

                   int32  *used_freq_lines,

                   int32  *used_freq_lines,

                   mp3Header *info,

                   mp3Header *info,

                   int32  Scratch_mem[168])

                   int32  Scratch_mem[198])

{

{

    int32 sfreq =  info->version_x + (info->version_x << 1);

    int32 sfreq =  info->version_x + (info->version_x << 1);

    sfreq += info->sampling_frequency;

    sfreq += info->sampling_frequency;

media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ extern "C" 
    granuleInfo *gr_info,

    granuleInfo *gr_info,

    int32 *used_freq_lines,

    int32 *used_freq_lines,

    mp3Header *info,

    mp3Header *info,

    int32  Scratch_mem[168]);

    int32  Scratch_mem[198]);





#ifdef __cplusplus

#ifdef __cplusplus

}

}

media/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ extern "C" 
        int32           num_channels;

        int32           num_channels;

        int32           predicted_frame_size;

        int32           predicted_frame_size;

        int32           frame_start;

        int32           frame_start;

        int32           Scratch_mem[168];

        int32           Scratch_mem[198];

        tmp3dec_chan    perChan[CHAN];

        tmp3dec_chan    perChan[CHAN];

        mp3ScaleFactors scaleFactors[CHAN];

        mp3ScaleFactors scaleFactors[CHAN];

        mp3SideInfo     sideInfo;

        mp3SideInfo     sideInfo;