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

Commit 924ee2b5 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 48322316 1fd01cbc

media/libstagefright/AwesomePlayer.cpp

+0 −14
Original line number Diff line number Diff line
@@ -273,20 +273,6 @@ 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://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");

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

#endif



    Mutex::Autolock autoLock(mLock);



    reset_l();

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ status_t MPEG4Writer::Track::start(MetaData *params) { 
        startTimeUs = 0;

    }



    mIsRealTimeRecording = true;

    mIsRealTimeRecording = false;

    {

        int32_t isNotRealTime;

        if (params && params->findInt32(kKeyNotRealTime, &isNotRealTime)) {

media/libstagefright/avc_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


namespace android {



static unsigned parseUE(ABitReader *br) {

unsigned parseUE(ABitReader *br) {

    unsigned numZeroes = 0;

    while (br->getBits(1) == 0) {

        ++numZeroes;

media/libstagefright/codecs/avc/dec/AVCDecoder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>

#include <media/stagefright/foundation/hexdump.h>



namespace android {

media/libstagefright/httplive/LiveSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ bool LiveSource::switchToNext() { 
        }



        if (mLastFetchTimeUs < 0) {

            mPlaylistIndex = mPlaylist->size() / 2;

            mPlaylistIndex = 0;

        } else {

            if (nextSequenceNumber < mFirstItemSequenceNumber

                    || nextSequenceNumber