[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e237d9192e519b556bdda60a15dbd808c0c6b34a
Author: Martin Storsjo <martin at martin.st>
Date:   Tue Sep 1 14:23:31 2009 +0300

    Use the new AMR_TX_IETF output format instead of AMR_TX_WMF

diff --git a/amrnb/wrapper.cpp b/amrnb/wrapper.cpp
index 50fdaff..9af8a0e 100644
--- a/amrnb/wrapper.cpp
+++ b/amrnb/wrapper.cpp
@@ -60,8 +60,8 @@ void Encoder_Interface_exit(void* s) {
 int Encoder_Interface_Encode(void* s, enum Mode mode, const short* speech, unsigned char* out, int forceSpeech) {
 	struct encoder_state* state = (struct encoder_state*) s;
 	enum Frame_Type_3GPP frame_type = (enum Frame_Type_3GPP) mode;
-	int ret = AMREncode(state->encCtx, state->pidSyncCtx, mode, (Word16*) speech, out, &frame_type, AMR_TX_WMF);
-	out[0] = ((frame_type & 0x0f) << 3) | 0x04;
+	int ret = AMREncode(state->encCtx, state->pidSyncCtx, mode, (Word16*) speech, out, &frame_type, AMR_TX_IETF);
+	out[0] |= 0x04;
 	return ret;
 }
 

-- 
opencore-amr packaging