Removed software video encoders that are not OMX-based. (a3cbc03f) · Commits · e / os / android_frameworks_av

media/libstagefright/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -91,8 +91,6 @@ LOCAL_SHARED_LIBRARIES := \
		LOCAL_STATIC_LIBRARIES := \
		libstagefright_color_conversion \
		libstagefright_aacenc \
		libstagefright_avcenc \
		libstagefright_m4vh263enc \
		libstagefright_matroska \
		libstagefright_timedtext \
		libvpx \

+0 −5

Original line number	Diff line number	Diff line
		@@ -61,11 +61,6 @@ MediaCodecList::MediaCodecList()
		// These are currently still used by the video editing suite.

		addMediaCodec(true /* encoder */, "AACEncoder", "audio/mp4a-latm");
		addMediaCodec(true /* encoder */, "AVCEncoder", "video/avc");

		addMediaCodec(true /* encoder */, "M4vH263Encoder");
		addType("video/3gpp");
		addType("video/mp4v-es");

		addMediaCodec(
		false /* encoder */, "OMX.google.raw.decoder", "audio/raw");

+0 −6

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@
		#include <utils/Log.h>

		#include "include/AACEncoder.h"
		#include "include/AVCEncoder.h"
		#include "include/M4vH263Encoder.h"

		#include "include/ESDS.h"

		@@ -67,8 +65,6 @@ static sp<MediaSource> Make##name(const sp<MediaSource> &source, const sp<MetaDa
		#define FACTORY_REF(name) { #name, Make##name },

		FACTORY_CREATE_ENCODER(AACEncoder)
		FACTORY_CREATE_ENCODER(AVCEncoder)
		FACTORY_CREATE_ENCODER(M4vH263Encoder)

		static sp<MediaSource> InstantiateSoftwareEncoder(
		const char *name, const sp<MediaSource> &source,
		@@ -80,8 +76,6 @@ static sp<MediaSource> InstantiateSoftwareEncoder(

		static const FactoryInfo kFactoryInfo[] = {
		FACTORY_REF(AACEncoder)
		FACTORY_REF(AVCEncoder)
		FACTORY_REF(M4vH263Encoder)
		};
		for (size_t i = 0;
		i < sizeof(kFactoryInfo) / sizeof(kFactoryInfo[0]); ++i) {

deleted100644 → 0

+0 −619

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −2