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

Commit 6a6e33d4 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "MediaMuxer: Make MediaMuxer's default constructor as private" am:... 

Merge "MediaMuxer: Make MediaMuxer's default constructor as private" am: dd3b6e20 am: 856bd297 am: 17ae9818

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



Change-Id: I71ae643fddfe74ea3d719d96cc98be48b60d0f46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50f71ec1 17ae9818

media/libstagefright/include/media/stagefright/MediaMuxer.h

+5 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ public: 
     */

    static MediaMuxer* create(int fd, OutputFormat format);



    // Construct the muxer with the file descriptor. Note that the MediaMuxer

    // will close this file at stop().

    MediaMuxer(int fd, OutputFormat format);



    virtual ~MediaMuxer();



    /**
@@ -135,6 +131,11 @@ public: 
    sp<AMessage> getTrackFormat(size_t idx);



private:

    // Construct the muxer with the file descriptor. Note that the MediaMuxer

    // will close this file at stop().

    // This constructor is made private to ensure that MediaMuxer::create() is used instead.

    MediaMuxer(int fd, OutputFormat format);



    const OutputFormat mFormat;

    sp<MediaWriter> mWriter;

    Vector< sp<MediaAdapter> > mTrackList;  // Each track has its MediaAdapter.