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

Commit 1d6fa7af authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of 566be7c3 to master 

Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
parents b82a9f10 566be7c3

camera/CameraParameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ status_t CameraParameters::dump(int fd, const Vector<String16>& args) const 
    const size_t SIZE = 256;

    char buffer[SIZE];

    String8 result;

    snprintf(buffer, 255, "CameraParameters::dump: mMap.size = %d\n", mMap.size());

    snprintf(buffer, 255, "CameraParameters::dump: mMap.size = %zu\n", mMap.size());

    result.append(buffer);

    for (size_t i = 0; i < mMap.size(); i++) {

        String8 k, v;

cmds/stagefright/codec.cpp

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "codec"

#include <inttypes.h>

#include <utils/Log.h>



#include "SimplePlayer.h"
@@ -292,13 +293,13 @@ static int decode( 
        CHECK_EQ((status_t)OK, state->mCodec->release());



        if (state->mIsAudio) {

            printf("track %d: %lld bytes received. %.2f KB/sec\n",

            printf("track %zu: %" PRId64 " bytes received. %.2f KB/sec\n",

                   i,

                   state->mNumBytesDecoded,

                   state->mNumBytesDecoded * 1E6 / 1024 / elapsedTimeUs);

        } else {

            printf("track %d: %lld frames decoded, %.2f fps. %lld bytes "

                   "received. %.2f KB/sec\n",

            printf("track %zu: %" PRId64 " frames decoded, %.2f fps. %" PRId64

                    " bytes received. %.2f KB/sec\n",

                   i,

                   state->mNumBuffersDecoded,

                   state->mNumBuffersDecoded * 1E6 / elapsedTimeUs,

cmds/stagefright/muxer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "muxer"

#include <inttypes.h>

#include <utils/Log.h>



#include <binder/ProcessState.h>
@@ -199,7 +200,7 @@ static int muxing( 
    trackIndexMap.clear();



    int64_t elapsedTimeUs = ALooper::GetNowUs() - muxerStartTimeUs;

    fprintf(stderr, "SUCCESS: muxer generate the video in %lld ms\n",

    fprintf(stderr, "SUCCESS: muxer generate the video in %" PRId64 " ms\n",

            elapsedTimeUs / 1000);



    return 0;

cmds/stagefright/recordvideo.cpp

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include "SineSource.h"



#include <inttypes.h>

#include <binder/ProcessState.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/AudioPlayer.h>
@@ -312,7 +313,7 @@ int main(int argc, char **argv) { 
        fprintf(stderr, "record failed: %d\n", err);

        return 1;

    }

    fprintf(stderr, "encoding %d frames in %lld us\n", nFrames, (end-start)/1000);

    fprintf(stderr, "encoding %d frames in %" PRId64 " us\n", nFrames, (end-start)/1000);

    fprintf(stderr, "encoding speed is: %.2f fps\n", (nFrames * 1E9) / (end-start));

    return 0;

}

cmds/stagefright/sf2.cpp

+11 −9
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "sf2"

#include <inttypes.h>

#include <utils/Log.h>



#include <signal.h>
@@ -80,12 +81,13 @@ protected: 


    virtual void printStatistics() {

        int64_t delayUs = ALooper::GetNowUs() - mStartTimeUs;



        if (mDecodeAudio) {

            printf("%lld bytes received. %.2f KB/sec\n",

            printf("%" PRId64 " bytes received. %.2f KB/sec\n",

            mTotalBytesReceived,

            mTotalBytesReceived * 1E6 / 1024 / delayUs);

        } else {

            printf("%d frames decoded, %.2f fps. %lld bytes "

            printf("%d frames decoded, %.2f fps. %" PRId64 " bytes "

                    "received. %.2f KB/sec\n",

            mNumOutputBuffersReceived,

            mNumOutputBuffersReceived * 1E6 / delayUs,