summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp/ARTPAssembler.h
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-05-17 12:42:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-17 12:42:18 -0700
commitb33eaec751d712c237e1c1b53a18a259456fa682 (patch)
tree901552bb8293298e45fe3763e2845ee9e90f9232 /media/libstagefright/rtsp/ARTPAssembler.h
parent35c53ccdc1be56879ba25956bf2284d2cff7c3c4 (diff)
parent8647bbe4420ca487467318404127f52c567e346b (diff)
downloadframeworks_av-b33eaec751d712c237e1c1b53a18a259456fa682.zip
frameworks_av-b33eaec751d712c237e1c1b53a18a259456fa682.tar.gz
frameworks_av-b33eaec751d712c237e1c1b53a18a259456fa682.tar.bz2
Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-dev
Diffstat (limited to 'media/libstagefright/rtsp/ARTPAssembler.h')
-rw-r--r--media/libstagefright/rtsp/ARTPAssembler.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/ARTPAssembler.h b/media/libstagefright/rtsp/ARTPAssembler.h
index 70ea186..7c147be 100644
--- a/media/libstagefright/rtsp/ARTPAssembler.h
+++ b/media/libstagefright/rtsp/ARTPAssembler.h
@@ -19,6 +19,7 @@
#define A_RTP_ASSEMBLER_H_
#include <media/stagefright/foundation/ABase.h>
+#include <utils/List.h>
#include <utils/RefBase.h>
namespace android {
@@ -45,6 +46,15 @@ protected:
static void CopyTimes(const sp<ABuffer> &to, const sp<ABuffer> &from);
+ static sp<ABuffer> MakeADTSCompoundFromAACFrames(
+ unsigned profile,
+ unsigned samplingFreqIndex,
+ unsigned channelConfig,
+ const List<sp<ABuffer> > &frames);
+
+ static sp<ABuffer> MakeCompoundFromPackets(
+ const List<sp<ABuffer> > &frames);
+
private:
int64_t mFirstFailureTimeUs;