Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:27:02 +0000 (09:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:27:02 +0000 (09:27 +0200)
* commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1':
  dnxhddata: Merge a few duplicated DC tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/dnxhddata.c

@@@ -1032,19 -1113,17 +990,19 @@@ const CIDEntry ff_dnxhd_cid_table[] = 
        dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight,
        dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level,
 -      dnxhd_1237_ac_run_flag, dnxhd_1237_ac_index_flag,
 +      dnxhd_1237_ac_flags,
        dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
 -      { 115, 120, 145, 240, 290 } },
 -    { 1238, 1920, 1080, 0, 917504, 917504, 4, 8,
 +      { 115, 120, 145, 240, 290 },
 +      { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
 +    { 1238, 1920, 1080, 0, 917504, 917504, 4, 8, 4,
        dnxhd_1238_luma_weight, dnxhd_1238_chroma_weight,
-       dnxhd_1238_dc_codes, dnxhd_1238_dc_bits,
+       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level,
 -      dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag,
 +      dnxhd_1238_ac_flags,
        dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1238_run,
 -      { 175, 185, 220, 365, 440 } },
 -    { 1241, 1920, 1080, 1, 917504, 458752, 6, 10,
 +      { 175, 185, 220, 365, 440 },
 +      { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
 +    { 1241, 1920, 1080, 1, 917504, 458752, 6, 10, 4,
        dnxhd_1241_luma_weight, dnxhd_1241_chroma_weight,
        dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
        dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level,
        dnxhd_1242_luma_weight, dnxhd_1242_chroma_weight,
        dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level,
 -      dnxhd_1237_ac_run_flag, dnxhd_1237_ac_index_flag,
 +      dnxhd_1237_ac_flags,
        dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
 -      { 120, 145 } },
 -    { 1243, 1920, 1080, 1, 917504, 458752, 4, 8,
 +      { 120, 145 },
 +      { { 25, 1 }, { 30000, 1001 } } },
 +    { 1243, 1920, 1080, 1, 917504, 458752, 4, 8, 4,
        dnxhd_1243_luma_weight, dnxhd_1243_chroma_weight,
-       dnxhd_1238_dc_codes, dnxhd_1238_dc_bits,
+       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level,
 -      dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag,
 +      dnxhd_1238_ac_flags,
        dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1238_run,
 -      { 185, 220 } },
 -    { 1250, 1280,  720, 0, 458752, 458752, 6, 10,
 +      { 185, 220 },
 +      { { 25, 1 }, { 30000, 1001 } } },
 +    { 1250, 1280,  720, 0, 458752, 458752, 6, 10, 4,
        dnxhd_1250_luma_weight, dnxhd_1250_chroma_weight,
-       dnxhd_1250_dc_codes, dnxhd_1250_dc_bits,
+       dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
        dnxhd_1250_ac_codes, dnxhd_1250_ac_bits, dnxhd_1250_ac_level,
 -      dnxhd_1250_ac_run_flag, dnxhd_1250_ac_index_flag,
 +      dnxhd_1250_ac_flags,
        dnxhd_1250_run_codes, dnxhd_1250_run_bits, dnxhd_1250_run,
 -      { 90, 180, 220 } },
 -    { 1251, 1280,  720, 0, 458752, 458752, 4, 8,
 +      { 90, 90, 180, 220 },
 +      { { 24000, 1001 }, { 25, 1 }, { 50, 1 }, { 60000, 1001 } } },
 +    { 1251, 1280,  720, 0, 458752, 458752, 4, 8, 4,
        dnxhd_1251_luma_weight, dnxhd_1251_chroma_weight,
-       dnxhd_1251_dc_codes, dnxhd_1251_dc_bits,
+       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1251_ac_codes, dnxhd_1251_ac_bits, dnxhd_1251_ac_level,
 -      dnxhd_1251_ac_run_flag, dnxhd_1251_ac_index_flag,
 +      dnxhd_1251_ac_flags,
        dnxhd_1251_run_codes, dnxhd_1251_run_bits, dnxhd_1251_run,
 -      { 90, 110, 175, 220 } },
 -    { 1252, 1280,  720, 0, 303104, 303104, 4, 8,
 +      { 90, 90, 110, 180, 220 },
 +      { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
 +    { 1252, 1280,  720, 0, 303104, 303104, 4, 8, 5,
        dnxhd_1252_luma_weight, dnxhd_1252_chroma_weight,
-       dnxhd_1252_dc_codes, dnxhd_1252_dc_bits,
+       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1252_ac_codes, dnxhd_1252_ac_bits, dnxhd_1252_ac_level,
 -      dnxhd_1252_ac_run_flag, dnxhd_1252_ac_index_flag,
 +      dnxhd_1252_ac_flags,
        dnxhd_1251_run_codes, dnxhd_1251_run_bits, dnxhd_1251_run,
 -      { 60, 75, 115, 145 } },
 -    { 1253, 1920, 1080, 0, 188416, 188416, 4, 8,
 +      { 60, 60, 75, 120, 145 },
 +      { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
 +    { 1253, 1920, 1080, 0, 188416, 188416, 4, 8, 3,
        dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight,
        dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level,
        dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight,
        dnxhd_1235_dc_codes, dnxhd_1235_dc_bits,
        dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level,
 -      dnxhd_1235_ac_run_flag, dnxhd_1235_ac_index_flag,
 +      dnxhd_1235_ac_flags,
        dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1235_run,
 -      { 350, 390, 440, 730, 880 } },
 -    { 1258, 960, 720, 0, 212992, 212992, 4, 8,
 +      { 350, 390, 440, 730, 880 },
 +      { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },
 +    { 1258, 960, 720, 0, 212992, 212992, 4, 8, 5,
        dnxhd_1258_luma_weight, dnxhd_1258_chroma_weight,
-       dnxhd_1258_dc_codes, dnxhd_1258_dc_bits,
+       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
        dnxhd_1252_ac_codes, dnxhd_1252_ac_bits, dnxhd_1252_ac_level,
 -      dnxhd_1252_ac_run_flag, dnxhd_1252_ac_index_flag,
 +      dnxhd_1252_ac_flags,
        dnxhd_1251_run_codes, dnxhd_1251_run_bits, dnxhd_1251_run,
        { 42, 60, 75, 115 } },
 +
  };
  
  int ff_dnxhd_get_cid_table(int cid)