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

Commit 40475daf authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "CCodec: move Buffers out into a separate file" into qt-dev am: 6a3c3534

am: cd682c23

Change-Id: Id4354537ac9d4053a9b5a9f128b890fb11f9b532
parents 1174cde2 cd682c23
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ cc_library_shared {
        "C2OMXNode.cpp",
        "CCodec.cpp",
        "CCodecBufferChannel.cpp",
        "CCodecBuffers.cpp",
        "CCodecConfig.cpp",
        "Codec2Buffer.cpp",
        "Codec2InfoBuilder.cpp",
+2 −1390

File changed.

Preview size limit exceeded, changes collapsed.

+1 −5
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@
#include <media/stagefright/CodecBase.h>
#include <media/ICrypto.h>

#include "CCodecBuffers.h"
#include "InputSurfaceWrapper.h"
#include "PipelineWatcher.h"

@@ -151,11 +152,6 @@ public:

    void setMetaMode(MetaMode mode);

    // Internal classes
    class Buffers;
    class InputBuffers;
    class OutputBuffers;

private:
    class QueueGuard;

+963 −0

File added.

Preview size limit exceeded, changes collapsed.

+808 −0

File added.

Preview size limit exceeded, changes collapsed.