diff options
author | Andreas Huber <andih@google.com> | 2009-12-11 09:45:19 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-12-11 09:58:36 -0800 |
commit | 72124cf05cd5b40f2902198aca2797616b813457 (patch) | |
tree | afc27f32795be17b1e860f6970a30824613a9dc0 /media/libstagefright | |
parent | 08411b75d4c30ce26180639f158e2f33d190eee8 (diff) | |
download | frameworks_av-72124cf05cd5b40f2902198aca2797616b813457.zip frameworks_av-72124cf05cd5b40f2902198aca2797616b813457.tar.gz frameworks_av-72124cf05cd5b40f2902198aca2797616b813457.tar.bz2 |
Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/codecs/avc/dec/AVCDecoder.cpp | 7 | ||||
-rw-r--r-- | media/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h | 43 | ||||
-rw-r--r-- | media/libstagefright/include/AVCDecoder.h | 2 |
3 files changed, 7 insertions, 45 deletions
diff --git a/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp b/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp index 0fc9622..00e0046 100644 --- a/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp +++ b/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp @@ -364,6 +364,13 @@ status_t AVCDecoder::read( return OK; } + case AVC_NALTYPE_AUD: + { + *out = new MediaBuffer(0); + + return OK; + } + default: { LOGE("Should not be here, unknown nalType %d", nalType); diff --git a/media/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h b/media/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h deleted file mode 100644 index 440f8ec..0000000 --- a/media/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h +++ /dev/null @@ -1,43 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo - * - * 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 PVAVCDECODER_FACTORY_H_INCLUDED -#define PVAVCDECODER_FACTORY_H_INCLUDED - -class PVAVCDecoderInterface; - -class PVAVCDecoderFactory -{ - public: - /** - * Creates an instance of a PVAVCDecoder. If the creation fails, this function will leave. - * - * @returns A pointer to an instance of PVAVCDecoder as PVAVCDecoderInterface reference or leaves if instantiation fails - **/ - OSCL_IMPORT_REF static PVAVCDecoderInterface* CreatePVAVCDecoder(void); - - /** - * Deletes an instance of PVAVCDecoder and reclaims all allocated resources. - * - * @param aVideoDec The PVAVCDecoder instance to be deleted - * @returns A status code indicating success or failure of deletion - **/ - OSCL_IMPORT_REF static bool DeletePVAVCDecoder(PVAVCDecoderInterface* aVideoDec); -}; - -#endif - diff --git a/media/libstagefright/include/AVCDecoder.h b/media/libstagefright/include/AVCDecoder.h index 0146f77..ee3cd47 100644 --- a/media/libstagefright/include/AVCDecoder.h +++ b/media/libstagefright/include/AVCDecoder.h @@ -26,8 +26,6 @@ struct tagAVCHandle; namespace android { -struct MediaBufferGroup; - struct AVCDecoder : public MediaSource, public MediaBufferObserver { AVCDecoder(const sp<MediaSource> &source); |