summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp/ARTPSource.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-31 14:25:36 -0700
committerAndreas Huber <andih@google.com>2010-08-31 14:25:36 -0700
commit4dba3e90f211eb5f5af19b10c5d3fc8c967b0086 (patch)
tree5776996375a860f32db14ae23b2f789e598b88e2 /media/libstagefright/rtsp/ARTPSource.cpp
parent5edae619a6ad7337a3d14b53f7665ff17ec3ee84 (diff)
downloadframeworks_av-4dba3e90f211eb5f5af19b10c5d3fc8c967b0086.zip
frameworks_av-4dba3e90f211eb5f5af19b10c5d3fc8c967b0086.tar.gz
frameworks_av-4dba3e90f211eb5f5af19b10c5d3fc8c967b0086.tar.bz2
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Change-Id: Ied92ea8c2448a2cb1a732c72c21c69da1913dbc8 related-to-bug: 2556656
Diffstat (limited to 'media/libstagefright/rtsp/ARTPSource.cpp')
-rw-r--r--media/libstagefright/rtsp/ARTPSource.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/rtsp/ARTPSource.cpp b/media/libstagefright/rtsp/ARTPSource.cpp
index 775c4ee..9656ba2 100644
--- a/media/libstagefright/rtsp/ARTPSource.cpp
+++ b/media/libstagefright/rtsp/ARTPSource.cpp
@@ -64,8 +64,9 @@ ARTPSource::ARTPSource(
mAssembler = new AAMRAssembler(notify, false /* isWide */, params);
} else if (!strncmp(desc.c_str(), "AMR-WB/", 7)) {
mAssembler = new AAMRAssembler(notify, true /* isWide */, params);
- } else if (!strncmp(desc.c_str(), "MP4V-ES/", 8)) {
- mAssembler = new AMPEG4ElementaryAssembler(notify);
+ } else if (!strncmp(desc.c_str(), "MP4V-ES/", 8)
+ || !strncmp(desc.c_str(), "mpeg4-generic/", 14)) {
+ mAssembler = new AMPEG4ElementaryAssembler(notify, desc, params);
mIssueFIRRequests = true;
} else {
TRESPASS();