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

Commit dd3b6e20 authored by Ray Essick's avatar Ray Essick Committed by Gerrit Code Review
Browse files

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

parents 69e55702 86ed61a6
Loading
Loading
Loading
Loading
+5 −4
Original line number Original line Diff line number Diff line
@@ -56,10 +56,6 @@ public:
     */
     */
    static MediaMuxer* create(int fd, OutputFormat format);
    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();
    virtual ~MediaMuxer();


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


private:
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;
    const OutputFormat mFormat;
    sp<MediaWriter> mWriter;
    sp<MediaWriter> mWriter;
    Vector< sp<MediaAdapter> > mTrackList;  // Each track has its MediaAdapter.
    Vector< sp<MediaAdapter> > mTrackList;  // Each track has its MediaAdapter.