[FFmpeg-soc] [soc]: r442 - qcelp/qcelpdata.h
reynaldo
subversion at mplayerhq.hu
Mon Jul 16 03:42:35 CEST 2007
Author: reynaldo
Date: Mon Jul 16 03:42:35 2007
New Revision: 442
Log:
Tables were backwards...
Modified:
qcelp/qcelpdata.h
Modified: qcelp/qcelpdata.h
==============================================================================
--- qcelp/qcelpdata.h (original)
+++ qcelp/qcelpdata.h Mon Jul 16 03:42:35 2007
@@ -85,74 +85,74 @@ typedef struct {
* it would be really nice if someone reviewed these numbers :)
*---------------------------------------------------------------------------*/
+
#define QCELP_RATE_FULL_BITMAP \
-{15,0},{47,0},{47,1},{47,2},{47,3},{47,4},{47,5},{47,6},\
-{65,0},{65,1},{45,6},{30,0},{30,1},{30,2},{30,3},{14,0},\
-{46,0},{46,1},{46,2},{46,3},{46,4},{46,5},{46,6},{31,0},\
-{31,1},{31,2},{44,2},{44,3},{44,4},{44,5},{44,6},{29,0},\
-{29,1},{29,2},{29,3},{13,0},{45,0},{45,1},{45,2},{45,3},\
-{45,4},{45,5},{59,2},{51,0},{51,1},{51,2},{51,3},{51,4},\
-{51,5},{51,6},{55,0},{28,0},{28,1},{28,2},{28,3},{12,0},\
-{44,0},{44,1},{42,4},{42,5},{42,6},{27,0},{27,1},{27,2},\
-{11,0},{43,0},{43,1},{43,2},{43,3},{43,4},{43,5},{43,6},\
-{59,0},{59,1},{41,0},{41,1},{41,2},{41,3},{41,4},{41,5},\
-{41,6},{26,0},{26,1},{26,2},{26,3},{10,0},{42,0},{42,1},\
-{42,2},{42,3},{24,1},{24,2},{24,3},{ 8,0},{40,0},{40,1},\
-{40,2},{40,3},{40,4},{40,5},{40,6},{24,0},{24,1},{24,2},\
-{24,3},{ 9,0},{39,3},{39,4},{39,5},{39,6},{58,0},{58,1},\
-{58,3},{50,0},{50,1},{50,2},{50,3},{50,4},{50,5},{50,6},\
-{54,0},{24,0},{22,3},{ 6,0},{38,0},{38,1},{38,2},{38,3},\
-{38,4},{38,5},{38,6},{23,0},{23,1},{23,2},{ 7,0},{39,0},\
-{39,1},{39,2},{36,6},{21,0},{21,1},{21,2},{21,3},{ 5,0},\
-{37,0},{37,1},{37,2},{37,3},{37,4},{37,5},{37,6},{22,0},\
-{22,1},{22,2},{49,3},{49,4},{49,5},{49,6},{53,0},{20,0},\
-{20,1},{20,2},{20,3},{ 4,0},{36,0},{36,1},{36,2},{36,3},\
-{36,4},{36,5},{19,1},{19,2},{ 3,0},{35,0},{35,1},{35,2},\
-{35,3},{35,4},{35,5},{35,6},{57,0},{57,1},{57,2},{49,0},\
-{49,1},{49,2},{33,4},{33,5},{33,6},{18,0},{18,1},{18,2},\
-{18,3},{ 2,0},{34,0},{34,1},{34,2},{34,3},{34,4},{34,5},\
-{34,6},{19,0},{32,0},{32,1},{32,2},{32,3},{32,4},{32,5},\
-{32,6},{17,0},{17,1},{17,2},{17,3},{ 1,0},{33,0},{33,1},\
-{33,2},{33,3},{56,0},{56,1},{56,2},{48,0},{48,1},{48,2},\
-{48,3},{48,4},{48,5},{48,6},{52,0},{16,0},{16,1},{16,2},\
-{ 0,3},{ 0,0},{62,3},{62,4},{62,5},{62,6},{63,0},{63,1},\
-{63,2},{63,3},{63,4},{63,5},{64,0},{64,1},{64,2},{64,3},\
-{64,4},{64,5},{60,0},{60,1},{60,2},{60,3},{60,4},{60,5},\
-{61,0},{61,1},{61,2},{61,3},{61,4},{61,5},{61,6},{62,0},\
-{62,1},{62,2}
+{62,2},{62,1},{62,0},{61,6},{61,5},{61,4},{61,3},{61,2},\
+{61,1},{61,0},{60,5},{60,4},{60,3},{60,2},{60,1},{60,0},\
+{64,5},{64,4},{64,3},{64,2},{64,1},{64,0},{63,5},{63,4},\
+{63,3},{63,2},{63,1},{63,0},{62,6},{62,5},{62,4},{62,3},\
+{ 0,0},{ 0,3},{16,2},{16,1},{16,0},{52,0},{48,6},{48,5},\
+{48,4},{48,3},{48,2},{48,1},{48,0},{56,2},{56,1},{56,0},\
+{33,3},{33,2},{33,1},{33,0},{ 1,0},{17,3},{17,2},{17,1},\
+{17,0},{32,6},{32,5},{32,4},{32,3},{32,2},{32,1},{32,0},\
+{19,0},{34,6},{34,5},{34,4},{34,3},{34,2},{34,1},{34,0},\
+{ 2,0},{18,3},{18,2},{18,1},{18,0},{33,6},{33,5},{33,4},\
+{49,2},{49,1},{49,0},{57,2},{57,1},{57,0},{35,6},{35,5},\
+{35,4},{35,3},{35,2},{35,1},{35,0},{ 3,0},{19,2},{19,1},\
+{36,5},{36,4},{36,3},{36,2},{36,1},{36,0},{ 4,0},{20,3},\
+{20,2},{20,1},{20,0},{53,0},{49,6},{49,5},{49,4},{49,3},\
+{22,2},{22,1},{22,0},{37,6},{37,5},{37,4},{37,3},{37,2},\
+{37,1},{37,0},{ 5,0},{21,3},{21,2},{21,1},{21,0},{36,6},\
+{39,2},{39,1},{39,0},{ 7,0},{23,2},{23,1},{23,0},{38,6},\
+{38,5},{38,4},{38,3},{38,2},{38,1},{38,0},{ 6,0},{22,3},\
+{24,0},{54,0},{50,6},{50,5},{50,4},{50,3},{50,2},{50,1},\
+{50,0},{58,2},{58,1},{58,0},{39,6},{39,5},{39,4},{39,3},\
+{ 9,0},{24,3},{24,2},{24,1},{24,0},{40,6},{40,5},{40,4},\
+{40,3},{40,2},{40,1},{40,0},{ 8,0},{24,3},{24,2},{24,1},\
+{42,3},{42,2},{42,1},{42,0},{10,0},{26,3},{26,2},{26,1},\
+{26,0},{41,6},{41,5},{41,4},{41,3},{41,2},{41,1},{41,0},\
+{59,1},{59,0},{43,6},{43,5},{43,4},{43,3},{43,2},{43,1},\
+{43,0},{11,0},{27,2},{27,1},{27,0},{42,6},{42,5},{42,4},\
+{44,1},{44,0},{12,0},{28,3},{28,2},{28,1},{28,0},{55,0},\
+{51,6},{51,5},{51,4},{51,3},{51,2},{51,1},{51,0},{59,2},\
+{45,5},{45,4},{45,3},{45,2},{45,1},{45,0},{13,0},{29,3},\
+{29,2},{29,1},{29,0},{44,6},{44,5},{44,4},{44,3},{44,2},\
+{31,2},{31,1},{31,0},{46,6},{46,5},{46,4},{46,3},{46,2},\
+{46,1},{46,0},{14,0},{30,3},{30,2},{30,1},{30,0},{45,6},\
+{65,1},{65,0},{47,6},{47,5},{47,4},{47,3},{47,2},{47,1},\
+{47,0},{15,0}
#define QCELP_RATE_HALF_BITMAP \
-{19,0},{19,1},{19,2},{19,3},{ 3,0},{35,0},{35,1},{35,2},\
-{35,3},{35,4},{35,5},{35,6},{34,2},{34,3},{34,4},{34,5},\
-{34,6},{59,0},{59,1},{59,2},{51,0},{51,1},{51,2},{51,3},\
-{51,4},{51,5},{51,6},{55,0},{58,2},{50,0},{50,1},{50,2},\
-{50,3},{50,4},{50,5},{50,6},{54,0},{18,0},{18,1},{18,2},\
-{18,3},{ 2,0},{34,0},{34,1},{49,6},{53,0},{17,0},{17,1},\
-{17,2},{17,3},{ 1,0},{33,0},{33,1},{33,2},{33,3},{33,4},\
-{33,5},{33,6},{58,0},{58,1},{32,0},{32,1},{32,2},{32,3},\
-{32,4},{32,5},{32,6},{57,0},{57,1},{57,2},{49,0},{49,1},\
-{49,2},{49,3},{49,4},{49,5},{56,0},{56,1},{56,2},{48,0},\
-{48,1},{48,2},{48,3},{48,4},{48,5},{48,6},{52,1},{16,0},\
-{16,1},{16,2},{16,3},{ 0,0},{62,3},{62,4},{62,5},{62,6},\
-{63,0},{63,1},{63,2},{63,3},{63,4},{63,5},{64,0},{64,1},\
-{64,2},{64,3},{64,4},{64,5},{60,0},{60,1},{60,2},{60,3},\
-{60,4},{60,5},{61,0},{61,1},{61,2},{61,3},{61,4},{61,5},\
-{61,6},{62,0},{62,1},{62,2}
+{62,2},{62,1},{62,0},{61,6},{61,5},{61,4},{61,3},{61,2},\
+{61,1},{61,0},{60,5},{60,4},{60,3},{60,2},{60,1},{60,0},\
+{64,5},{64,4},{64,3},{64,2},{64,1},{64,0},{63,5},{63,4},\
+{63,3},{63,2},{63,1},{63,0},{62,6},{62,5},{62,4},{62,3},\
+{ 0,0},{16,3},{16,2},{16,1},{16,0},{52,1},{48,6},{48,5},\
+{48,4},{48,3},{48,2},{48,1},{48,0},{56,2},{56,1},{56,0},\
+{49,5},{49,4},{49,3},{49,2},{49,1},{49,0},{57,2},{57,1},\
+{57,0},{32,6},{32,5},{32,4},{32,3},{32,2},{32,1},{32,0},\
+{58,1},{58,0},{33,6},{33,5},{33,4},{33,3},{33,2},{33,1},\
+{33,0},{ 1,0},{17,3},{17,2},{17,1},{17,0},{53,0},{49,6},\
+{34,1},{34,0},{ 2,0},{18,3},{18,2},{18,1},{18,0},{54,0},\
+{50,6},{50,5},{50,4},{50,3},{50,2},{50,1},{50,0},{58,2},\
+{55,0},{51,6},{51,5},{51,4},{51,3},{51,2},{51,1},{51,0},\
+{59,2},{59,1},{59,0},{34,6},{34,5},{34,4},{34,3},{34,2},\
+{35,6},{35,5},{35,4},{35,3},{35,2},{35,1},{35,0},{ 3,0},\
+{19,3},{19,2},{19,1},{19,0}
#define QCELP_RATE_4THR_BITMAP \
-{20,0},{20,1},{20,2},{20,3},{65,0},{65,1},{16,0},{16,1},\
-{16,2},{16,3},{17,0},{17,1},{17,2},{17,3},{18,0},{18,1},\
-{18,2},{18,3},{19,0},{19,1},{19,2},{19,3},{62,3},{62,4},\
-{62,5},{62,6},{63,0},{63,1},{63,2},{63,3},{63,4},{63,5},\
-{64,0},{64,1},{64,2},{64,3},{64,4},{64,5},{60,0},{60,1},\
-{60,2},{60,3},{60,4},{60,5},{61,0},{61,1},{61,2},{61,3},\
-{61,4},{61,5},{61,6},{62,0},{62,1},{62,2}
+{62,2},{62,1},{62,0},{61,6},{61,5},{61,4},{61,3},{61,2},\
+{61,1},{61,0},{60,5},{60,4},{60,3},{60,2},{60,1},{60,0},\
+{64,5},{64,4},{64,3},{64,2},{64,1},{64,0},{63,5},{63,4},\
+{63,3},{63,2},{63,1},{63,0},{62,6},{62,5},{62,4},{62,3},\
+{19,3},{19,2},{19,1},{19,0},{18,3},{18,2},{18,1},{18,0},\
+{17,3},{17,2},{17,1},{17,0},{16,3},{16,2},{16,1},{16,0},\
+{65,1},{65,0},{20,3},{20,2},{20,1},{20,0}
#define QCELP_RATE_8THR_BITMAP \
-{76,3},{66,0},{67,0},{68,0},{76,2},{69,0},{70,0},{71,0},\
-{76,1},{72,0},{73,0},{74,0},{76,0},{75,0},{16,1},{16,0},\
-{65,3},{65,2},{65,1},{65,0}
-
+{65,0},{65,1},{65,2},{65,3},{16,0},{16,1},{75,0},{76,0},\
+{74,0},{73,0},{72,0},{76,1},{71,0},{70,0},{69,0},{76,2},\
+{68,0},{67,0},{66,0},{76,3}
/**
* Position of the bitmapping data for each pkt type in
More information about the FFmpeg-soc
mailing list