Fixed issue zaf#1

The encoder would omit one PCM frame in cases where the length of the input in EncodeUlaw() or EncodeAlaw() was 2
mxh120831853 · Aug 14, 2019 · 76a4a53 · 76a4a53
1 parent c92d33e
commit 76a4a53
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/alaw.go b/alaw.go
@@ -95,7 +95,7 @@ func EncodeAlaw(lpcm []byte) []byte {
 		return []byte{}
 	}
 	alaw := make([]byte, len(lpcm)/2)
-	for i, j := 0, 0; j < len(lpcm)-2; i, j = i+1, j+2 {
+	for i, j := 0, 0; j <= len(lpcm)-2; i, j = i+1, j+2 {
 		alaw[i] = EncodeAlawFrame(int16(lpcm[j]) | int16(lpcm[j+1])<<8)
 	}
 	return alaw

diff --git a/g711_test.go b/g711_test.go
@@ -24,6 +24,7 @@ var EncoderTest = []struct {
 	expected int
 }{
 	{[]byte{}, 0},
+	{[]byte{0x01, 0x00}, 2},
 	{[]byte{0x01, 0x00, 0x7c, 0x7f, 0xd1, 0xd0, 0xd3, 0xd2, 0xdd, 0xdc, 0xdf, 0xde}, 12},
 	{[]byte{0x01, 0x00, 0x7c, 0x7f, 0xd1, 0xd0, 0xd3, 0xd2, 0xdd, 0xdc, 0xdf, 0xde, 0xd9}, 12},
 }
@@ -33,6 +34,7 @@ var DecoderTest = []struct {
 	expected int
 }{
 	{[]byte{}, 0},
+	{[]byte{0x01, 0x00}, 4},
 	{[]byte{0x01, 0x00, 0x7c, 0x7f, 0xd1, 0xd0, 0xd3, 0xd2, 0xdd, 0xdc, 0xdf, 0xde}, 24},
 	{[]byte{0x01, 0x00, 0xdc, 0x7f, 0xd1, 0xd0, 0xd3, 0xd2, 0xdd, 0xdc, 0xdf, 0xde, 0xd9}, 26},
 }
@@ -42,6 +44,7 @@ var TranscoderTest = []struct {
 	expected int
 }{
 	{[]byte{}, 0},
+	{[]byte{0x01, 0x00}, 2},
 	{[]byte{0x01, 0x00, 0x7c, 0x7f, 0xd1, 0xd0, 0xd3, 0xd2, 0xdd, 0xdc, 0xdf, 0xde}, 12},
 	{[]byte{0x01, 0x00, 0x7c, 0x7f, 0xd1, 0xd0, 0xd3, 0xd2, 0xdd, 0xdc, 0xdf, 0xde, 0xd9}, 13},
 }

diff --git a/ulaw.go b/ulaw.go
@@ -98,7 +98,7 @@ func EncodeUlaw(lpcm []byte) []byte {
 		return []byte{}
 	}
 	ulaw := make([]byte, len(lpcm)/2)
-	for i, j := 0, 0; j < len(lpcm)-2; i, j = i+1, j+2 {
+	for i, j := 0, 0; j <= len(lpcm)-2; i, j = i+1, j+2 {
 		ulaw[i] = EncodeUlawFrame(int16(lpcm[j]) | int16(lpcm[j+1])<<8)
 	}
 	return ulaw