diff options
author | Lajos Molnar <lajos@google.com> | 2014-07-07 10:30:54 -0700 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2014-07-07 16:40:21 -0700 |
commit | 05ca3bfb847ff3c1980f2f0922a4d494c0e7ebab (patch) | |
tree | 4f7261e870bb514c6f935aef7a60a577c07e4502 /media | |
parent | 2e8863b31e987f9bb54e52645e03e75120863a2e (diff) | |
download | frameworks_av-05ca3bfb847ff3c1980f2f0922a4d494c0e7ebab.zip frameworks_av-05ca3bfb847ff3c1980f2f0922a4d494c0e7ebab.tar.gz frameworks_av-05ca3bfb847ff3c1980f2f0922a4d494c0e7ebab.tar.bz2 |
stagefright: create CodecBase interface (abstract class)
This abstracts out the ACodec dependency in MediaCodec.
Bug: 11784825
Change-Id: I0aa8b56c6414865fd4b0646e2c5bd1b62d030682
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
-rw-r--r-- | media/libstagefright/CodecBase.cpp | 38 | ||||
-rw-r--r-- | media/libstagefright/foundation/AHierarchicalStateMachine.cpp | 2 |
3 files changed, 40 insertions, 1 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 11c5970..99c8e9f 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -15,6 +15,7 @@ LOCAL_SRC_FILES:= \ CameraSource.cpp \ CameraSourceTimeLapse.cpp \ ClockEstimator.cpp \ + CodecBase.cpp \ DataSource.cpp \ DataURISource.cpp \ DRMExtractor.cpp \ diff --git a/media/libstagefright/CodecBase.cpp b/media/libstagefright/CodecBase.cpp new file mode 100644 index 0000000..f729d4d --- /dev/null +++ b/media/libstagefright/CodecBase.cpp @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2014 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 "CodecBase" + +#include <inttypes.h> + +#include <media/stagefright/CodecBase.h> + +namespace android { + +CodecBase::CodecBase() { +} + +CodecBase::~CodecBase() { +} + +CodecBase::PortDescription::PortDescription() { +} + +CodecBase::PortDescription::~PortDescription() { +} + +} // namespace android diff --git a/media/libstagefright/foundation/AHierarchicalStateMachine.cpp b/media/libstagefright/foundation/AHierarchicalStateMachine.cpp index f7a00d8..5f7c70d 100644 --- a/media/libstagefright/foundation/AHierarchicalStateMachine.cpp +++ b/media/libstagefright/foundation/AHierarchicalStateMachine.cpp @@ -51,7 +51,7 @@ AHierarchicalStateMachine::AHierarchicalStateMachine() { AHierarchicalStateMachine::~AHierarchicalStateMachine() { } -void AHierarchicalStateMachine::onMessageReceived(const sp<AMessage> &msg) { +void AHierarchicalStateMachine::handleMessage(const sp<AMessage> &msg) { sp<AState> save = mState; sp<AState> cur = mState; |