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 | d8729c597b9fe8cbdbf145bea0dbaec4f075015b (patch) | |
tree | f1adb70ea728086f2d6cc828016777f51029b3a0 /media/libstagefright/codecs | |
parent | 6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1 (diff) | |
download | frameworks_base-d8729c597b9fe8cbdbf145bea0dbaec4f075015b.zip frameworks_base-d8729c597b9fe8cbdbf145bea0dbaec4f075015b.tar.gz frameworks_base-d8729c597b9fe8cbdbf145bea0dbaec4f075015b.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/codecs')
-rw-r--r-- | media/libstagefright/codecs/avc/dec/AVCDecoder.cpp | 7 | ||||
-rw-r--r-- | media/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h | 43 |
2 files changed, 7 insertions, 43 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 - |