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

Commit 0f826b3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use forward declaration for Parcel in MetaData.h"

parents 83730674 84415e08

media/libstagefright/codecs/avcenc/C2SoftAvcEnc.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef C2_SOFT_AVC_ENC_H__

#define C2_SOFT_AVC_ENC_H__



#include <map>



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

#include <utils/Vector.h>

media/libstagefright/foundation/MetaData.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "MetaData"

#include <inttypes.h>

#include <binder/Parcel.h>

#include <utils/KeyedVector.h>

#include <utils/Log.h>

media/libstagefright/include/FrameDecoder.h

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
#ifndef FRAME_DECODER_H_

#define FRAME_DECODER_H_



#include <memory>

#include <vector>



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

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

#include <media/MediaSource.h>

media/libstagefright/include/media/stagefright/MetaData.h

+2 −1
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ 


#include <stdint.h>



#include <binder/Parcel.h>

#include <utils/RefBase.h>

#include <utils/String8.h>



namespace android {



class Parcel;



// The following keys map to int32_t data unless indicated otherwise.

enum {

    kKeyMIMEType          = 'mime',  // cstring