Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.

Browse Source 
Merge commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b' into eclair-mr2-plus-aosp

* commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b':
  Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
This commit is contained in:
Andreas Huber
2009-12-11 10:06:30 -08:00
committed by Android Git Automerger
parent 554647e963 d8729c597b
commit ea113f307d
3 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/codecs/avc/dec/AVCDecoder.cpp
View File

@@ -364,6 +364,13 @@ status_t AVCDecoder::read(
return OK; return OK;
} }
case AVC_NALTYPE_AUD:
{
*out = new MediaBuffer(0);
return OK;
}
default: default:
{ {
LOGE("Should not be here, unknown nalType %d", nalType); LOGE("Should not be here, unknown nalType %d", nalType);

43
media/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h
View File

@@ -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

2
media/libstagefright/include/AVCDecoder.h
View File

@@ -26,8 +26,6 @@ struct tagAVCHandle;
namespace android { namespace android {
struct MediaBufferGroup;
struct AVCDecoder : public MediaSource, struct AVCDecoder : public MediaSource,
public MediaBufferObserver { public MediaBufferObserver {
AVCDecoder(const sp<MediaSource> &source); AVCDecoder(const sp<MediaSource> &source);