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

Commit fc883630 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Removing widevine classic"

parents 48d80203 29b7dcf6

include/drm/drm_framework_common.h

+0 −4
Original line number Diff line number Diff line
@@ -234,10 +234,6 @@ public: 
     * POSIX based Decrypt API set for container based DRM

     */

    static const int CONTAINER_BASED = 0x02;

    /**

     * Decrypt API for Widevine streams

     */

    static const int WV_BASED = 0x3;

};



/**

include/media/MediaDefs.h

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS; 
extern const char *MEDIA_MIMETYPE_CONTAINER_AVI;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2PS;



extern const char *MEDIA_MIMETYPE_CONTAINER_WVM;



extern const char *MEDIA_MIMETYPE_TEXT_3GPP;

extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP;

extern const char *MEDIA_MIMETYPE_TEXT_VTT;

include/media/stagefright/MediaCodec.h

+0 −2
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ struct MediaCodec : public AHandler { 
    status_t getOutputFormat(sp<AMessage> *format) const;

    status_t getInputFormat(sp<AMessage> *format) const;



    status_t getWidevineLegacyBuffers(Vector<sp<MediaCodecBuffer> > *buffers) const;



    status_t getInputBuffers(Vector<sp<MediaCodecBuffer> > *buffers) const;

    status_t getOutputBuffers(Vector<sp<MediaCodecBuffer> > *buffers) const;

include/media/stagefright/NuMediaExtractor.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ private: 
    sp<DataSource> mDataSource;



    sp<IMediaExtractor> mImpl;

    bool mIsWidevineExtractor;



    Vector<TrackInfo> mSelectedTracks;

    int64_t mTotalBitrate;  // in bits/sec

media/libmedia/MediaDefs.cpp

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS = "video/mp2ts"; 
const char *MEDIA_MIMETYPE_CONTAINER_AVI = "video/avi";

const char *MEDIA_MIMETYPE_CONTAINER_MPEG2PS = "video/mp2p";



const char *MEDIA_MIMETYPE_CONTAINER_WVM = "video/wvm";



const char *MEDIA_MIMETYPE_TEXT_3GPP = "text/3gpp-tt";

const char *MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";

const char *MEDIA_MIMETYPE_TEXT_VTT = "text/vtt";