Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization... (c17f35dd) · Commits · e / os / android_frameworks_base

include/media/mediarecorder.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,9 @@ enum output_format {
	OUTPUT_FORMAT_AAC_ADIF = 5,		OUTPUT_FORMAT_AAC_ADIF = 5,
	OUTPUT_FORMAT_AAC_ADTS = 6,		OUTPUT_FORMAT_AAC_ADTS = 6,

			/* Stream over a socket, limited to a single stream */
			OUTPUT_FORMAT_RTP_AVP = 7,

	OUTPUT_FORMAT_LIST_END // must be last - used to validate format type		OUTPUT_FORMAT_LIST_END // must be last - used to validate format type
	};		};

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ enum {
	kKeyIsSyncFrame = 'sync', // int32_t (bool)		kKeyIsSyncFrame = 'sync', // int32_t (bool)
	kKeyIsCodecConfig = 'conf', // int32_t (bool)		kKeyIsCodecConfig = 'conf', // int32_t (bool)
	kKeyTime = 'time', // int64_t (usecs)		kKeyTime = 'time', // int64_t (usecs)
			kKeyNTPTime = 'ntpT', // uint64_t (ntp-timestamp)
	kKeyTargetTime = 'tarT', // int64_t (usecs)		kKeyTargetTime = 'tarT', // int64_t (usecs)
	kKeyDuration = 'dura', // int64_t (usecs)		kKeyDuration = 'dura', // int64_t (usecs)
	kKeyColorFormat = 'colf',		kKeyColorFormat = 'colf',

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -188,6 +188,9 @@ public class MediaRecorder
	public static final int AAC_ADIF = 5;		public static final int AAC_ADIF = 5;
	/** @hide AAC ADTS file format */		/** @hide AAC ADTS file format */
	public static final int AAC_ADTS = 6;		public static final int AAC_ADTS = 6;

			/** @hide Stream over a socket, limited to a single stream */
			public static final int OUTPUT_FORMAT_RTP_AVP = 7;
	};		};

	/**		/**

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -181,7 +181,7 @@ status_t MediaRecorder::setOutputFormat(int of)
	LOGE("setOutputFormat called in an invalid state: %d", mCurrentState);		LOGE("setOutputFormat called in an invalid state: %d", mCurrentState);
	return INVALID_OPERATION;		return INVALID_OPERATION;
	}		}
	if (mIsVideoSourceSet && of >= OUTPUT_FORMAT_AUDIO_ONLY_START) { //first non-video output format		if (mIsVideoSourceSet && of >= OUTPUT_FORMAT_AUDIO_ONLY_START && of != OUTPUT_FORMAT_RTP_AVP) { //first non-video output format
	LOGE("output format (%d) is meant for audio recording only and incompatible with video recording", of);		LOGE("output format (%d) is meant for audio recording only and incompatible with video recording", of);
	return INVALID_OPERATION;		return INVALID_OPERATION;
	}		}

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,8 +32,12 @@ LOCAL_SHARED_LIBRARIES := \
	libstagefright \		libstagefright \
	libstagefright_omx \		libstagefright_omx \
	libstagefright_color_conversion \		libstagefright_color_conversion \
			libstagefright_foundation \
	libsurfaceflinger_client		libsurfaceflinger_client

			LOCAL_STATIC_LIBRARIES := \
			libstagefright_rtsp

	ifneq ($(BUILD_WITHOUT_PV),true)		ifneq ($(BUILD_WITHOUT_PV),true)
	LOCAL_SHARED_LIBRARIES += \		LOCAL_SHARED_LIBRARIES += \
	libopencore_player \		libopencore_player \
	@@ -51,6 +55,7 @@ LOCAL_C_INCLUDES := \
	$(call include-path-for, graphics corecg) \		$(call include-path-for, graphics corecg) \
	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \		$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
	$(TOP)/frameworks/base/media/libstagefright/include \		$(TOP)/frameworks/base/media/libstagefright/include \
			$(TOP)/frameworks/base/media/libstagefright/rtsp \
	$(TOP)/external/tremolo/Tremolo		$(TOP)/external/tremolo/Tremolo

	LOCAL_MODULE:= libmediaplayerservice		LOCAL_MODULE:= libmediaplayerservice