Move media/capture/webm_muxer* to media/muxers

WebmMuxer is used to multiplex incoming encoded video
and audio into a webm live stream. It is only used from
content's MediaRecorderHandler.

This CL moves WebmMuxer to media/muxers where it
belongs, since it has nothing to do with capture/; that is
made even more relevant in a parallel CL
(http://crrev.com/1699553002) that isolates the said
media/capture.

This CL doesn't modify code (except a minor style
reformatting caught by the presubmit). Narrowed some
DEPS too.

BUG=584797

Review URL: https://codereview.chromium.org/1710713002

Cr-Commit-Position: refs/heads/master@{#376243}

8 files changed, 30 insertions, 28 deletions

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 1ca0c08..b1686f4 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -165,8 +165,6 @@ component("media") {
     "capture/video/win/video_capture_device_mf_win.h",
     "capture/video/win/video_capture_device_win.cc",
     "capture/video/win/video_capture_device_win.h",
-    "capture/webm_muxer.cc",
-    "capture/webm_muxer.h",
     "cdm/aes_decryptor.cc",
     "cdm/aes_decryptor.h",
     "cdm/cdm_adapter.cc",
@@ -274,6 +272,8 @@ component("media") {
     "formats/webm/webm_video_client.h",
     "formats/webm/webm_webvtt_parser.cc",
     "formats/webm/webm_webvtt_parser.h",
+    "muxers/webm_muxer.cc",
+    "muxers/webm_muxer.h",
     "renderers/audio_renderer_impl.cc",
     "renderers/audio_renderer_impl.h",
     "renderers/default_renderer_factory.cc",
@@ -626,7 +626,6 @@ test("media_unittests") {
     "capture/content/video_capture_oracle_unittest.cc",
     "capture/video/fake_video_capture_device_unittest.cc",
     "capture/video/video_capture_device_unittest.cc",
-    "capture/webm_muxer_unittest.cc",
     "cdm/aes_decryptor_unittest.cc",
     "cdm/external_clear_key_test_helper.cc",
     "cdm/external_clear_key_test_helper.h",
@@ -673,6 +672,7 @@ test("media_unittests") {
     "formats/webm/webm_parser_unittest.cc",
     "formats/webm/webm_tracks_parser_unittest.cc",
     "formats/webm/webm_webvtt_parser_unittest.cc",
+    "muxers/webm_muxer_unittest.cc",
     "renderers/audio_renderer_impl_unittest.cc",
     "renderers/renderer_impl_unittest.cc",
     "renderers/skcanvas_video_renderer_unittest.cc",
diff --git a/media/DEPS b/media/DEPS
index c3a4f49..29edae3 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -8,7 +8,6 @@ include_rules = [
   "+jni",
   "+skia/ext",
   "+third_party/ffmpeg",
-  "+third_party/libwebm",
   "+third_party/libvpx_new",
   "+third_party/libyuv",
   "+third_party/opus",
diff --git a/media/media.gyp b/media/media.gyp
index de4de9d..638f9e8 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -451,10 +451,10 @@
         'capture/content/feedback_signal_accumulator.h',
         'capture/content/screen_capture_device_core.cc',
         'capture/content/screen_capture_device_core.h',
-        'capture/content/thread_safe_capture_oracle.cc',
-        'capture/content/thread_safe_capture_oracle.h',
         'capture/content/smooth_event_sampler.cc',
         'capture/content/smooth_event_sampler.h',
+        'capture/content/thread_safe_capture_oracle.cc',
+        'capture/content/thread_safe_capture_oracle.h',
         'capture/content/video_capture_oracle.cc',
         'capture/content/video_capture_oracle.h',
         'capture/video/android/video_capture_device_android.cc',
@@ -511,8 +511,6 @@
         'capture/video/win/video_capture_device_mf_win.h',
         'capture/video/win/video_capture_device_win.cc',
         'capture/video/win/video_capture_device_win.h',
-        'capture/webm_muxer.cc',
-        'capture/webm_muxer.h',
         'cdm/aes_decryptor.cc',
         'cdm/aes_decryptor.h',
         'cdm/cdm_adapter.cc',
@@ -580,10 +578,10 @@
         'filters/h264_bit_reader.h',
         'filters/h264_parser.cc',
         'filters/h264_parser.h',
-        'filters/ivf_parser.cc',
-        'filters/ivf_parser.h',
         'filters/in_memory_url_protocol.cc',
         'filters/in_memory_url_protocol.h',
+        'filters/ivf_parser.cc',
+        'filters/ivf_parser.h',
         'filters/jpeg_parser.cc',
         'filters/jpeg_parser.h',
         'filters/media_source_state.cc',
@@ -640,6 +638,8 @@
         'formats/webm/webm_video_client.cc',
         'formats/webm/webm_video_client.h',
         'formats/webm/webm_webvtt_parser.cc',
+        'muxers/webm_muxer.cc',
+        'muxers/webm_muxer.h',
         'ozone/media_ozone_platform.cc',
         'ozone/media_ozone_platform.h',
         'renderers/audio_renderer_impl.cc',
@@ -1292,7 +1292,6 @@
         'capture/content/video_capture_oracle_unittest.cc',
         'capture/video/fake_video_capture_device_unittest.cc',
         'capture/video/video_capture_device_unittest.cc',
-        'capture/webm_muxer_unittest.cc',
         'cdm/aes_decryptor_unittest.cc',
         'cdm/external_clear_key_test_helper.cc',
         'cdm/external_clear_key_test_helper.h',
@@ -1347,14 +1346,15 @@
         'formats/webm/webm_parser_unittest.cc',
         'formats/webm/webm_tracks_parser_unittest.cc',
         'formats/webm/webm_webvtt_parser_unittest.cc',
+        'muxers/webm_muxer_unittest.cc',
         'renderers/audio_renderer_impl_unittest.cc',
         'renderers/renderer_impl_unittest.cc',
         'renderers/skcanvas_video_renderer_unittest.cc',
         'renderers/video_renderer_impl_unittest.cc',
         'test/pipeline_integration_test.cc',
         'test/pipeline_integration_test_base.cc',
-        'video/h264_poc_unittest.cc',
         'video/gpu_memory_buffer_video_frame_pool_unittest.cc',
+        'video/h264_poc_unittest.cc',
       ],
       'include_dirs': [
         # Needed by media_drm_bridge.cc.
diff --git a/media/muxers/DEPS b/media/muxers/DEPS
new file mode 100644
index 0000000..dd27068
--- /dev/null
+++ b/media/muxers/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+third_party/libwebm",
+]
diff --git a/media/muxers/OWNERS b/media/muxers/OWNERS
new file mode 100644
index 0000000..088dd9c
--- /dev/null
+++ b/media/muxers/OWNERS
@@ -0,0 +1,2 @@
+mcasas@chromium.org
+miu@chromium.org
\ No newline at end of file
diff --git a/media/capture/webm_muxer.cc b/media/muxers/webm_muxer.cc
index c017032..e00982a 100644
--- a/media/capture/webm_muxer.cc
+++ b/media/muxers/webm_muxer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/capture/webm_muxer.h"
+#include "media/muxers/webm_muxer.h"
 
 #include "base/bind.h"
 #include "media/audio/audio_parameters.h"
@@ -59,8 +59,8 @@ static double GetFrameRate(const scoped_refptr<VideoFrame>& video_frame) {
   const double kDefaultFrameRate = 30.0;
 
   double frame_rate = kDefaultFrameRate;
-  if (!video_frame->metadata()->GetDouble(
-          VideoFrameMetadata::FRAME_RATE, &frame_rate) ||
+  if (!video_frame->metadata()->GetDouble(VideoFrameMetadata::FRAME_RATE,
+                                          &frame_rate) ||
       frame_rate <= kZeroFrameRate ||
       frame_rate > media::limits::kMaxFramesPerSecond) {
     frame_rate = kDefaultFrameRate;
diff --git a/media/capture/webm_muxer.h b/media/muxers/webm_muxer.h
index 1f5e3d3..227ce56 100644
--- a/media/capture/webm_muxer.h
+++ b/media/muxers/webm_muxer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FILTERS_LIBWEBM_MUXER_H_
-#define MEDIA_FILTERS_LIBWEBM_MUXER_H_
+#ifndef MEDIA_MUXERS_WEBM_MUXER_H_
+#define MEDIA_MUXERS_WEBM_MUXER_H_
 
 #include <stdint.h>
 
@@ -139,4 +139,4 @@ class MEDIA_EXPORT WebmMuxer : public NON_EXPORTED_BASE(mkvmuxer::IMkvWriter) {
 
 }  // namespace media
 
-#endif  // MEDIA_FILTERS_LIBWEBM_MUXER_H_
+#endif  // MEDIA_MUXERS_WEBM_MUXER_H_
diff --git a/media/capture/webm_muxer_unittest.cc b/media/muxers/webm_muxer_unittest.cc
index 19b1e70..03634de 100644
--- a/media/capture/webm_muxer_unittest.cc
+++ b/media/muxers/webm_muxer_unittest.cc
@@ -13,7 +13,7 @@
 #include "media/audio/audio_parameters.h"
 #include "media/base/channel_layout.h"
 #include "media/base/video_frame.h"
-#include "media/capture/webm_muxer.h"
+#include "media/muxers/webm_muxer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -41,11 +41,11 @@ struct kTestParams {
 class WebmMuxerTest : public TestWithParam<kTestParams> {
  public:
   WebmMuxerTest()
-      : webm_muxer_(GetParam().codec,
-                    GetParam().num_video_tracks,
-                    GetParam().num_audio_tracks,
-                    base::Bind(&WebmMuxerTest::WriteCallback,
-                               base::Unretained(this))),
+      : webm_muxer_(
+            GetParam().codec,
+            GetParam().num_video_tracks,
+            GetParam().num_audio_tracks,
+            base::Bind(&WebmMuxerTest::WriteCallback, base::Unretained(this))),
         last_encoded_length_(0),
         accumulated_position_(0) {
     EXPECT_EQ(webm_muxer_.Position(), 0);
@@ -110,8 +110,7 @@ TEST_P(WebmMuxerTest, OnEncodedVideoTwoFrames) {
           WithArgs<0>(Invoke(this, &WebmMuxerTest::SaveEncodedDataLen)));
   webm_muxer_.OnEncodedVideo(video_frame,
                              make_scoped_ptr(new std::string(encoded_data)),
-                             base::TimeTicks::Now(),
-                             false  /* keyframe */);
+                             base::TimeTicks::Now(), false /* keyframe */);
 
   // First time around WriteCallback() is pinged a number of times to write the
   // Matroska header, but at the end it dumps |encoded_data|.
@@ -127,8 +126,7 @@ TEST_P(WebmMuxerTest, OnEncodedVideoTwoFrames) {
           WithArgs<0>(Invoke(this, &WebmMuxerTest::SaveEncodedDataLen)));
   webm_muxer_.OnEncodedVideo(video_frame,
                              make_scoped_ptr(new std::string(encoded_data)),
-                             base::TimeTicks::Now(),
-                             false  /* keyframe */);
+                             base::TimeTicks::Now(), false /* keyframe */);
 
   // The second time around the callbacks should include a SimpleBlock header,
   // namely the track index, a timestamp and a flags byte, for a total of 6B.