libtwamr encoder: always emit frame->mode = mode; In the original implementation of amr_encode_frame(), the 'mode' member of the output struct was set to 0xFF if the output frame type is TX_NO_DATA. This design was made to mimic the mode field (16-bit word) being set to 0xFFFF (or -1) in 3GPP test sequence format - but nothing actually depends on this struct member being set in any way, and amr_frame_to_tseq() generates the needed 0xFFFF on its own, based on frame->type being equal to TX_NO_DATA. It is simpler and more efficient to always set frame->mode to the actual encoding mode in amr_encode_frame(), and this new behavior has already been documented in doc/AMR-library-API description in anticipation of the present change.

/*
 * A cleaner reimplementation of AMR Bits2prm() function.
 */

#include "typedef.h"
#include "namespace.h"
#include "bitno.h"
#include "bits2prm.h"

void Bits2prm(enum Mode mode, const Word16 bits[], Word16 prm[])
{
	const Word16 *p = bits;
	const Word16 *t = bitno[mode];
	unsigned nparam = prmno[mode];
	unsigned n, m, acc;

	for (n = 0; n < nparam; n++) {
		acc = 0;
		for (m = 0; m < *t; m++) {
			acc <<= 1;
			if (*p)
				acc |= 1;
			p++;
		}
		prm[n] = acc;
		t++;
	}
}