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

Commit 29eae310 authored by Xiao Huang's avatar Xiao Huang Committed by Automerger Merge Worker
Browse files

Merge "Change comments for numActiveSlots" am: 92f6d9a5 am: 5fd5c38b am:... 

Merge "Change comments for numActiveSlots" am: 92f6d9a5 am: 5fd5c38b am: ab170531 am: c18ccc55 am: de98a82c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2221127



Change-Id: I309fcb72c7e41f5399ada2f1788b36acaed49ef1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8ddd91d de98a82c

media/codec2/sfplugin/CCodecBuffers.h

+3 −5
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public: 
    virtual void getArray(Vector<sp<MediaCodecBuffer>> *) const {}



    /**

     * Return number of buffers the client owns.

     * Return number of buffers owned by the client or the component.

     */

    virtual size_t numActiveSlots() const = 0;
@@ -595,8 +595,7 @@ public: 
    void flush();



    /**

     * Return the number of buffers that are sent to the client but not released

     * yet.

     * Return the number of buffers that are sent to the client or the component.

     */

    size_t numActiveSlots() const;
@@ -716,8 +715,7 @@ public: 
    void grow(size_t newSize, std::function<sp<Codec2Buffer>()> alloc);



    /**

     * Return the number of buffers that are sent to the client but not released

     * yet.

     * Return the number of buffers that are sent to the client or the component.

     */

    size_t numActiveSlots() const;