Commit 321005e4 by Oliver Woodman

Use 'bitrate' not 'bit-rate' consistently.

parent d1360ad7
...@@ -37,8 +37,8 @@ public final class CommonMp4AtomParsers { ...@@ -37,8 +37,8 @@ public final class CommonMp4AtomParsers {
/** Channel counts for AC-3 audio, indexed by acmod. (See ETSI TS 102 366.) */ /** Channel counts for AC-3 audio, indexed by acmod. (See ETSI TS 102 366.) */
private static final int[] AC3_CHANNEL_COUNTS = new int[] {2, 1, 2, 3, 3, 4, 4, 5}; private static final int[] AC3_CHANNEL_COUNTS = new int[] {2, 1, 2, 3, 3, 4, 4, 5};
/** Nominal bit-rates for AC-3 audio in kbps, indexed by bit_rate_code. (See ETSI TS 102 366.) */ /** Nominal bitrates for AC-3 audio in kbps, indexed by bit_rate_code. (See ETSI TS 102 366.) */
private static final int[] AC3_BIT_RATES = new int[] {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, private static final int[] AC3_BITRATES = new int[] {32, 40, 48, 56, 64, 80, 96, 112, 128, 160,
192, 224, 256, 320, 384, 448, 512, 576, 640}; 192, 224, 256, 320, 384, 448, 512, 576, 640};
/** /**
...@@ -639,8 +639,8 @@ public final class CommonMp4AtomParsers { ...@@ -639,8 +639,8 @@ public final class CommonMp4AtomParsers {
channelCount++; channelCount++;
} }
// Map bit_rate_code onto a bit-rate in kbit/s. // Map bit_rate_code onto a bitrate in kbit/s.
int bitrate = AC3_BIT_RATES[((nextByte & 0x03) << 3) + (parent.readUnsignedByte() >> 5)]; int bitrate = AC3_BITRATES[((nextByte & 0x03) << 3) + (parent.readUnsignedByte() >> 5)];
return new Ac3Format(channelCount, sampleRate, bitrate); return new Ac3Format(channelCount, sampleRate, bitrate);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment