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

Commit 5fd5c38b authored by Xiao Huang's avatar Xiao Huang Committed by Automerger Merge Worker
Browse files

Merge "Change comments for numActiveSlots" am: 92f6d9a5 

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



Change-Id: I490a8a5e0b023350702a822c86f069281d1f5e2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7aec4050 92f6d9a5

media/codec2/sfplugin/CCodecBuffers.h

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

    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;

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

    void flush();





    /**

    /**

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

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

     * yet.

     */

     */

    size_t numActiveSlots() const;

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

    void grow(size_t newSize, std::function<sp<Codec2Buffer>()> alloc);





    /**

    /**

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

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

     * yet.

     */

     */

    size_t numActiveSlots() const;

    size_t numActiveSlots() const;