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

Commit ed368be7 authored by Andreas Gampe's avatar Andreas Gampe Committed by Gerrit Code Review
Browse files

Merge "Frameworks/base: Wall Werror in media/tests"

parents e042791e a4a13480

media/tests/audiotests/Android.mk

+12 −10
Original line number Diff line number Diff line 
ifeq ($(TARGET_ARCH),arm)



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE:= shared_mem_test



LOCAL_SRC_FILES := \

    shared_mem_test.cpp



LOCAL_SHARED_LIBRARIES :=  \

    libc \

    libcutils \
@@ -14,8 +15,9 @@ LOCAL_SHARED_LIBRARIES := \ 
    libbinder \

    libhardware_legacy \

    libmedia



LOCAL_MODULE_TAGS := tests



include $(BUILD_EXECUTABLE)

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



endif
 
include $(BUILD_EXECUTABLE)

media/tests/audiotests/shared_mem_test.cpp

+1 −5
Original line number Diff line number Diff line
@@ -133,12 +133,8 @@ int AudioTrackTest::Test01() { 
************************************************************/

void AudioTrackTest::Generate(short *buffer, long bufferSz, long amplitude, unsigned long &phi, long dPhi)

{

    long pi13 = 25736;   // 2^13*pi

    // fill buffer

    for(int i0=0; i0<bufferSz; i0++) {

        long sample;

        long l0, l1;



        buffer[i0] = ComputeSine( amplitude, phi);

        phi += dPhi;

    }
@@ -210,7 +206,7 @@ int main() { 
*    global main

*

************************************************************/

int main(int argc, char *argv[]) {

int main() {



    return android::main();

}

media/tests/omxjpegdecoder/Android.mk

+5 −3
Original line number Diff line number Diff line
@@ -42,4 +42,6 @@ LOCAL_MODULE := jpeg_bench 


LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_EXECUTABLE)

media/tests/omxjpegdecoder/StreamSource.h

+4 −0
Original line number Diff line number Diff line
@@ -20,7 +20,11 @@ 


#include <stdio.h>



#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-parameter"

#include <SkStream.h>

#pragma GCC diagnostic pop



#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaErrors.h>

#include <utils/threads.h>

media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp

+9 −0
Original line number Diff line number Diff line
@@ -20,9 +20,13 @@ 


#include <binder/ProcessState.h>



#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-parameter"

#include "SkBitmap.h"

#include "SkImageDecoder.h"

#include "SkStream.h"

#pragma GCC diagnostic pop



#include "omx_jpeg_decoder.h"



class SkJPEGImageDecoder : public SkImageDecoder {
@@ -101,6 +105,11 @@ int testDecoder(SkImageDecoder* decoder, char* filename) { 
}



int main(int argc, char** argv) {

    if (argc < 2) {

        printf("Need a parameter!\n");

        return 1;

    }



    android::ProcessState::self()->startThreadPool();



    printf("Decoding jpeg with libjpeg...\n");