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

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

am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an... 

am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread

Merge commit '021a822e'

* commit '021a822e':
  Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
parents 901fd85c 021a822e

media/libstagefright/AwesomePlayer.cpp

+5 −1
Original line number Diff line number Diff line
@@ -274,9 +274,13 @@ status_t AwesomePlayer::setDataSource_l( 
status_t AwesomePlayer::setDataSource(

        int fd, int64_t offset, int64_t length) {

#if 0

    // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/sl.m3u8");

    return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/0440.m3u8");

    // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/0640.m3u8");

    // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/1240_vod.m3u8");

    // return setDataSource("httplive://iphoned5.akamai.com.edgesuite.net/mhbarron/nasatv/nasatv_96.m3u8");

    // return setDataSource("httplive://iphoned5.akamai.com.edgesuite.net/mhbarron/nasatv/nasatv_1500.m3u8");

    return setDataSource("httplive://iphone.video.hsn.com/iPhone_high.m3u8");

    // return setDataSource("httplive://iphone.video.hsn.com/iPhone_high.m3u8");

    // return setDataSource("httplive://iphoned5.akamai.com.edgesuite.net/mhbarron/iphonewebcast/webcast090209_all/webcast090209_all.m3u8");

    // return setDataSource("httplive://qthttp.akamai.com.edgesuite.net/iphone_demo/Video_Content/usat/tt_062209_iphone/hi/prog_index.m3u8");

    // return setDataSource("httplive://qthttp.akamai.com.edgesuite.net/iphone_demo/Video_Content/usat/tt_googmaps/hi/prog_index.m3u8");

media/libstagefright/mpeg2ts/ATSParser.cpp

+69 −4
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ private: 
            unsigned PTS_DTS_flags, uint64_t PTS, uint64_t DTS,

            const uint8_t *data, size_t size);



    void extractAACFrames(const sp<ABuffer> &buffer);



    DISALLOW_EVIL_CONSTRUCTORS(Stream);

};
@@ -226,7 +228,7 @@ sp<MediaSource> ATSParser::Program::getSource(SourceType type) { 
ATSParser::Stream::Stream(unsigned elementaryPID, unsigned streamType)

    : mElementaryPID(elementaryPID),

      mStreamType(streamType),

      mBuffer(new ABuffer(65536)),

      mBuffer(new ABuffer(128 * 1024)),

      mPayloadStarted(false) {

    mBuffer->setRange(0, 0);

}
@@ -662,7 +664,7 @@ static sp<ABuffer> FindMPEG2ADTSConfig( 
    csd->data()[sizeof(kStaticESDS) + 1] =

        ((sampling_freq_index << 7) & 0x80) | (channel_configuration << 3);



    hexdump(csd->data(), csd->size());

    // hexdump(csd->data(), csd->size());

    return csd;

}
@@ -727,13 +729,76 @@ void ATSParser::Stream::onPayloadData( 
    buffer->meta()->setInt64("time", (PTS * 100) / 9);



    if (mStreamType == 0x0f) {

        // WHY???

        buffer->setRange(7, buffer->size() - 7);

        extractAACFrames(buffer);

    }



    mSource->queueAccessUnit(buffer);

}



// Disassemble one or more ADTS frames into their constituent parts and

// leave only the concatenated raw_data_blocks in the buffer.

void ATSParser::Stream::extractAACFrames(const sp<ABuffer> &buffer) {

    size_t dstOffset = 0;



    size_t offset = 0;

    while (offset < buffer->size()) {

        CHECK_LE(offset + 7, buffer->size());



        ABitReader bits(buffer->data() + offset, buffer->size() - offset);



        // adts_fixed_header



        CHECK_EQ(bits.getBits(12), 0xfffu);

        bits.skipBits(3);  // ID, layer

        bool protection_absent = bits.getBits(1) != 0;



        // profile_ObjectType, sampling_frequency_index, private_bits,

        // channel_configuration, original_copy, home

        bits.skipBits(12);



        // adts_variable_header



        // copyright_identification_bit, copyright_identification_start

        bits.skipBits(2);



        unsigned aac_frame_length = bits.getBits(13);



        bits.skipBits(11);  // adts_buffer_fullness



        unsigned number_of_raw_data_blocks_in_frame = bits.getBits(2);



        if (number_of_raw_data_blocks_in_frame == 0) {

            size_t scan = offset + aac_frame_length;



            offset += 7;

            if (!protection_absent) {

                offset += 2;

            }



            CHECK_LE(scan, buffer->size());



            LOG(VERBOSE)

                << "found aac raw data block at ["

                << StringPrintf("0x%08x", offset)

                << " ; "

                << StringPrintf("0x%08x", scan)

                << ")";



            memmove(&buffer->data()[dstOffset], &buffer->data()[offset],

                    scan - offset);



            dstOffset += scan - offset;

            offset = scan;

        } else {

            // To be implemented.

            TRESPASS();

        }

    }

    CHECK_EQ(offset, buffer->size());



    buffer->setRange(buffer->offset(), dstOffset);

}



sp<MediaSource> ATSParser::Stream::getSource(SourceType type) {

    if ((type == AVC_VIDEO && mStreamType == 0x1b)

        || (type == MPEG2ADTS_AUDIO && mStreamType == 0x0f)) {