Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c6813df authored by Ashok Bhat's avatar Ashok Bhat Committed by Andy Hung
Browse files

AMR-WB Encoder: Enable sample app 



[x] Changes to SampleCode/Android.mk
    Sample code now statically links to AMR WB encoder rather
    than dynamically loading AMR WB encoder library. This is done
    by not defining LINUX in Android.mk.

[x] Changes to Android.mk
    Sample code make file is now included in the overall build,
    allowing it to built from the root directory.

Bug: 17722566
Change-Id: I0a5960b20069e223bba388e38c8465bde144426f
Signed-off-by: default avatarAshok Bhat <ashok.bhat@arm.com>
parent e3884972

media/libstagefright/codecs/amrwbenc/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -141,3 +141,6 @@ LOCAL_MODULE := libstagefright_soft_amrwbenc 
LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)



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

include $(call all-makefiles-under,$(LOCAL_PATH))

media/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include      <stdio.h>

#include      <stdlib.h>

#include      <string.h>

#include      <time.h>

#include      "voAMRWB.h"

#include      "cmnMemory.h"
@@ -222,12 +223,12 @@ int encode( 
					fflush(fdst);

				}

			}

			else if(returnCode == VO_ERR_LICENSE_ERROR)

			else if((unsigned)returnCode == VO_ERR_LICENSE_ERROR)

			{

		        printf("Encoder time reach upper limit......");

		        goto safe_exit;

			}

		} while(returnCode != VO_ERR_INPUT_BUFFER_SMALL);

		} while((unsigned)returnCode != VO_ERR_INPUT_BUFFER_SMALL);



		finish = clock();

		duration += finish - start;

media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -5,17 +5,20 @@ LOCAL_SRC_FILES := \ 
    AMRWB_E_SAMPLE.c \

    ../../common/cmnMemory.c



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := tests

LOCAL_MODULE := AMRWBEncTest



LOCAL_ARM_MODE := arm



LOCAL_CFLAGS := -DLINUX

LOCAL_CFLAGS :=



LOCAL_SHARED_LIBRARIES := \

    libstagefright \

    libdl



LOCAL_STATIC_LIBRARIES := \

    libstagefright_amrwbenc



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/ \

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