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

Commit 54c88096 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Remove libmediaextractor 

Move DataSourceBase and MediaSource to libstagefright, and
MediaBuffer, MediaBufferGroup and MetaData to libstagefright_foundation.

Test: build

Change-Id: I4f0ae01d40a32f4b773a2f74d5f2ae136e375322
parent cccfb3fe

cmds/stagefright/Android.mk

+6 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \ 
        SineSource.cpp



LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia libmedia_omx libmediaextractor libutils libbinder \

        libstagefright libmedia libmedia_omx libutils libbinder \

        libstagefright_foundation libjpeg libui libgui libcutils liblog \

        libhidlbase \

        android.hardware.media.omx@1.0 \
@@ -36,7 +36,7 @@ LOCAL_SRC_FILES:= \ 
        record.cpp



LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia libmediaextractor liblog libutils libbinder \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation



LOCAL_C_INCLUDES:= \
@@ -61,7 +61,7 @@ LOCAL_SRC_FILES:= \ 
        recordvideo.cpp



LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia libmediaextractor liblog libutils libbinder \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation



LOCAL_C_INCLUDES:= \
@@ -87,7 +87,7 @@ LOCAL_SRC_FILES:= \ 
        audioloop.cpp



LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia libmediaextractor liblog libutils libbinder \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation



LOCAL_C_INCLUDES:= \
@@ -111,7 +111,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright liblog libutils libbinder libui libgui \

        libstagefright_foundation libmedia libcutils libmediaextractor

        libstagefright_foundation libmedia libcutils



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \
@@ -203,7 +203,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright liblog libutils libbinder libstagefright_foundation \

        libcutils libc libmediaextractor

        libcutils libc



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

include/media/DataSource.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmediaextractor/include/media/DataSource.h
 
 No newline at end of file
 
stagefright/DataSource.h
 
 No newline at end of file

include/media/DataSourceBase.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmediaextractor/include/media/DataSourceBase.h
 
 No newline at end of file
 
stagefright/DataSourceBase.h
 
 No newline at end of file

include/media/ExtractorUtils.h

deleted120000 → 0
+32 −1
Original line number Diff line number Diff line 
../../media/libmediaextractor/include/media/ExtractorUtils.h
 
 No newline at end of file

include/media/ExtractorUtils.h

0 → 100644
+32 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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 EXTRACTOR_UTILS_H_



#define EXTRACTOR_UTILS_H_



#include <memory>



namespace android {



template <class T>

std::unique_ptr<T[]> heapbuffer(size_t size) {

    return std::unique_ptr<T[]>(new (std::nothrow) T[size]);

}



}  // namespace android



#endif  // UTILS_H_