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

Commit 28a51d04 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV" 

* commit 'e2307ccb':
  frameworks/av: fix errors inside ALOGV
parents 396a2bc8 e2307ccb

media/libmediaplayerservice/nuplayer/mp4/MP4Source.cpp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct StreamSource : public FragmentedMP4Parser::Source { 
            total += n;

        }



        ALOGV("read %ld bytes at offset %lld", n, mPosition);

        ALOGV("read %ld bytes at offset %lld", total, mPosition);



        mPosition += total;

media/libstagefright/httplive/LiveSession.cpp

+0 −3
Original line number Diff line number Diff line
@@ -632,9 +632,6 @@ sp<M3UParser> LiveSession::fetchPlaylist( 
        // playlist unchanged

        *unchanged = true;



        ALOGV("Playlist unchanged, refresh state is now %d",

             (int)mRefreshState);



        return NULL;

    }

media/libstagefright/mpeg2ts/ESQueue.cpp

+2 −0
Original line number Diff line number Diff line
@@ -604,7 +604,9 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitH264() { 
                dstOffset += pos.nalSize + 4;

            }



#if !LOG_NDEBUG

            ALOGV("accessUnit contains nal types %s", out.c_str());

#endif



            const NALPosition &pos = nals.itemAt(nals.size() - 1);

            size_t nextScan = pos.nalOffset + pos.nalSize;

media/libstagefright/wifi-display/source/TSPacketizer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ status_t TSPacketizer::packetize( 
            }

        }



        // size_t numPaddingBytes = sizeAvailableForPayload - numBytesOfPayload;

        size_t numPaddingBytes = sizeAvailableForPayload - numBytesOfPayload;

        ALOGV("packet 1 contains %zd padding bytes and %zd bytes of payload",

              numPaddingBytes, numBytesOfPayload);