Bug 1403292 - Add some comments to ignore the clang-format execution on these declarations r?jya draft
authorSylvestre Ledru <sledru@mozilla.com>
Tue, 26 Sep 2017 21:11:33 +0200
changeset 670735 5ac360a1a6ad0521492cc7e2a73f01cc9d10194a
parent 663582 b90c155bb98dbfa8d99fe52b15b8aff2c55eddf5
child 733294 7a8b0b590db7f3f9faf9e7bf29c8a5722a6c37a6
push id81695
push userbmo:sledru@mozilla.com
push dateTue, 26 Sep 2017 19:13:26 +0000
reviewersjya
bugs1403292
milestone57.0a1
Bug 1403292 - Add some comments to ignore the clang-format execution on these declarations r?jya MozReview-Commit-ID: G30klPUAXTM
dom/media/mp3/MP3FrameParser.cpp
--- a/dom/media/mp3/MP3FrameParser.cpp
+++ b/dom/media/mp3/MP3FrameParser.cpp
@@ -216,20 +216,22 @@ FrameParser::FrameHeader::Layer() const
   return LAYERS[RawLayer()];
 }
 
 int32_t
 FrameParser::FrameHeader::SampleRate() const
 {
   // Sample rates - use [version][srate]
   static const uint16_t SAMPLE_RATE[4][4] = {
+    // clang-format off
     { 11025, 12000,  8000, 0 }, // MPEG 2.5
     {     0,     0,     0, 0 }, // Reserved
     { 22050, 24000, 16000, 0 }, // MPEG 2
     { 44100, 48000, 32000, 0 }  // MPEG 1
+    // clang-format on
   };
 
   return SAMPLE_RATE[RawVersion()][RawSampleRate()];
 }
 
 int32_t
 FrameParser::FrameHeader::Channels() const
 {
@@ -238,31 +240,34 @@ FrameParser::FrameHeader::Channels() con
   return RawChannelMode() == 3 ? 1 : 2;
 }
 
 int32_t
 FrameParser::FrameHeader::SamplesPerFrame() const
 {
   // Samples per frame - use [version][layer]
   static const uint16_t FRAME_SAMPLE[4][4] = {
+    // clang-format off
     // Layer     3     2     1       Version
     {      0,  576, 1152,  384 }, // 2.5
     {      0,    0,    0,    0 }, // Reserved
     {      0,  576, 1152,  384 }, // 2
     {      0, 1152, 1152,  384 }  // 1
+    // clang-format on
   };
 
   return FRAME_SAMPLE[RawVersion()][RawLayer()];
 }
 
 int32_t
 FrameParser::FrameHeader::Bitrate() const
 {
   // Bitrates - use [version][layer][bitrate]
   static const uint16_t BITRATE[4][4][16] = {
+    // clang-format off
     { // Version 2.5
       { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Reserved
       { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, 0 }, // Layer 3
       { 0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, 0 }, // Layer 2
       { 0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, 0 }  // Layer 1
     },
     { // Reserved
       { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Invalid
@@ -277,16 +282,17 @@ FrameParser::FrameHeader::Bitrate() cons
       { 0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, 0 }  // Layer 1
     },
     { // Version 1
       { 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0 }, // Reserved
       { 0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 0 }, // Layer 3
       { 0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, 0 }, // Layer 2
       { 0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0 }, // Layer 1
     }
+    // clang-format on
   };
 
   return 1000 * BITRATE[RawVersion()][RawLayer()][RawBitrate()];
 }
 
 int32_t
 FrameParser::FrameHeader::SlotSize() const
 {