Removing an unused header file and a stale forward declaration. Also handling... (d8729c59) · Commits · e / os / android_frameworks_base

media/libstagefright/codecs/avc/dec/AVCDecoder.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -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);

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		/* ------------------------------------------------------------------
		* 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

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ struct tagAVCHandle;

		namespace android {

		struct MediaBufferGroup;

		struct AVCDecoder : public MediaSource,
		public MediaBufferObserver {
		AVCDecoder(const sp<MediaSource> &source);