diff options
author | Andreas Huber <andih@google.com> | 2012-08-31 10:27:46 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2012-08-31 10:27:46 -0700 |
commit | 49694688c82214f5fd9e969e177c9e126a240a26 (patch) | |
tree | 8df0b8db345152532c6b064ee44474fedae18581 /media/libstagefright | |
parent | b2562f6faf7b1061f617586801597e0b6b4400b5 (diff) | |
download | frameworks_av-49694688c82214f5fd9e969e177c9e126a240a26.zip frameworks_av-49694688c82214f5fd9e969e177c9e126a240a26.tar.gz frameworks_av-49694688c82214f5fd9e969e177c9e126a240a26.tar.bz2 |
Add support for mpeg2 transport streams to the RTSP implementation.
Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/rtsp/AMPEG2TSAssembler.cpp | 119 | ||||
-rw-r--r-- | media/libstagefright/rtsp/AMPEG2TSAssembler.h | 54 | ||||
-rw-r--r-- | media/libstagefright/rtsp/APacketSource.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/rtsp/ARTPSource.cpp | 3 | ||||
-rw-r--r-- | media/libstagefright/rtsp/Android.mk | 1 |
5 files changed, 179 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/AMPEG2TSAssembler.cpp b/media/libstagefright/rtsp/AMPEG2TSAssembler.cpp new file mode 100644 index 0000000..4c9bf5b --- /dev/null +++ b/media/libstagefright/rtsp/AMPEG2TSAssembler.cpp @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//#define LOG_NDEBUG 0 +#define LOG_TAG "AMPEG2TSAssembler" +#include <utils/Log.h> + +#include "AMPEG2TSAssembler.h" + +#include "ARTPSource.h" +#include "ASessionDescription.h" + +#include <media/stagefright/foundation/ABuffer.h> +#include <media/stagefright/foundation/ADebug.h> +#include <media/stagefright/foundation/AMessage.h> +#include <media/stagefright/foundation/hexdump.h> +#include <media/stagefright/MediaDefs.h> +#include <media/stagefright/MetaData.h> +#include <media/stagefright/Utils.h> + +namespace android { + +AMPEG2TSAssembler::AMPEG2TSAssembler( + const sp<AMessage> ¬ify, const char *desc, const AString ¶ms) + : mNotifyMsg(notify), + mNextExpectedSeqNoValid(false), + mNextExpectedSeqNo(0) { +} + +AMPEG2TSAssembler::~AMPEG2TSAssembler() { +} + +ARTPAssembler::AssemblyStatus AMPEG2TSAssembler::assembleMore( + const sp<ARTPSource> &source) { + return addPacket(source); +} + +ARTPAssembler::AssemblyStatus AMPEG2TSAssembler::addPacket( + const sp<ARTPSource> &source) { + List<sp<ABuffer> > *queue = source->queue(); + + if (queue->empty()) { + return NOT_ENOUGH_DATA; + } + + if (mNextExpectedSeqNoValid) { + List<sp<ABuffer> >::iterator it = queue->begin(); + while (it != queue->end()) { + if ((uint32_t)(*it)->int32Data() >= mNextExpectedSeqNo) { + break; + } + + it = queue->erase(it); + } + + if (queue->empty()) { + return NOT_ENOUGH_DATA; + } + } + + sp<ABuffer> buffer = *queue->begin(); + + if (!mNextExpectedSeqNoValid) { + mNextExpectedSeqNoValid = true; + mNextExpectedSeqNo = (uint32_t)buffer->int32Data(); + } else if ((uint32_t)buffer->int32Data() != mNextExpectedSeqNo) { + ALOGV("Not the sequence number I expected"); + + return WRONG_SEQUENCE_NUMBER; + } + + // hexdump(buffer->data(), buffer->size()); + + if ((buffer->size() % 188) > 0) { + queue->erase(queue->begin()); + ++mNextExpectedSeqNo; + + ALOGV("Not a multiple of transport packet size."); + + return MALFORMED_PACKET; + } + + sp<AMessage> msg = mNotifyMsg->dup(); + msg->setBuffer("access-unit", buffer); + msg->post(); + + queue->erase(queue->begin()); + ++mNextExpectedSeqNo; + + return OK; +} + +void AMPEG2TSAssembler::packetLost() { + CHECK(mNextExpectedSeqNoValid); + ++mNextExpectedSeqNo; +} + +void AMPEG2TSAssembler::onByeReceived() { + sp<AMessage> msg = mNotifyMsg->dup(); + msg->setInt32("eos", true); + msg->post(); +} + +} // namespace android + + diff --git a/media/libstagefright/rtsp/AMPEG2TSAssembler.h b/media/libstagefright/rtsp/AMPEG2TSAssembler.h new file mode 100644 index 0000000..712e18e --- /dev/null +++ b/media/libstagefright/rtsp/AMPEG2TSAssembler.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef A_MPEG2_TS_ASSEMBLER_H_ + +#define A_MPEG2_TS_ASSEMBLER_H_ + +#include "ARTPAssembler.h" + +namespace android { + +struct AMessage; +struct AString; +struct MetaData; + +struct AMPEG2TSAssembler : public ARTPAssembler { + AMPEG2TSAssembler( + const sp<AMessage> ¬ify, + const char *desc, const AString ¶ms); + +protected: + virtual ~AMPEG2TSAssembler(); + + virtual AssemblyStatus assembleMore(const sp<ARTPSource> &source); + virtual void onByeReceived(); + virtual void packetLost(); + +private: + sp<AMessage> mNotifyMsg; + bool mNextExpectedSeqNoValid; + uint32_t mNextExpectedSeqNo; + + AssemblyStatus addPacket(const sp<ARTPSource> &source); + + DISALLOW_EVIL_CONSTRUCTORS(AMPEG2TSAssembler); +}; + +} // namespace android + +#endif // A_MPEG2_TS_ASSEMBLER_H_ + diff --git a/media/libstagefright/rtsp/APacketSource.cpp b/media/libstagefright/rtsp/APacketSource.cpp index ddd2f06..462c384 100644 --- a/media/libstagefright/rtsp/APacketSource.cpp +++ b/media/libstagefright/rtsp/APacketSource.cpp @@ -566,6 +566,8 @@ APacketSource::APacketSource( codecSpecificData->data(), codecSpecificData->size()); } else if (ARawAudioAssembler::Supports(desc.c_str())) { ARawAudioAssembler::MakeFormat(desc.c_str(), mFormat); + } else if (!strncasecmp("MP2T/", desc.c_str(), 5)) { + mFormat->setCString(kKeyMIMEType, MEDIA_MIMETYPE_CONTAINER_MPEG2TS); } else { mInitCheck = ERROR_UNSUPPORTED; } diff --git a/media/libstagefright/rtsp/ARTPSource.cpp b/media/libstagefright/rtsp/ARTPSource.cpp index ed68790..d7c3bd6 100644 --- a/media/libstagefright/rtsp/ARTPSource.cpp +++ b/media/libstagefright/rtsp/ARTPSource.cpp @@ -23,6 +23,7 @@ #include "AAMRAssembler.h" #include "AAVCAssembler.h" #include "AH263Assembler.h" +#include "AMPEG2TSAssembler.h" #include "AMPEG4AudioAssembler.h" #include "AMPEG4ElementaryAssembler.h" #include "ARawAudioAssembler.h" @@ -73,6 +74,8 @@ ARTPSource::ARTPSource( mIssueFIRRequests = true; } else if (ARawAudioAssembler::Supports(desc.c_str())) { mAssembler = new ARawAudioAssembler(notify, desc.c_str(), params); + } else if (!strncasecmp(desc.c_str(), "MP2T/", 5)) { + mAssembler = new AMPEG2TSAssembler(notify, desc.c_str(), params); } else { TRESPASS(); } diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk index d0f5259..49e2daf 100644 --- a/media/libstagefright/rtsp/Android.mk +++ b/media/libstagefright/rtsp/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ AAMRAssembler.cpp \ AAVCAssembler.cpp \ AH263Assembler.cpp \ + AMPEG2TSAssembler.cpp \ AMPEG4AudioAssembler.cpp \ AMPEG4ElementaryAssembler.cpp \ APacketSource.cpp \ |