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

Commit 6d4403c1 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Android (Google) Code Review
Browse files

Merge "Use -Werror in frameworks/av/media/libstagefright/codecs/avcdec"

parents 2ef26a0d c38b3a32

media/libstagefright/codecs/avcdec/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ cc_library_shared { 
    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-variable",

    ],



    include_dirs: [
@@ -51,6 +50,11 @@ cc_library_shared { 
    ],

    srcs: ["C2SoftAvcDec.cpp"],



    cflags: [

        "-Wall",

        "-Werror",

    ],



    include_dirs: [

        "external/libavc/decoder",

        "external/libavc/common",

media/libstagefright/codecs/avcdec/C2SoftAvcDec.cpp

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <cmath>

#include <thread>

#include <cinttypes>



#include "ih264_typedefs.h"

#include "iv.h"
@@ -1044,7 +1045,8 @@ bool C2SoftAvcDec::process(const std::unique_ptr<C2Work> &work, std::shared_ptr< 
        work->worklets.front()->output.ordinal = work->input.ordinal;

    };

    if (buffer.capacity() == 0) {

        ALOGV("empty input: %llu", work->input.ordinal.frame_index);

        ALOGV("empty input: %" PRIu64, work->input.ordinal.frame_index);



        // TODO: result?

        fillEmptyWork(work);

        if ((work->input.flags & C2BufferPack::FLAG_END_OF_STREAM)) {
@@ -1052,7 +1054,7 @@ bool C2SoftAvcDec::process(const std::unique_ptr<C2Work> &work, std::shared_ptr< 
        }

        done = true;

    } else if (work->input.flags & C2BufferPack::FLAG_END_OF_STREAM) {

        ALOGV("input EOS: %llu", work->input.ordinal.frame_index);

        ALOGV("input EOS: %" PRIu64, work->input.ordinal.frame_index);

        eos = true;

    }

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+0 −3
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ status_t SoftAVC::initDecoder() { 
}



status_t SoftAVC::deInitDecoder() {

    size_t i;

    IV_API_CALL_STATUS_T status;



    if (mCodecCtx) {
@@ -451,7 +450,6 @@ void SoftAVC::onPortFlushCompleted(OMX_U32 portIndex) { 
            ivd_video_decode_ip_t s_dec_ip;

            ivd_video_decode_op_t s_dec_op;

            IV_API_CALL_STATUS_T status;

            size_t sizeY, sizeUV;



            setDecodeArgs(&s_dec_ip, &s_dec_op, NULL, NULL, 0);
@@ -563,7 +561,6 @@ void SoftAVC::onQueueFilled(OMX_U32 portIndex) { 
            ivd_video_decode_ip_t s_dec_ip;

            ivd_video_decode_op_t s_dec_op;

            nsecs_t timeDelay, timeTaken;

            size_t sizeY, sizeUV;



            if (!setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx)) {

                ALOGE("Decoder arg setup failed");