Merge "Remove PV AVC decoder"

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := \

        src/avcdec_api.cpp \

        src/avc_bitstream.cpp \

        src/header.cpp \

        src/itrans.cpp \

        src/pred_inter.cpp \

        src/pred_intra.cpp \

        src/residual.cpp \

        src/slice.cpp \

        src/vlc.cpp

LOCAL_MODULE := libstagefright_avcdec

LOCAL_C_INCLUDES := \

        $(LOCAL_PATH)/src \

        $(LOCAL_PATH)/include \

        $(LOCAL_PATH)/../common/include \

        $(TOP)/frameworks/base/media/libstagefright/include \

        frameworks/base/include/media/stagefright/openmax \

LOCAL_CFLAGS := -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=

include $(BUILD_STATIC_LIBRARY)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES := \

        SoftAVC.cpp

LOCAL_C_INCLUDES := \

        $(LOCAL_PATH)/src \

        $(LOCAL_PATH)/include \

        $(LOCAL_PATH)/../common/include \

        frameworks/base/media/libstagefright/include \

        frameworks/base/include/media/stagefright/openmax \

LOCAL_CFLAGS := -DOSCL_IMPORT_REF=

LOCAL_STATIC_LIBRARIES := \

        libstagefright_avcdec

LOCAL_SHARED_LIBRARIES := \

        libstagefright_avc_common \

        libstagefright libstagefright_omx libstagefright_foundation libutils

LOCAL_MODULE := libstagefright_soft_avcdec

LOCAL_MODULE_TAGS := optional

include $(BUILD_SHARED_LIBRARY)

/* ------------------------------------------------------------------

 * 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_H_INCLUDED

#define PVAVCDECODER_H_INCLUDED

#ifndef PVAVCDECODERINTERFACE_H_INCLUDED

#include "pvavcdecoderinterface.h"

#endif

// AVC video decoder

class PVAVCDecoder : public PVAVCDecoderInterface

{

    public:

        virtual ~PVAVCDecoder();

        static  PVAVCDecoder* New(void);

        virtual bool    InitAVCDecoder(FunctionType_SPS, FunctionType_Alloc, FunctionType_Unbind,

                                       FunctionType_Malloc, FunctionType_Free, void *);

        virtual void    CleanUpAVCDecoder(void);

        virtual void    ResetAVCDecoder(void);

        virtual int32   DecodeSPS(uint8 *bitstream, int32 buffer_size);

        virtual int32   DecodePPS(uint8 *bitstream, int32 buffer_size);

        virtual int32   DecodeAVCSlice(uint8 *bitstream, int32 *buffer_size);

        virtual bool    GetDecOutput(int *indx, int *release);

        virtual void    GetVideoDimensions(int32 *width, int32 *height, int32 *top, int32 *left, int32 *bottom, int32 *right);

        int     AVC_Malloc(int32 size, int attribute);

        void    AVC_Free(int mem);

    private:

        PVAVCDecoder();

        bool Construct(void);

        void *iAVCHandle;

};

#endif