Bug 884507 - Change SECOND_TO_MS macro to be named MS_TO_SECONDS r=rillian
authorRick Eyre <rick.eyre@hotmail.com>
Tue, 18 Jun 2013 12:53:00 -0700
changeset 147135 6a532ecacec07bcdb8d20273736238f2b18aa4ab
parent 147134 31ef25bb8b28567a4fa2562dd7792aa3253bee4b
child 147136 728ba49f05503a8a1fa170edf164e5b94a9f0f5b
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs884507
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 884507 - Change SECOND_TO_MS macro to be named MS_TO_SECONDS r=rillian
content/media/VideoUtils.h
content/media/WebVTTLoadListener.cpp
--- a/content/media/VideoUtils.h
+++ b/content/media/VideoUtils.h
@@ -159,17 +159,17 @@ CheckedInt64 UsecsToFrames(int64_t aUsec
 
 // Number of microseconds per second. 1e6.
 static const int64_t USECS_PER_S = 1000000;
 
 // Number of microseconds per millisecond.
 static const int64_t USECS_PER_MS = 1000;
 
 // Converts seconds to milliseconds.
-#define SECONDS_TO_MS(s) ((s) / PR_MSEC_PER_SEC)
+#define MS_TO_SECONDS(s) ((s) / PR_MSEC_PER_SEC)
 
 // The maximum height and width of the video. Used for
 // sanitizing the memory allocation of the RGB buffer.
 // The maximum resolution we anticipate encountering in the
 // wild is 2160p - 3840x2160 pixels.
 static const int32_t MAX_VIDEO_WIDTH = 4000;
 static const int32_t MAX_VIDEO_HEIGHT = 3000;
 
--- a/content/media/WebVTTLoadListener.cpp
+++ b/content/media/WebVTTLoadListener.cpp
@@ -155,17 +155,17 @@ WebVTTLoadListener::ParseChunk(nsIInputS
 
 void
 WebVTTLoadListener::OnParsedCue(webvtt_cue* aCue)
 {
   const char* text = webvtt_string_text(&aCue->body);
 
   nsRefPtr<TextTrackCue> textTrackCue =
     new TextTrackCue(mElement->OwnerDoc()->GetParentObject(),
-                     SECONDS_TO_MS(aCue->from), SECONDS_TO_MS(aCue->until),
+                     MS_TO_SECONDS(aCue->from), MS_TO_SECONDS(aCue->until),
                      NS_ConvertUTF8toUTF16(text), mElement,
                      aCue->node_head);
 
   text = webvtt_string_text(&aCue->id);
   textTrackCue->SetId(NS_ConvertUTF8toUTF16(text));
 
   textTrackCue->SetSnapToLines(aCue->snap_to_lines);
   textTrackCue->SetSize(aCue->settings.size);