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

Commit 0222d339 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Move UXX_AT families to libstagefright_foundation"

parents ac835db1 60761285

media/extractors/flac/FLACExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 
#include <media/stagefright/foundation/ABuffer.h>

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

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

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

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/Utils.h>



namespace android {

media/extractors/mkv/MatroskaExtractor.cpp

+26 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <media/stagefright/foundation/ADebug.h>

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

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

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

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

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

#include <media/stagefright/DataSource.h>
@@ -33,7 +34,6 @@ 
#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>

#include <utils/String8.h>



#include <inttypes.h>
@@ -542,6 +542,31 @@ static unsigned U24_AT(const uint8_t *ptr) { 
    return ptr[0] << 16 | ptr[1] << 8 | ptr[2];

}



static AString uriDebugString(const AString &uri) {

    // find scheme

    AString scheme;

    const char *chars = uri.c_str();

    for (size_t i = 0; i < uri.size(); i++) {

        const char c = chars[i];

        if (!isascii(c)) {

            break;

        } else if (isalpha(c)) {

            continue;

        } else if (i == 0) {

            // first character must be a letter

            break;

        } else if (isdigit(c) || c == '+' || c == '.' || c =='-') {

            continue;

        } else if (c != ':') {

            break;

        }

        scheme = AString(uri, 0, i);

        scheme.append("://<suppressed>");

        return scheme;

    }

    return AString("<no-scheme URI suppressed>");

}



void MatroskaSource::clearPendingFrames() {

    while (!mPendingFrames.empty()) {

        MediaBuffer *frame = *mPendingFrames.begin();

media/extractors/mp3/MP3Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


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

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

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

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/MediaBufferGroup.h>
@@ -34,7 +35,6 @@ 
#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>

#include <utils/String8.h>



namespace android {

media/extractors/mp3/VBRISeeker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
#include "avc_utils.h"



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

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

#include <media/stagefright/DataSource.h>

#include <media/stagefright/Utils.h>



namespace android {

media/extractors/mp3/XINGSeeker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include "XINGSeeker.h"

#include "avc_utils.h"



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

#include <media/stagefright/DataSource.h>

#include <media/stagefright/Utils.h>



namespace android {