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

Commit 0da4dab0 authored by Andreas Huber's avatar Andreas Huber
Browse files

Squashed commit of the following: 

commit 29a4d3effb05a2e074cb0693316ab1977baeb0b6
Author: Andreas Huber <andih@google.com>
Date:   Mon Sep 27 12:01:32 2010 -0700

    Fully working implementation of MPEG2TSWriter (for AAC and AVC sources).

    Change-Id: I8a32a47565b647bf6c078c520e39565e08ea0d84

commit f4dec4c3899f3be393508e180d6c07e249d3335e
Author: Andreas Huber <andih@google.com>
Date:   Mon Sep 27 10:36:31 2010 -0700

    More reliable identification of MPEG2 transport streams. Don't keep scanning forever in case the stream does not have both audio and video tracks.

    Change-Id: Icc5b4e8be145b2805e8776559546a6818342aea7

commit 4fe3cc942f9b3d3cf54138b828c41214aa916dd2
Author: Andreas Huber <andih@google.com>
Date:   Mon Sep 27 08:23:39 2010 -0700

    test code

    Change-Id: I16560a17661407d06497f99ff88230724bb898af

commit 64d988b24f49f179a90fa677be11c823959e734b
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 23 14:42:52 2010 -0700

    First shot at supporting writing to an MPEG2 transport stream.

    Change-Id: Ie537939a99fa3ddc0c7661c47c18277584817c74

Change-Id: If78fd034af8f6e8ceac8dbeff96d5ecb3f6b96dc
parent 676570f3

cmds/stagefright/stagefright.cpp

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <media/mediametadataretriever.h>



#include <media/stagefright/foundation/hexdump.h>

#include <media/stagefright/MPEG2TSWriter.h>

#include <media/stagefright/MPEG4Writer.h>



#include <fcntl.h>
@@ -366,8 +367,13 @@ status_t DetectSyncSource::read( 


static void writeSourcesToMP4(

        Vector<sp<MediaSource> > &sources, bool syncInfoPresent) {

#if 0

    sp<MPEG4Writer> writer =

        new MPEG4Writer(gWriteMP4Filename.string());

#else

    sp<MPEG2TSWriter> writer =

        new MPEG2TSWriter(gWriteMP4Filename.string());

#endif



    // at most one minute.

    writer->setMaxFileDuration(60000000ll);

include/media/stagefright/MPEG2TSWriter.h

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef MPEG2TS_WRITER_H_



#define MPEG2TS_WRITER_H_



#include <media/stagefright/foundation/ABase.h>

#include <media/stagefright/foundation/AHandlerReflector.h>

#include <media/stagefright/foundation/ALooper.h>

#include <media/stagefright/MediaWriter.h>



namespace android {



struct MPEG2TSWriter : public MediaWriter {

    MPEG2TSWriter(const char *filename);



    virtual status_t addSource(const sp<MediaSource> &source);

    virtual status_t start(MetaData *param = NULL);

    virtual status_t stop();

    virtual status_t pause();

    virtual bool reachedEOS();

    virtual status_t dump(int fd, const Vector<String16>& args);



    void onMessageReceived(const sp<AMessage> &msg);



protected:

    virtual ~MPEG2TSWriter();



private:

    enum {

        kWhatSourceNotify = 'noti'

    };



    struct SourceInfo;



    FILE *mFile;

    sp<ALooper> mLooper;

    sp<AHandlerReflector<MPEG2TSWriter> > mReflector;



    bool mStarted;



    Vector<sp<SourceInfo> > mSources;

    size_t mNumSourcesDone;



    int64_t mNumTSPacketsWritten;

    int64_t mNumTSPacketsBeforeMeta;



    void writeTS();

    void writeProgramAssociationTable();

    void writeProgramMap();

    void writeAccessUnit(int32_t sourceIndex, const sp<ABuffer> &buffer);



    DISALLOW_EVIL_CONSTRUCTORS(MPEG2TSWriter);

};



}  // namespace android



#endif  // MPEG2TS_WRITER_H_

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ LOCAL_SRC_FILES:= \ 
        HTTPStream.cpp                    \

        JPEGSource.cpp                    \

        MP3Extractor.cpp                  \

        MPEG2TSWriter.cpp                 \

        MPEG4Extractor.cpp                \

        MPEG4Writer.cpp                   \

        MediaBuffer.cpp                   \

media/libstagefright/MPEG2TSWriter.cpp

0 → 100644
+758 −0

File added.

Preview size limit exceeded, changes collapsed.

media/libstagefright/mpeg2ts/ATSParser.cpp

+31 −17

File changed.

Preview size limit exceeded, changes collapsed.