diff --git a/.gitignore b/.gitignore index 209d445489..42a631707b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,25 +5,25 @@ .pydevproject .repo .settings -/base/ -/build/ -/docs/ -/ipc/ -/net/ /out/ -/testing/ -/third_party/curl/source/ -/third_party/gflags/ -/third_party/gold/ -/third_party/icu/ -/third_party/libevent/ -/third_party/libxml/ -/third_party/llvm-build/ -/third_party/modp_b64/ -/third_party/openssl/ -/third_party/protobuf/ -/third_party/zlib/ -/tools/clang/ -/tools/gyp/ -/tools/protoc_wrapper/ -/tools/valgrind/ +/packager/base/ +/packager/build/ +/packager/docs/ +/packager/ipc/ +/packager/net/ +/packager/testing/ +/packager/third_party/curl/source/ +/packager/third_party/gflags/ +/packager/third_party/gold/ +/packager/third_party/icu/ +/packager/third_party/libevent/ +/packager/third_party/libxml/ +/packager/third_party/llvm-build/ +/packager/third_party/modp_b64/ +/packager/third_party/openssl/ +/packager/third_party/protobuf/ +/packager/third_party/zlib/ +/packager/tools/clang/ +/packager/tools/gyp/ +/packager/tools/protoc_wrapper/ +/packager/tools/valgrind/ diff --git a/DEPS b/DEPS index d8f63cc5a7..38c9712c8a 100644 --- a/DEPS +++ b/DEPS @@ -22,14 +22,14 @@ vars = { } deps = { - "src/base": + "src/packager/base": Var("chromium_svn") + "/src/base@" + Var("chromium_rev"), - "src/build": + "src/packager/build": Var("chromium_svn") + "/src/build@" + Var("chromium_rev"), # Required by base/metrics/stats_table.cc. - "src/ipc": + "src/packager/ipc": File(Var("chromium_svn") + "/src/ipc/ipc_descriptors.h@" + Var("chromium_rev")), # Required by base isolate dependencies, although it is compiled off. @@ -41,68 +41,68 @@ deps = { # <= net/third_party/nss/ssl_base.isolate # We don't need to pull in the whole directory, but it doesn't seem possible # to just pull in the two *.isolate files (ssl.isolate and ssl_base.isolate). - "src/net/third_party/nss": + "src/packager/net/third_party/nss": Var("chromium_svn") + "/src/net/third_party/nss@" + Var("chromium_rev"), - "src/testing": + "src/packager/testing": Var("chromium_svn") + "/src/testing@" + Var("chromium_rev"), - "src/testing/gmock": + "src/packager/testing/gmock": (Var("googlecode_url") % "googlemock") + "/trunk@" + Var("gmock_rev"), - "src/testing/gtest": + "src/packager/testing/gtest": (Var("googlecode_url") % "googletest") + "/trunk@" + Var("gtest_rev"), - "src/third_party/curl/source": + "src/packager/third_party/curl/source": Var("curl_url") + "@" + Var("curl_rev"), - "src/third_party/gflags": + "src/packager/third_party/gflags": (Var("googlecode_url") % "webrtc")+ "/trunk/third_party/gflags@" + Var("webrtc_rev"), - "src/third_party/gflags/src": + "src/packager/third_party/gflags/src": (Var("googlecode_url") % "gflags") + "/trunk/src@" + Var("gflags_rev"), # Required by libxml. - "src/third_party/icu": + "src/packager/third_party/icu": Var("chromium_svn") + "/deps/third_party/icu46@" + Var("chromium_rev"), # Required by base/message_pump_libevent.cc. - "src/third_party/libevent": + "src/packager/third_party/libevent": Var("chromium_svn") + "/src/third_party/libevent@" + Var("chromium_rev"), - "src/third_party/libxml": + "src/packager/third_party/libxml": Var("chromium_svn") + "/src/third_party/libxml@" + Var("chromium_rev"), - "src/third_party/modp_b64": + "src/packager/third_party/modp_b64": Var("chromium_svn") + "/src/third_party/modp_b64@" + Var("chromium_rev"), - "src/third_party/openssl": + "src/packager/third_party/openssl": Var("chromium_svn") + "/deps/third_party/openssl@" + Var("chromium_rev"), - "src/third_party/protobuf": + "src/packager/third_party/protobuf": Var("chromium_svn") + "/src/third_party/protobuf@" + Var("chromium_rev"), - "src/tools/clang": + "src/packager/tools/clang": Var("chromium_svn") + "/src/tools/clang@" + Var("chromium_rev"), - "src/tools/gyp": + "src/packager/tools/gyp": (Var("googlecode_url") % "gyp") + "/trunk@" + Var("gyp_rev"), - "src/tools/protoc_wrapper": + "src/packager/tools/protoc_wrapper": Var("chromium_svn") + "/src/tools/protoc_wrapper@" + Var("chromium_rev"), - "src/tools/valgrind": + "src/packager/tools/valgrind": Var("chromium_svn") + "/src/tools/valgrind@" + Var("chromium_rev"), } deps_os = { "unix": { # Linux, actually. # Linux gold build to build faster. - "src/third_party/gold": + "src/packager/third_party/gold": Var("chromium_svn") + "/deps/third_party/gold@" + Var("chromium_rev"), # Required by /src/build/linux/system.gyp. - "src/third_party/zlib": + "src/packager/third_party/zlib": Var("chromium_svn") + "/src/third_party/zlib@" + Var("chromium_rev"), }, } @@ -114,11 +114,11 @@ hooks = [ # Pull clang if on Mac or clang is requested via GYP_DEFINES. "name": "clang", "pattern": ".", - "action": ["python", "src/tools/clang/scripts/update.py", "--mac-only"], + "action": ["python", "src/packager/tools/clang/scripts/update.py", "--mac-only"], }, { # A change to a .gyp, .gypi, or to GYP itself should run the generator. "pattern": ".", - "action": ["python", "src/gyp_packager.py"], + "action": ["python", "src/gyp_packager.py", "--depth=src/packager"], }, ] diff --git a/README.md b/README.md index 246bcc6a4f..7a9194dd97 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ This document provides the information needed to create a DASH packager that is 3. Get the source ```Shell - mkdir packager - cd packager + mkdir edash_packager + cd edash_packager gclient config https://www.github.com/google/edash-packager.git --name=src gclient sync ``` @@ -34,17 +34,13 @@ This document provides the information needed to create a DASH packager that is ``` Refer to ninja manual for details. - We also provide a mechanism to change build configurations, for example, developers can change build system to “make” by overriding *GYP_GENERATORS* using *gyp_packager.py* script, i.e. + We also provide a mechanism to change build configurations, for example, developers can change build system to “make” by overriding *GYP_GENERATORS*. ```Shell - GYP_GENERATORS='make' ./gyp_packager.py + GYP_GENERATORS='make' gclient runhooks ``` Another example, developers can also enable clang by overriding *GYP_DEFINE*. ```Shell - GYP_DEFINES='clang=1' ./gyp_packager.py - ``` - Take note that clang needs to be setup for the first time if it is not setup yet. - ```Shell - tools/clang/scripts/update.sh + GYP_DEFINES='clang=1' gclient runhooks ``` 5. Updating the code diff --git a/gyp_packager.py b/gyp_packager.py index 41ec506ca6..ea5e2a018f 100755 --- a/gyp_packager.py +++ b/gyp_packager.py @@ -34,7 +34,8 @@ import os import sys -src_dir = os.path.dirname(os.path.realpath(__file__)) +checkout_dir = os.path.dirname(os.path.realpath(__file__)) +src_dir = os.path.join(checkout_dir, 'packager') sys.path.insert(0, os.path.join(src_dir, 'build')) import gyp_helper # Workaround the dynamic path. pylint: disable-msg=F0401 @@ -79,6 +80,18 @@ if __name__ == '__main__': if not os.environ.get('GYP_GENERATORS'): os.environ['GYP_GENERATORS'] = 'ninja' + # TODO(kqyang): Find a better way to handle the depth. This workaround works + # only if this script is executed in 'src' directory. + if ['--depth' in arg for arg in args].count(True) == 0: + args.append('--depth=packager') + + output_dir = os.path.join(checkout_dir, 'out') + gyp_generator_flags = 'output_dir="' + output_dir + '"' + if os.environ.get('GYP_GENERATOR_FLAGS'): + os.environ['GYP_GENERATOR_FLAGS'] += " " + gyp_generator_flags + else: + os.environ['GYP_GENERATOR_FLAGS'] = gyp_generator_flags + print 'Updating projects from gyp files...' sys.stdout.flush() diff --git a/app/fixed_key_encryption_flags.cc b/packager/app/fixed_key_encryption_flags.cc similarity index 100% rename from app/fixed_key_encryption_flags.cc rename to packager/app/fixed_key_encryption_flags.cc diff --git a/app/fixed_key_encryption_flags.h b/packager/app/fixed_key_encryption_flags.h similarity index 100% rename from app/fixed_key_encryption_flags.h rename to packager/app/fixed_key_encryption_flags.h diff --git a/app/libcrypto_threading.cc b/packager/app/libcrypto_threading.cc similarity index 100% rename from app/libcrypto_threading.cc rename to packager/app/libcrypto_threading.cc diff --git a/app/libcrypto_threading.h b/packager/app/libcrypto_threading.h similarity index 100% rename from app/libcrypto_threading.h rename to packager/app/libcrypto_threading.h diff --git a/app/libcrypto_threading_posix.cc b/packager/app/libcrypto_threading_posix.cc similarity index 100% rename from app/libcrypto_threading_posix.cc rename to packager/app/libcrypto_threading_posix.cc diff --git a/app/mpd_flags.cc b/packager/app/mpd_flags.cc similarity index 100% rename from app/mpd_flags.cc rename to packager/app/mpd_flags.cc diff --git a/app/mpd_flags.h b/packager/app/mpd_flags.h similarity index 100% rename from app/mpd_flags.h rename to packager/app/mpd_flags.h diff --git a/app/mpd_generator.cc b/packager/app/mpd_generator.cc similarity index 100% rename from app/mpd_generator.cc rename to packager/app/mpd_generator.cc diff --git a/app/mpd_generator_flags.h b/packager/app/mpd_generator_flags.h similarity index 100% rename from app/mpd_generator_flags.h rename to packager/app/mpd_generator_flags.h diff --git a/app/muxer_flags.cc b/packager/app/muxer_flags.cc similarity index 100% rename from app/muxer_flags.cc rename to packager/app/muxer_flags.cc diff --git a/app/muxer_flags.h b/packager/app/muxer_flags.h similarity index 100% rename from app/muxer_flags.h rename to packager/app/muxer_flags.h diff --git a/app/packager_main.cc b/packager/app/packager_main.cc similarity index 100% rename from app/packager_main.cc rename to packager/app/packager_main.cc diff --git a/app/packager_util.cc b/packager/app/packager_util.cc similarity index 100% rename from app/packager_util.cc rename to packager/app/packager_util.cc diff --git a/app/packager_util.h b/packager/app/packager_util.h similarity index 100% rename from app/packager_util.h rename to packager/app/packager_util.h diff --git a/app/stream_descriptor.cc b/packager/app/stream_descriptor.cc similarity index 100% rename from app/stream_descriptor.cc rename to packager/app/stream_descriptor.cc diff --git a/app/stream_descriptor.h b/packager/app/stream_descriptor.h similarity index 100% rename from app/stream_descriptor.h rename to packager/app/stream_descriptor.h diff --git a/app/test/packager_app.py b/packager/app/test/packager_app.py similarity index 100% rename from app/test/packager_app.py rename to packager/app/test/packager_app.py diff --git a/app/test/packager_test.py b/packager/app/test/packager_test.py similarity index 100% rename from app/test/packager_test.py rename to packager/app/test/packager_test.py diff --git a/app/test/test_env.py b/packager/app/test/test_env.py similarity index 100% rename from app/test/test_env.py rename to packager/app/test/test_env.py diff --git a/app/widevine_encryption_flags.cc b/packager/app/widevine_encryption_flags.cc similarity index 100% rename from app/widevine_encryption_flags.cc rename to packager/app/widevine_encryption_flags.cc diff --git a/app/widevine_encryption_flags.h b/packager/app/widevine_encryption_flags.h similarity index 100% rename from app/widevine_encryption_flags.h rename to packager/app/widevine_encryption_flags.h diff --git a/common.gypi b/packager/common.gypi similarity index 100% rename from common.gypi rename to packager/common.gypi diff --git a/media/base/aes_encryptor.cc b/packager/media/base/aes_encryptor.cc similarity index 100% rename from media/base/aes_encryptor.cc rename to packager/media/base/aes_encryptor.cc diff --git a/media/base/aes_encryptor.h b/packager/media/base/aes_encryptor.h similarity index 100% rename from media/base/aes_encryptor.h rename to packager/media/base/aes_encryptor.h diff --git a/media/base/aes_encryptor_unittest.cc b/packager/media/base/aes_encryptor_unittest.cc similarity index 100% rename from media/base/aes_encryptor_unittest.cc rename to packager/media/base/aes_encryptor_unittest.cc diff --git a/media/base/audio_stream_info.cc b/packager/media/base/audio_stream_info.cc similarity index 100% rename from media/base/audio_stream_info.cc rename to packager/media/base/audio_stream_info.cc diff --git a/media/base/audio_stream_info.h b/packager/media/base/audio_stream_info.h similarity index 100% rename from media/base/audio_stream_info.h rename to packager/media/base/audio_stream_info.h diff --git a/media/base/audio_timestamp_helper.cc b/packager/media/base/audio_timestamp_helper.cc similarity index 100% rename from media/base/audio_timestamp_helper.cc rename to packager/media/base/audio_timestamp_helper.cc diff --git a/media/base/audio_timestamp_helper.h b/packager/media/base/audio_timestamp_helper.h similarity index 100% rename from media/base/audio_timestamp_helper.h rename to packager/media/base/audio_timestamp_helper.h diff --git a/media/base/audio_timestamp_helper_unittest.cc b/packager/media/base/audio_timestamp_helper_unittest.cc similarity index 100% rename from media/base/audio_timestamp_helper_unittest.cc rename to packager/media/base/audio_timestamp_helper_unittest.cc diff --git a/media/base/bit_reader.cc b/packager/media/base/bit_reader.cc similarity index 100% rename from media/base/bit_reader.cc rename to packager/media/base/bit_reader.cc diff --git a/media/base/bit_reader.h b/packager/media/base/bit_reader.h similarity index 100% rename from media/base/bit_reader.h rename to packager/media/base/bit_reader.h diff --git a/media/base/bit_reader_unittest.cc b/packager/media/base/bit_reader_unittest.cc similarity index 100% rename from media/base/bit_reader_unittest.cc rename to packager/media/base/bit_reader_unittest.cc diff --git a/media/base/buffer_reader.cc b/packager/media/base/buffer_reader.cc similarity index 100% rename from media/base/buffer_reader.cc rename to packager/media/base/buffer_reader.cc diff --git a/media/base/buffer_reader.h b/packager/media/base/buffer_reader.h similarity index 100% rename from media/base/buffer_reader.h rename to packager/media/base/buffer_reader.h diff --git a/media/base/buffer_writer.cc b/packager/media/base/buffer_writer.cc similarity index 100% rename from media/base/buffer_writer.cc rename to packager/media/base/buffer_writer.cc diff --git a/media/base/buffer_writer.h b/packager/media/base/buffer_writer.h similarity index 100% rename from media/base/buffer_writer.h rename to packager/media/base/buffer_writer.h diff --git a/media/base/buffer_writer_unittest.cc b/packager/media/base/buffer_writer_unittest.cc similarity index 100% rename from media/base/buffer_writer_unittest.cc rename to packager/media/base/buffer_writer_unittest.cc diff --git a/media/base/byte_queue.cc b/packager/media/base/byte_queue.cc similarity index 100% rename from media/base/byte_queue.cc rename to packager/media/base/byte_queue.cc diff --git a/media/base/byte_queue.h b/packager/media/base/byte_queue.h similarity index 100% rename from media/base/byte_queue.h rename to packager/media/base/byte_queue.h diff --git a/media/base/closure_thread.cc b/packager/media/base/closure_thread.cc similarity index 100% rename from media/base/closure_thread.cc rename to packager/media/base/closure_thread.cc diff --git a/media/base/closure_thread.h b/packager/media/base/closure_thread.h similarity index 100% rename from media/base/closure_thread.h rename to packager/media/base/closure_thread.h diff --git a/media/base/closure_thread_unittest.cc b/packager/media/base/closure_thread_unittest.cc similarity index 100% rename from media/base/closure_thread_unittest.cc rename to packager/media/base/closure_thread_unittest.cc diff --git a/media/base/container_names.cc b/packager/media/base/container_names.cc similarity index 100% rename from media/base/container_names.cc rename to packager/media/base/container_names.cc diff --git a/media/base/container_names.h b/packager/media/base/container_names.h similarity index 100% rename from media/base/container_names.h rename to packager/media/base/container_names.h diff --git a/media/base/container_names_unittest.cc b/packager/media/base/container_names_unittest.cc similarity index 100% rename from media/base/container_names_unittest.cc rename to packager/media/base/container_names_unittest.cc diff --git a/media/base/decrypt_config.cc b/packager/media/base/decrypt_config.cc similarity index 100% rename from media/base/decrypt_config.cc rename to packager/media/base/decrypt_config.cc diff --git a/media/base/decrypt_config.h b/packager/media/base/decrypt_config.h similarity index 100% rename from media/base/decrypt_config.h rename to packager/media/base/decrypt_config.h diff --git a/media/base/decryptor_source.h b/packager/media/base/decryptor_source.h similarity index 100% rename from media/base/decryptor_source.h rename to packager/media/base/decryptor_source.h diff --git a/media/base/demuxer.cc b/packager/media/base/demuxer.cc similarity index 100% rename from media/base/demuxer.cc rename to packager/media/base/demuxer.cc diff --git a/media/base/demuxer.h b/packager/media/base/demuxer.h similarity index 100% rename from media/base/demuxer.h rename to packager/media/base/demuxer.h diff --git a/media/base/fake_prng.cc b/packager/media/base/fake_prng.cc similarity index 100% rename from media/base/fake_prng.cc rename to packager/media/base/fake_prng.cc diff --git a/media/base/fake_prng.h b/packager/media/base/fake_prng.h similarity index 100% rename from media/base/fake_prng.h rename to packager/media/base/fake_prng.h diff --git a/media/base/http_fetcher.cc b/packager/media/base/http_fetcher.cc similarity index 100% rename from media/base/http_fetcher.cc rename to packager/media/base/http_fetcher.cc diff --git a/media/base/http_fetcher.h b/packager/media/base/http_fetcher.h similarity index 100% rename from media/base/http_fetcher.h rename to packager/media/base/http_fetcher.h diff --git a/media/base/http_fetcher_unittest.cc b/packager/media/base/http_fetcher_unittest.cc similarity index 100% rename from media/base/http_fetcher_unittest.cc rename to packager/media/base/http_fetcher_unittest.cc diff --git a/media/base/key_source.cc b/packager/media/base/key_source.cc similarity index 100% rename from media/base/key_source.cc rename to packager/media/base/key_source.cc diff --git a/media/base/key_source.h b/packager/media/base/key_source.h similarity index 100% rename from media/base/key_source.h rename to packager/media/base/key_source.h diff --git a/media/base/limits.h b/packager/media/base/limits.h similarity index 100% rename from media/base/limits.h rename to packager/media/base/limits.h diff --git a/media/base/media_base.gyp b/packager/media/base/media_base.gyp similarity index 100% rename from media/base/media_base.gyp rename to packager/media/base/media_base.gyp diff --git a/media/base/media_parser.h b/packager/media/base/media_parser.h similarity index 100% rename from media/base/media_parser.h rename to packager/media/base/media_parser.h diff --git a/media/base/media_sample.cc b/packager/media/base/media_sample.cc similarity index 100% rename from media/base/media_sample.cc rename to packager/media/base/media_sample.cc diff --git a/media/base/media_sample.h b/packager/media/base/media_sample.h similarity index 100% rename from media/base/media_sample.h rename to packager/media/base/media_sample.h diff --git a/media/base/media_stream.cc b/packager/media/base/media_stream.cc similarity index 100% rename from media/base/media_stream.cc rename to packager/media/base/media_stream.cc diff --git a/media/base/media_stream.h b/packager/media/base/media_stream.h similarity index 100% rename from media/base/media_stream.h rename to packager/media/base/media_stream.h diff --git a/media/base/muxer.cc b/packager/media/base/muxer.cc similarity index 100% rename from media/base/muxer.cc rename to packager/media/base/muxer.cc diff --git a/media/base/muxer.h b/packager/media/base/muxer.h similarity index 100% rename from media/base/muxer.h rename to packager/media/base/muxer.h diff --git a/media/base/muxer_options.cc b/packager/media/base/muxer_options.cc similarity index 100% rename from media/base/muxer_options.cc rename to packager/media/base/muxer_options.cc diff --git a/media/base/muxer_options.h b/packager/media/base/muxer_options.h similarity index 100% rename from media/base/muxer_options.h rename to packager/media/base/muxer_options.h diff --git a/media/base/muxer_util.cc b/packager/media/base/muxer_util.cc similarity index 100% rename from media/base/muxer_util.cc rename to packager/media/base/muxer_util.cc diff --git a/media/base/muxer_util.h b/packager/media/base/muxer_util.h similarity index 100% rename from media/base/muxer_util.h rename to packager/media/base/muxer_util.h diff --git a/media/base/muxer_util_unittest.cc b/packager/media/base/muxer_util_unittest.cc similarity index 100% rename from media/base/muxer_util_unittest.cc rename to packager/media/base/muxer_util_unittest.cc diff --git a/media/base/network_util.cc b/packager/media/base/network_util.cc similarity index 100% rename from media/base/network_util.cc rename to packager/media/base/network_util.cc diff --git a/media/base/network_util.h b/packager/media/base/network_util.h similarity index 100% rename from media/base/network_util.h rename to packager/media/base/network_util.h diff --git a/media/base/offset_byte_queue.cc b/packager/media/base/offset_byte_queue.cc similarity index 100% rename from media/base/offset_byte_queue.cc rename to packager/media/base/offset_byte_queue.cc diff --git a/media/base/offset_byte_queue.h b/packager/media/base/offset_byte_queue.h similarity index 100% rename from media/base/offset_byte_queue.h rename to packager/media/base/offset_byte_queue.h diff --git a/media/base/offset_byte_queue_unittest.cc b/packager/media/base/offset_byte_queue_unittest.cc similarity index 100% rename from media/base/offset_byte_queue_unittest.cc rename to packager/media/base/offset_byte_queue_unittest.cc diff --git a/media/base/producer_consumer_queue.h b/packager/media/base/producer_consumer_queue.h similarity index 100% rename from media/base/producer_consumer_queue.h rename to packager/media/base/producer_consumer_queue.h diff --git a/media/base/producer_consumer_queue_unittest.cc b/packager/media/base/producer_consumer_queue_unittest.cc similarity index 100% rename from media/base/producer_consumer_queue_unittest.cc rename to packager/media/base/producer_consumer_queue_unittest.cc diff --git a/media/base/request_signer.cc b/packager/media/base/request_signer.cc similarity index 100% rename from media/base/request_signer.cc rename to packager/media/base/request_signer.cc diff --git a/media/base/request_signer.h b/packager/media/base/request_signer.h similarity index 100% rename from media/base/request_signer.h rename to packager/media/base/request_signer.h diff --git a/media/base/rsa_key.cc b/packager/media/base/rsa_key.cc similarity index 100% rename from media/base/rsa_key.cc rename to packager/media/base/rsa_key.cc diff --git a/media/base/rsa_key.h b/packager/media/base/rsa_key.h similarity index 100% rename from media/base/rsa_key.h rename to packager/media/base/rsa_key.h diff --git a/media/base/rsa_key_unittest.cc b/packager/media/base/rsa_key_unittest.cc similarity index 100% rename from media/base/rsa_key_unittest.cc rename to packager/media/base/rsa_key_unittest.cc diff --git a/media/base/rsa_test_data.cc b/packager/media/base/rsa_test_data.cc similarity index 100% rename from media/base/rsa_test_data.cc rename to packager/media/base/rsa_test_data.cc diff --git a/media/base/rsa_test_data.h b/packager/media/base/rsa_test_data.h similarity index 100% rename from media/base/rsa_test_data.h rename to packager/media/base/rsa_test_data.h diff --git a/media/base/status.cc b/packager/media/base/status.cc similarity index 100% rename from media/base/status.cc rename to packager/media/base/status.cc diff --git a/media/base/status.h b/packager/media/base/status.h similarity index 100% rename from media/base/status.h rename to packager/media/base/status.h diff --git a/media/base/status_test_util.h b/packager/media/base/status_test_util.h similarity index 100% rename from media/base/status_test_util.h rename to packager/media/base/status_test_util.h diff --git a/media/base/status_test_util_unittest.cc b/packager/media/base/status_test_util_unittest.cc similarity index 100% rename from media/base/status_test_util_unittest.cc rename to packager/media/base/status_test_util_unittest.cc diff --git a/media/base/status_unittest.cc b/packager/media/base/status_unittest.cc similarity index 100% rename from media/base/status_unittest.cc rename to packager/media/base/status_unittest.cc diff --git a/media/base/stream_info.cc b/packager/media/base/stream_info.cc similarity index 100% rename from media/base/stream_info.cc rename to packager/media/base/stream_info.cc diff --git a/media/base/stream_info.h b/packager/media/base/stream_info.h similarity index 100% rename from media/base/stream_info.h rename to packager/media/base/stream_info.h diff --git a/media/base/text_track.h b/packager/media/base/text_track.h similarity index 100% rename from media/base/text_track.h rename to packager/media/base/text_track.h diff --git a/media/base/timestamp.h b/packager/media/base/timestamp.h similarity index 100% rename from media/base/timestamp.h rename to packager/media/base/timestamp.h diff --git a/media/base/video_stream_info.cc b/packager/media/base/video_stream_info.cc similarity index 100% rename from media/base/video_stream_info.cc rename to packager/media/base/video_stream_info.cc diff --git a/media/base/video_stream_info.h b/packager/media/base/video_stream_info.h similarity index 100% rename from media/base/video_stream_info.h rename to packager/media/base/video_stream_info.h diff --git a/media/base/widevine_key_source.cc b/packager/media/base/widevine_key_source.cc similarity index 100% rename from media/base/widevine_key_source.cc rename to packager/media/base/widevine_key_source.cc diff --git a/media/base/widevine_key_source.h b/packager/media/base/widevine_key_source.h similarity index 100% rename from media/base/widevine_key_source.h rename to packager/media/base/widevine_key_source.h diff --git a/media/base/widevine_key_source_unittest.cc b/packager/media/base/widevine_key_source_unittest.cc similarity index 100% rename from media/base/widevine_key_source_unittest.cc rename to packager/media/base/widevine_key_source_unittest.cc diff --git a/media/event/media_event.gyp b/packager/media/event/media_event.gyp similarity index 100% rename from media/event/media_event.gyp rename to packager/media/event/media_event.gyp diff --git a/media/event/mpd_notify_muxer_listener.cc b/packager/media/event/mpd_notify_muxer_listener.cc similarity index 100% rename from media/event/mpd_notify_muxer_listener.cc rename to packager/media/event/mpd_notify_muxer_listener.cc diff --git a/media/event/mpd_notify_muxer_listener.h b/packager/media/event/mpd_notify_muxer_listener.h similarity index 100% rename from media/event/mpd_notify_muxer_listener.h rename to packager/media/event/mpd_notify_muxer_listener.h diff --git a/media/event/muxer_listener.h b/packager/media/event/muxer_listener.h similarity index 100% rename from media/event/muxer_listener.h rename to packager/media/event/muxer_listener.h diff --git a/media/event/muxer_listener_internal.cc b/packager/media/event/muxer_listener_internal.cc similarity index 100% rename from media/event/muxer_listener_internal.cc rename to packager/media/event/muxer_listener_internal.cc diff --git a/media/event/muxer_listener_internal.h b/packager/media/event/muxer_listener_internal.h similarity index 100% rename from media/event/muxer_listener_internal.h rename to packager/media/event/muxer_listener_internal.h diff --git a/media/event/vod_media_info_dump_muxer_listener.cc b/packager/media/event/vod_media_info_dump_muxer_listener.cc similarity index 100% rename from media/event/vod_media_info_dump_muxer_listener.cc rename to packager/media/event/vod_media_info_dump_muxer_listener.cc diff --git a/media/event/vod_media_info_dump_muxer_listener.h b/packager/media/event/vod_media_info_dump_muxer_listener.h similarity index 100% rename from media/event/vod_media_info_dump_muxer_listener.h rename to packager/media/event/vod_media_info_dump_muxer_listener.h diff --git a/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc similarity index 100% rename from media/event/vod_media_info_dump_muxer_listener_unittest.cc rename to packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc diff --git a/media/file/file.cc b/packager/media/file/file.cc similarity index 100% rename from media/file/file.cc rename to packager/media/file/file.cc diff --git a/media/file/file.gyp b/packager/media/file/file.gyp similarity index 100% rename from media/file/file.gyp rename to packager/media/file/file.gyp diff --git a/media/file/file.h b/packager/media/file/file.h similarity index 100% rename from media/file/file.h rename to packager/media/file/file.h diff --git a/media/file/file_closer.h b/packager/media/file/file_closer.h similarity index 100% rename from media/file/file_closer.h rename to packager/media/file/file_closer.h diff --git a/media/file/file_unittest.cc b/packager/media/file/file_unittest.cc similarity index 100% rename from media/file/file_unittest.cc rename to packager/media/file/file_unittest.cc diff --git a/media/file/local_file.cc b/packager/media/file/local_file.cc similarity index 100% rename from media/file/local_file.cc rename to packager/media/file/local_file.cc diff --git a/media/file/local_file.h b/packager/media/file/local_file.h similarity index 100% rename from media/file/local_file.h rename to packager/media/file/local_file.h diff --git a/media/file/udp_file.cc b/packager/media/file/udp_file.cc similarity index 100% rename from media/file/udp_file.cc rename to packager/media/file/udp_file.cc diff --git a/media/file/udp_file.h b/packager/media/file/udp_file.h similarity index 100% rename from media/file/udp_file.h rename to packager/media/file/udp_file.h diff --git a/media/filters/filters.gyp b/packager/media/filters/filters.gyp similarity index 100% rename from media/filters/filters.gyp rename to packager/media/filters/filters.gyp diff --git a/media/filters/h264_bit_reader.cc b/packager/media/filters/h264_bit_reader.cc similarity index 100% rename from media/filters/h264_bit_reader.cc rename to packager/media/filters/h264_bit_reader.cc diff --git a/media/filters/h264_bit_reader.h b/packager/media/filters/h264_bit_reader.h similarity index 100% rename from media/filters/h264_bit_reader.h rename to packager/media/filters/h264_bit_reader.h diff --git a/media/filters/h264_bit_reader_unittest.cc b/packager/media/filters/h264_bit_reader_unittest.cc similarity index 100% rename from media/filters/h264_bit_reader_unittest.cc rename to packager/media/filters/h264_bit_reader_unittest.cc diff --git a/media/filters/h264_byte_to_unit_stream_converter.cc b/packager/media/filters/h264_byte_to_unit_stream_converter.cc similarity index 100% rename from media/filters/h264_byte_to_unit_stream_converter.cc rename to packager/media/filters/h264_byte_to_unit_stream_converter.cc diff --git a/media/filters/h264_byte_to_unit_stream_converter.h b/packager/media/filters/h264_byte_to_unit_stream_converter.h similarity index 100% rename from media/filters/h264_byte_to_unit_stream_converter.h rename to packager/media/filters/h264_byte_to_unit_stream_converter.h diff --git a/media/filters/h264_byte_to_unit_stream_converter_unittest.cc b/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc similarity index 100% rename from media/filters/h264_byte_to_unit_stream_converter_unittest.cc rename to packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc diff --git a/media/filters/h264_parser.cc b/packager/media/filters/h264_parser.cc similarity index 100% rename from media/filters/h264_parser.cc rename to packager/media/filters/h264_parser.cc diff --git a/media/filters/h264_parser.h b/packager/media/filters/h264_parser.h similarity index 100% rename from media/filters/h264_parser.h rename to packager/media/filters/h264_parser.h diff --git a/media/filters/h264_parser_unittest.cc b/packager/media/filters/h264_parser_unittest.cc similarity index 100% rename from media/filters/h264_parser_unittest.cc rename to packager/media/filters/h264_parser_unittest.cc diff --git a/media/formats/mp2t/adts_header.cc b/packager/media/formats/mp2t/adts_header.cc similarity index 100% rename from media/formats/mp2t/adts_header.cc rename to packager/media/formats/mp2t/adts_header.cc diff --git a/media/formats/mp2t/adts_header.h b/packager/media/formats/mp2t/adts_header.h similarity index 100% rename from media/formats/mp2t/adts_header.h rename to packager/media/formats/mp2t/adts_header.h diff --git a/media/formats/mp2t/adts_header_unittest.cc b/packager/media/formats/mp2t/adts_header_unittest.cc similarity index 100% rename from media/formats/mp2t/adts_header_unittest.cc rename to packager/media/formats/mp2t/adts_header_unittest.cc diff --git a/media/formats/mp2t/es_parser.h b/packager/media/formats/mp2t/es_parser.h similarity index 100% rename from media/formats/mp2t/es_parser.h rename to packager/media/formats/mp2t/es_parser.h diff --git a/media/formats/mp2t/es_parser_adts.cc b/packager/media/formats/mp2t/es_parser_adts.cc similarity index 100% rename from media/formats/mp2t/es_parser_adts.cc rename to packager/media/formats/mp2t/es_parser_adts.cc diff --git a/media/formats/mp2t/es_parser_adts.h b/packager/media/formats/mp2t/es_parser_adts.h similarity index 100% rename from media/formats/mp2t/es_parser_adts.h rename to packager/media/formats/mp2t/es_parser_adts.h diff --git a/media/formats/mp2t/es_parser_h264.cc b/packager/media/formats/mp2t/es_parser_h264.cc similarity index 100% rename from media/formats/mp2t/es_parser_h264.cc rename to packager/media/formats/mp2t/es_parser_h264.cc diff --git a/media/formats/mp2t/es_parser_h264.h b/packager/media/formats/mp2t/es_parser_h264.h similarity index 100% rename from media/formats/mp2t/es_parser_h264.h rename to packager/media/formats/mp2t/es_parser_h264.h diff --git a/media/formats/mp2t/es_parser_h264_unittest.cc b/packager/media/formats/mp2t/es_parser_h264_unittest.cc similarity index 100% rename from media/formats/mp2t/es_parser_h264_unittest.cc rename to packager/media/formats/mp2t/es_parser_h264_unittest.cc diff --git a/media/formats/mp2t/mp2t.gyp b/packager/media/formats/mp2t/mp2t.gyp similarity index 100% rename from media/formats/mp2t/mp2t.gyp rename to packager/media/formats/mp2t/mp2t.gyp diff --git a/media/formats/mp2t/mp2t_common.h b/packager/media/formats/mp2t/mp2t_common.h similarity index 100% rename from media/formats/mp2t/mp2t_common.h rename to packager/media/formats/mp2t/mp2t_common.h diff --git a/media/formats/mp2t/mp2t_media_parser.cc b/packager/media/formats/mp2t/mp2t_media_parser.cc similarity index 100% rename from media/formats/mp2t/mp2t_media_parser.cc rename to packager/media/formats/mp2t/mp2t_media_parser.cc diff --git a/media/formats/mp2t/mp2t_media_parser.h b/packager/media/formats/mp2t/mp2t_media_parser.h similarity index 100% rename from media/formats/mp2t/mp2t_media_parser.h rename to packager/media/formats/mp2t/mp2t_media_parser.h diff --git a/media/formats/mp2t/mp2t_media_parser_unittest.cc b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc similarity index 100% rename from media/formats/mp2t/mp2t_media_parser_unittest.cc rename to packager/media/formats/mp2t/mp2t_media_parser_unittest.cc diff --git a/media/formats/mp2t/ts_packet.cc b/packager/media/formats/mp2t/ts_packet.cc similarity index 100% rename from media/formats/mp2t/ts_packet.cc rename to packager/media/formats/mp2t/ts_packet.cc diff --git a/media/formats/mp2t/ts_packet.h b/packager/media/formats/mp2t/ts_packet.h similarity index 100% rename from media/formats/mp2t/ts_packet.h rename to packager/media/formats/mp2t/ts_packet.h diff --git a/media/formats/mp2t/ts_section.h b/packager/media/formats/mp2t/ts_section.h similarity index 100% rename from media/formats/mp2t/ts_section.h rename to packager/media/formats/mp2t/ts_section.h diff --git a/media/formats/mp2t/ts_section_pat.cc b/packager/media/formats/mp2t/ts_section_pat.cc similarity index 100% rename from media/formats/mp2t/ts_section_pat.cc rename to packager/media/formats/mp2t/ts_section_pat.cc diff --git a/media/formats/mp2t/ts_section_pat.h b/packager/media/formats/mp2t/ts_section_pat.h similarity index 100% rename from media/formats/mp2t/ts_section_pat.h rename to packager/media/formats/mp2t/ts_section_pat.h diff --git a/media/formats/mp2t/ts_section_pes.cc b/packager/media/formats/mp2t/ts_section_pes.cc similarity index 100% rename from media/formats/mp2t/ts_section_pes.cc rename to packager/media/formats/mp2t/ts_section_pes.cc diff --git a/media/formats/mp2t/ts_section_pes.h b/packager/media/formats/mp2t/ts_section_pes.h similarity index 100% rename from media/formats/mp2t/ts_section_pes.h rename to packager/media/formats/mp2t/ts_section_pes.h diff --git a/media/formats/mp2t/ts_section_pmt.cc b/packager/media/formats/mp2t/ts_section_pmt.cc similarity index 100% rename from media/formats/mp2t/ts_section_pmt.cc rename to packager/media/formats/mp2t/ts_section_pmt.cc diff --git a/media/formats/mp2t/ts_section_pmt.h b/packager/media/formats/mp2t/ts_section_pmt.h similarity index 100% rename from media/formats/mp2t/ts_section_pmt.h rename to packager/media/formats/mp2t/ts_section_pmt.h diff --git a/media/formats/mp2t/ts_section_psi.cc b/packager/media/formats/mp2t/ts_section_psi.cc similarity index 100% rename from media/formats/mp2t/ts_section_psi.cc rename to packager/media/formats/mp2t/ts_section_psi.cc diff --git a/media/formats/mp2t/ts_section_psi.h b/packager/media/formats/mp2t/ts_section_psi.h similarity index 100% rename from media/formats/mp2t/ts_section_psi.h rename to packager/media/formats/mp2t/ts_section_psi.h diff --git a/media/formats/mp4/aac_audio_specific_config.cc b/packager/media/formats/mp4/aac_audio_specific_config.cc similarity index 100% rename from media/formats/mp4/aac_audio_specific_config.cc rename to packager/media/formats/mp4/aac_audio_specific_config.cc diff --git a/media/formats/mp4/aac_audio_specific_config.h b/packager/media/formats/mp4/aac_audio_specific_config.h similarity index 100% rename from media/formats/mp4/aac_audio_specific_config.h rename to packager/media/formats/mp4/aac_audio_specific_config.h diff --git a/media/formats/mp4/aac_audio_specific_config_unittest.cc b/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc similarity index 100% rename from media/formats/mp4/aac_audio_specific_config_unittest.cc rename to packager/media/formats/mp4/aac_audio_specific_config_unittest.cc diff --git a/media/formats/mp4/box.cc b/packager/media/formats/mp4/box.cc similarity index 100% rename from media/formats/mp4/box.cc rename to packager/media/formats/mp4/box.cc diff --git a/media/formats/mp4/box.h b/packager/media/formats/mp4/box.h similarity index 100% rename from media/formats/mp4/box.h rename to packager/media/formats/mp4/box.h diff --git a/media/formats/mp4/box_buffer.h b/packager/media/formats/mp4/box_buffer.h similarity index 100% rename from media/formats/mp4/box_buffer.h rename to packager/media/formats/mp4/box_buffer.h diff --git a/media/formats/mp4/box_definitions.cc b/packager/media/formats/mp4/box_definitions.cc similarity index 100% rename from media/formats/mp4/box_definitions.cc rename to packager/media/formats/mp4/box_definitions.cc diff --git a/media/formats/mp4/box_definitions.h b/packager/media/formats/mp4/box_definitions.h similarity index 100% rename from media/formats/mp4/box_definitions.h rename to packager/media/formats/mp4/box_definitions.h diff --git a/media/formats/mp4/box_definitions_comparison.h b/packager/media/formats/mp4/box_definitions_comparison.h similarity index 100% rename from media/formats/mp4/box_definitions_comparison.h rename to packager/media/formats/mp4/box_definitions_comparison.h diff --git a/media/formats/mp4/box_definitions_unittest.cc b/packager/media/formats/mp4/box_definitions_unittest.cc similarity index 100% rename from media/formats/mp4/box_definitions_unittest.cc rename to packager/media/formats/mp4/box_definitions_unittest.cc diff --git a/media/formats/mp4/box_reader.cc b/packager/media/formats/mp4/box_reader.cc similarity index 100% rename from media/formats/mp4/box_reader.cc rename to packager/media/formats/mp4/box_reader.cc diff --git a/media/formats/mp4/box_reader.h b/packager/media/formats/mp4/box_reader.h similarity index 100% rename from media/formats/mp4/box_reader.h rename to packager/media/formats/mp4/box_reader.h diff --git a/media/formats/mp4/box_reader_unittest.cc b/packager/media/formats/mp4/box_reader_unittest.cc similarity index 100% rename from media/formats/mp4/box_reader_unittest.cc rename to packager/media/formats/mp4/box_reader_unittest.cc diff --git a/media/formats/mp4/cenc.cc b/packager/media/formats/mp4/cenc.cc similarity index 100% rename from media/formats/mp4/cenc.cc rename to packager/media/formats/mp4/cenc.cc diff --git a/media/formats/mp4/cenc.h b/packager/media/formats/mp4/cenc.h similarity index 100% rename from media/formats/mp4/cenc.h rename to packager/media/formats/mp4/cenc.h diff --git a/media/formats/mp4/chunk_info_iterator.cc b/packager/media/formats/mp4/chunk_info_iterator.cc similarity index 100% rename from media/formats/mp4/chunk_info_iterator.cc rename to packager/media/formats/mp4/chunk_info_iterator.cc diff --git a/media/formats/mp4/chunk_info_iterator.h b/packager/media/formats/mp4/chunk_info_iterator.h similarity index 100% rename from media/formats/mp4/chunk_info_iterator.h rename to packager/media/formats/mp4/chunk_info_iterator.h diff --git a/media/formats/mp4/chunk_info_iterator_unittest.cc b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc similarity index 100% rename from media/formats/mp4/chunk_info_iterator_unittest.cc rename to packager/media/formats/mp4/chunk_info_iterator_unittest.cc diff --git a/media/formats/mp4/composition_offset_iterator.cc b/packager/media/formats/mp4/composition_offset_iterator.cc similarity index 100% rename from media/formats/mp4/composition_offset_iterator.cc rename to packager/media/formats/mp4/composition_offset_iterator.cc diff --git a/media/formats/mp4/composition_offset_iterator.h b/packager/media/formats/mp4/composition_offset_iterator.h similarity index 100% rename from media/formats/mp4/composition_offset_iterator.h rename to packager/media/formats/mp4/composition_offset_iterator.h diff --git a/media/formats/mp4/composition_offset_iterator_unittest.cc b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc similarity index 100% rename from media/formats/mp4/composition_offset_iterator_unittest.cc rename to packager/media/formats/mp4/composition_offset_iterator_unittest.cc diff --git a/media/formats/mp4/decoding_time_iterator.cc b/packager/media/formats/mp4/decoding_time_iterator.cc similarity index 100% rename from media/formats/mp4/decoding_time_iterator.cc rename to packager/media/formats/mp4/decoding_time_iterator.cc diff --git a/media/formats/mp4/decoding_time_iterator.h b/packager/media/formats/mp4/decoding_time_iterator.h similarity index 100% rename from media/formats/mp4/decoding_time_iterator.h rename to packager/media/formats/mp4/decoding_time_iterator.h diff --git a/media/formats/mp4/decoding_time_iterator_unittest.cc b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc similarity index 100% rename from media/formats/mp4/decoding_time_iterator_unittest.cc rename to packager/media/formats/mp4/decoding_time_iterator_unittest.cc diff --git a/media/formats/mp4/encrypting_fragmenter.cc b/packager/media/formats/mp4/encrypting_fragmenter.cc similarity index 100% rename from media/formats/mp4/encrypting_fragmenter.cc rename to packager/media/formats/mp4/encrypting_fragmenter.cc diff --git a/media/formats/mp4/encrypting_fragmenter.h b/packager/media/formats/mp4/encrypting_fragmenter.h similarity index 100% rename from media/formats/mp4/encrypting_fragmenter.h rename to packager/media/formats/mp4/encrypting_fragmenter.h diff --git a/media/formats/mp4/es_descriptor.cc b/packager/media/formats/mp4/es_descriptor.cc similarity index 100% rename from media/formats/mp4/es_descriptor.cc rename to packager/media/formats/mp4/es_descriptor.cc diff --git a/media/formats/mp4/es_descriptor.h b/packager/media/formats/mp4/es_descriptor.h similarity index 100% rename from media/formats/mp4/es_descriptor.h rename to packager/media/formats/mp4/es_descriptor.h diff --git a/media/formats/mp4/es_descriptor_unittest.cc b/packager/media/formats/mp4/es_descriptor_unittest.cc similarity index 100% rename from media/formats/mp4/es_descriptor_unittest.cc rename to packager/media/formats/mp4/es_descriptor_unittest.cc diff --git a/media/formats/mp4/fourccs.h b/packager/media/formats/mp4/fourccs.h similarity index 100% rename from media/formats/mp4/fourccs.h rename to packager/media/formats/mp4/fourccs.h diff --git a/media/formats/mp4/fragmenter.cc b/packager/media/formats/mp4/fragmenter.cc similarity index 100% rename from media/formats/mp4/fragmenter.cc rename to packager/media/formats/mp4/fragmenter.cc diff --git a/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h similarity index 100% rename from media/formats/mp4/fragmenter.h rename to packager/media/formats/mp4/fragmenter.h diff --git a/media/formats/mp4/key_rotation_fragmenter.cc b/packager/media/formats/mp4/key_rotation_fragmenter.cc similarity index 100% rename from media/formats/mp4/key_rotation_fragmenter.cc rename to packager/media/formats/mp4/key_rotation_fragmenter.cc diff --git a/media/formats/mp4/key_rotation_fragmenter.h b/packager/media/formats/mp4/key_rotation_fragmenter.h similarity index 100% rename from media/formats/mp4/key_rotation_fragmenter.h rename to packager/media/formats/mp4/key_rotation_fragmenter.h diff --git a/media/formats/mp4/mp4.gyp b/packager/media/formats/mp4/mp4.gyp similarity index 100% rename from media/formats/mp4/mp4.gyp rename to packager/media/formats/mp4/mp4.gyp diff --git a/media/formats/mp4/mp4_media_parser.cc b/packager/media/formats/mp4/mp4_media_parser.cc similarity index 100% rename from media/formats/mp4/mp4_media_parser.cc rename to packager/media/formats/mp4/mp4_media_parser.cc diff --git a/media/formats/mp4/mp4_media_parser.h b/packager/media/formats/mp4/mp4_media_parser.h similarity index 100% rename from media/formats/mp4/mp4_media_parser.h rename to packager/media/formats/mp4/mp4_media_parser.h diff --git a/media/formats/mp4/mp4_media_parser_unittest.cc b/packager/media/formats/mp4/mp4_media_parser_unittest.cc similarity index 100% rename from media/formats/mp4/mp4_media_parser_unittest.cc rename to packager/media/formats/mp4/mp4_media_parser_unittest.cc diff --git a/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc similarity index 100% rename from media/formats/mp4/mp4_muxer.cc rename to packager/media/formats/mp4/mp4_muxer.cc diff --git a/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h similarity index 100% rename from media/formats/mp4/mp4_muxer.h rename to packager/media/formats/mp4/mp4_muxer.h diff --git a/media/formats/mp4/multi_segment_segmenter.cc b/packager/media/formats/mp4/multi_segment_segmenter.cc similarity index 100% rename from media/formats/mp4/multi_segment_segmenter.cc rename to packager/media/formats/mp4/multi_segment_segmenter.cc diff --git a/media/formats/mp4/multi_segment_segmenter.h b/packager/media/formats/mp4/multi_segment_segmenter.h similarity index 100% rename from media/formats/mp4/multi_segment_segmenter.h rename to packager/media/formats/mp4/multi_segment_segmenter.h diff --git a/media/formats/mp4/rcheck.h b/packager/media/formats/mp4/rcheck.h similarity index 100% rename from media/formats/mp4/rcheck.h rename to packager/media/formats/mp4/rcheck.h diff --git a/media/formats/mp4/segmenter.cc b/packager/media/formats/mp4/segmenter.cc similarity index 100% rename from media/formats/mp4/segmenter.cc rename to packager/media/formats/mp4/segmenter.cc diff --git a/media/formats/mp4/segmenter.h b/packager/media/formats/mp4/segmenter.h similarity index 100% rename from media/formats/mp4/segmenter.h rename to packager/media/formats/mp4/segmenter.h diff --git a/media/formats/mp4/single_segment_segmenter.cc b/packager/media/formats/mp4/single_segment_segmenter.cc similarity index 100% rename from media/formats/mp4/single_segment_segmenter.cc rename to packager/media/formats/mp4/single_segment_segmenter.cc diff --git a/media/formats/mp4/single_segment_segmenter.h b/packager/media/formats/mp4/single_segment_segmenter.h similarity index 100% rename from media/formats/mp4/single_segment_segmenter.h rename to packager/media/formats/mp4/single_segment_segmenter.h diff --git a/media/formats/mp4/sync_sample_iterator.cc b/packager/media/formats/mp4/sync_sample_iterator.cc similarity index 100% rename from media/formats/mp4/sync_sample_iterator.cc rename to packager/media/formats/mp4/sync_sample_iterator.cc diff --git a/media/formats/mp4/sync_sample_iterator.h b/packager/media/formats/mp4/sync_sample_iterator.h similarity index 100% rename from media/formats/mp4/sync_sample_iterator.h rename to packager/media/formats/mp4/sync_sample_iterator.h diff --git a/media/formats/mp4/sync_sample_iterator_unittest.cc b/packager/media/formats/mp4/sync_sample_iterator_unittest.cc similarity index 100% rename from media/formats/mp4/sync_sample_iterator_unittest.cc rename to packager/media/formats/mp4/sync_sample_iterator_unittest.cc diff --git a/media/formats/mp4/track_run_iterator.cc b/packager/media/formats/mp4/track_run_iterator.cc similarity index 100% rename from media/formats/mp4/track_run_iterator.cc rename to packager/media/formats/mp4/track_run_iterator.cc diff --git a/media/formats/mp4/track_run_iterator.h b/packager/media/formats/mp4/track_run_iterator.h similarity index 100% rename from media/formats/mp4/track_run_iterator.h rename to packager/media/formats/mp4/track_run_iterator.h diff --git a/media/formats/mp4/track_run_iterator_unittest.cc b/packager/media/formats/mp4/track_run_iterator_unittest.cc similarity index 100% rename from media/formats/mp4/track_run_iterator_unittest.cc rename to packager/media/formats/mp4/track_run_iterator_unittest.cc diff --git a/media/formats/mpeg/adts_constants.cc b/packager/media/formats/mpeg/adts_constants.cc similarity index 100% rename from media/formats/mpeg/adts_constants.cc rename to packager/media/formats/mpeg/adts_constants.cc diff --git a/media/formats/mpeg/adts_constants.h b/packager/media/formats/mpeg/adts_constants.h similarity index 100% rename from media/formats/mpeg/adts_constants.h rename to packager/media/formats/mpeg/adts_constants.h diff --git a/media/formats/mpeg/mpeg.gyp b/packager/media/formats/mpeg/mpeg.gyp similarity index 100% rename from media/formats/mpeg/mpeg.gyp rename to packager/media/formats/mpeg/mpeg.gyp diff --git a/media/formats/wvm/wvm.gyp b/packager/media/formats/wvm/wvm.gyp similarity index 100% rename from media/formats/wvm/wvm.gyp rename to packager/media/formats/wvm/wvm.gyp diff --git a/media/formats/wvm/wvm_media_parser.cc b/packager/media/formats/wvm/wvm_media_parser.cc similarity index 100% rename from media/formats/wvm/wvm_media_parser.cc rename to packager/media/formats/wvm/wvm_media_parser.cc diff --git a/media/formats/wvm/wvm_media_parser.h b/packager/media/formats/wvm/wvm_media_parser.h similarity index 100% rename from media/formats/wvm/wvm_media_parser.h rename to packager/media/formats/wvm/wvm_media_parser.h diff --git a/media/formats/wvm/wvm_media_parser_unittest.cc b/packager/media/formats/wvm/wvm_media_parser_unittest.cc similarity index 100% rename from media/formats/wvm/wvm_media_parser_unittest.cc rename to packager/media/formats/wvm/wvm_media_parser_unittest.cc diff --git a/media/test/data/48_aac_infinite_loop.m4a b/packager/media/test/data/48_aac_infinite_loop.m4a similarity index 100% rename from media/test/data/48_aac_infinite_loop.m4a rename to packager/media/test/data/48_aac_infinite_loop.m4a diff --git a/media/test/data/4ch.wav b/packager/media/test/data/4ch.wav similarity index 100% rename from media/test/data/4ch.wav rename to packager/media/test/data/4ch.wav diff --git a/media/test/data/9ch.ogg b/packager/media/test/data/9ch.ogg similarity index 100% rename from media/test/data/9ch.ogg rename to packager/media/test/data/9ch.ogg diff --git a/media/test/data/README b/packager/media/test/data/README similarity index 100% rename from media/test/data/README rename to packager/media/test/data/README diff --git a/media/test/data/avc-byte-stream-frame.h264 b/packager/media/test/data/avc-byte-stream-frame.h264 similarity index 100% rename from media/test/data/avc-byte-stream-frame.h264 rename to packager/media/test/data/avc-byte-stream-frame.h264 diff --git a/media/test/data/avc-unit-stream-frame.h264 b/packager/media/test/data/avc-unit-stream-frame.h264 similarity index 100% rename from media/test/data/avc-unit-stream-frame.h264 rename to packager/media/test/data/avc-unit-stream-frame.h264 diff --git a/media/test/data/bali_640x360_P420.yuv b/packager/media/test/data/bali_640x360_P420.yuv similarity index 100% rename from media/test/data/bali_640x360_P420.yuv rename to packager/media/test/data/bali_640x360_P420.yuv diff --git a/media/test/data/bali_640x360_P422.yuv b/packager/media/test/data/bali_640x360_P422.yuv similarity index 100% rename from media/test/data/bali_640x360_P422.yuv rename to packager/media/test/data/bali_640x360_P422.yuv diff --git a/media/test/data/bali_640x360_RGB24.rgb b/packager/media/test/data/bali_640x360_RGB24.rgb similarity index 100% rename from media/test/data/bali_640x360_RGB24.rgb rename to packager/media/test/data/bali_640x360_RGB24.rgb diff --git a/media/test/data/bali_640x360_YUY2.yuv b/packager/media/test/data/bali_640x360_YUY2.yuv similarity index 100% rename from media/test/data/bali_640x360_YUY2.yuv rename to packager/media/test/data/bali_640x360_YUY2.yuv diff --git a/media/test/data/bear-1280x720-a_frag-cenc.mp4 b/packager/media/test/data/bear-1280x720-a_frag-cenc.mp4 similarity index 100% rename from media/test/data/bear-1280x720-a_frag-cenc.mp4 rename to packager/media/test/data/bear-1280x720-a_frag-cenc.mp4 diff --git a/media/test/data/bear-1280x720-a_frag-cenc_clear-all.mp4 b/packager/media/test/data/bear-1280x720-a_frag-cenc_clear-all.mp4 similarity index 100% rename from media/test/data/bear-1280x720-a_frag-cenc_clear-all.mp4 rename to packager/media/test/data/bear-1280x720-a_frag-cenc_clear-all.mp4 diff --git a/media/test/data/bear-1280x720-av_frag.mp4 b/packager/media/test/data/bear-1280x720-av_frag.mp4 similarity index 100% rename from media/test/data/bear-1280x720-av_frag.mp4 rename to packager/media/test/data/bear-1280x720-av_frag.mp4 diff --git a/media/test/data/bear-1280x720-v_frag-cenc.mp4 b/packager/media/test/data/bear-1280x720-v_frag-cenc.mp4 similarity index 100% rename from media/test/data/bear-1280x720-v_frag-cenc.mp4 rename to packager/media/test/data/bear-1280x720-v_frag-cenc.mp4 diff --git a/media/test/data/bear-1280x720-v_frag-cenc_clear-all.mp4 b/packager/media/test/data/bear-1280x720-v_frag-cenc_clear-all.mp4 similarity index 100% rename from media/test/data/bear-1280x720-v_frag-cenc_clear-all.mp4 rename to packager/media/test/data/bear-1280x720-v_frag-cenc_clear-all.mp4 diff --git a/media/test/data/bear-1280x720-zero-stsz-entry.mp4 b/packager/media/test/data/bear-1280x720-zero-stsz-entry.mp4 similarity index 100% rename from media/test/data/bear-1280x720-zero-stsz-entry.mp4 rename to packager/media/test/data/bear-1280x720-zero-stsz-entry.mp4 diff --git a/media/test/data/bear-1280x720.mp4 b/packager/media/test/data/bear-1280x720.mp4 similarity index 100% rename from media/test/data/bear-1280x720.mp4 rename to packager/media/test/data/bear-1280x720.mp4 diff --git a/media/test/data/bear-1280x720.ts b/packager/media/test/data/bear-1280x720.ts similarity index 100% rename from media/test/data/bear-1280x720.ts rename to packager/media/test/data/bear-1280x720.ts diff --git a/media/test/data/bear-1280x720_ptswraparound.ts b/packager/media/test/data/bear-1280x720_ptswraparound.ts similarity index 100% rename from media/test/data/bear-1280x720_ptswraparound.ts rename to packager/media/test/data/bear-1280x720_ptswraparound.ts diff --git a/media/test/data/bear-320x240-16x9-aspect-av_enc-av.webm b/packager/media/test/data/bear-320x240-16x9-aspect-av_enc-av.webm similarity index 100% rename from media/test/data/bear-320x240-16x9-aspect-av_enc-av.webm rename to packager/media/test/data/bear-320x240-16x9-aspect-av_enc-av.webm diff --git a/media/test/data/bear-320x240-16x9-aspect.webm b/packager/media/test/data/bear-320x240-16x9-aspect.webm similarity index 100% rename from media/test/data/bear-320x240-16x9-aspect.webm rename to packager/media/test/data/bear-320x240-16x9-aspect.webm diff --git a/media/test/data/bear-320x240-altref.webm b/packager/media/test/data/bear-320x240-altref.webm similarity index 100% rename from media/test/data/bear-320x240-altref.webm rename to packager/media/test/data/bear-320x240-altref.webm diff --git a/media/test/data/bear-320x240-audio-only.webm b/packager/media/test/data/bear-320x240-audio-only.webm similarity index 100% rename from media/test/data/bear-320x240-audio-only.webm rename to packager/media/test/data/bear-320x240-audio-only.webm diff --git a/media/test/data/bear-320x240-av_enc-av.webm b/packager/media/test/data/bear-320x240-av_enc-av.webm similarity index 100% rename from media/test/data/bear-320x240-av_enc-av.webm rename to packager/media/test/data/bear-320x240-av_enc-av.webm diff --git a/media/test/data/bear-320x240-av_enc-av_clear-1s.webm b/packager/media/test/data/bear-320x240-av_enc-av_clear-1s.webm similarity index 100% rename from media/test/data/bear-320x240-av_enc-av_clear-1s.webm rename to packager/media/test/data/bear-320x240-av_enc-av_clear-1s.webm diff --git a/media/test/data/bear-320x240-av_enc-av_clear-all.webm b/packager/media/test/data/bear-320x240-av_enc-av_clear-all.webm similarity index 100% rename from media/test/data/bear-320x240-av_enc-av_clear-all.webm rename to packager/media/test/data/bear-320x240-av_enc-av_clear-all.webm diff --git a/media/test/data/bear-320x240-cues-in-front.webm b/packager/media/test/data/bear-320x240-cues-in-front.webm similarity index 100% rename from media/test/data/bear-320x240-cues-in-front.webm rename to packager/media/test/data/bear-320x240-cues-in-front.webm diff --git a/media/test/data/bear-320x240-live.webm b/packager/media/test/data/bear-320x240-live.webm similarity index 100% rename from media/test/data/bear-320x240-live.webm rename to packager/media/test/data/bear-320x240-live.webm diff --git a/media/test/data/bear-320x240-manifest.js b/packager/media/test/data/bear-320x240-manifest.js similarity index 100% rename from media/test/data/bear-320x240-manifest.js rename to packager/media/test/data/bear-320x240-manifest.js diff --git a/media/test/data/bear-320x240-multitrack.webm b/packager/media/test/data/bear-320x240-multitrack.webm similarity index 100% rename from media/test/data/bear-320x240-multitrack.webm rename to packager/media/test/data/bear-320x240-multitrack.webm diff --git a/media/test/data/bear-320x240-video-only.webm b/packager/media/test/data/bear-320x240-video-only.webm similarity index 100% rename from media/test/data/bear-320x240-video-only.webm rename to packager/media/test/data/bear-320x240-video-only.webm diff --git a/media/test/data/bear-320x240.webm b/packager/media/test/data/bear-320x240.webm similarity index 100% rename from media/test/data/bear-320x240.webm rename to packager/media/test/data/bear-320x240.webm diff --git a/media/test/data/bear-640x360-a_frag-cenc.mp4 b/packager/media/test/data/bear-640x360-a_frag-cenc.mp4 similarity index 100% rename from media/test/data/bear-640x360-a_frag-cenc.mp4 rename to packager/media/test/data/bear-640x360-a_frag-cenc.mp4 diff --git a/media/test/data/bear-640x360-av_enc-av.webm b/packager/media/test/data/bear-640x360-av_enc-av.webm similarity index 100% rename from media/test/data/bear-640x360-av_enc-av.webm rename to packager/media/test/data/bear-640x360-av_enc-av.webm diff --git a/media/test/data/bear-640x360-av_frag.mp4 b/packager/media/test/data/bear-640x360-av_frag.mp4 similarity index 100% rename from media/test/data/bear-640x360-av_frag.mp4 rename to packager/media/test/data/bear-640x360-av_frag.mp4 diff --git a/media/test/data/bear-640x360-manifest.js b/packager/media/test/data/bear-640x360-manifest.js similarity index 100% rename from media/test/data/bear-640x360-manifest.js rename to packager/media/test/data/bear-640x360-manifest.js diff --git a/media/test/data/bear-640x360-v_frag-cenc.mp4 b/packager/media/test/data/bear-640x360-v_frag-cenc.mp4 similarity index 100% rename from media/test/data/bear-640x360-v_frag-cenc.mp4 rename to packager/media/test/data/bear-640x360-v_frag-cenc.mp4 diff --git a/media/test/data/bear-640x360.webm b/packager/media/test/data/bear-640x360.webm similarity index 100% rename from media/test/data/bear-640x360.webm rename to packager/media/test/data/bear-640x360.webm diff --git a/media/test/data/bear-mpeg2-aac-only_frag.mp4 b/packager/media/test/data/bear-mpeg2-aac-only_frag.mp4 similarity index 100% rename from media/test/data/bear-mpeg2-aac-only_frag.mp4 rename to packager/media/test/data/bear-mpeg2-aac-only_frag.mp4 diff --git a/media/test/data/bear-opus.webm b/packager/media/test/data/bear-opus.webm similarity index 100% rename from media/test/data/bear-opus.webm rename to packager/media/test/data/bear-opus.webm diff --git a/media/test/data/bear-vp8-webvtt.webm b/packager/media/test/data/bear-vp8-webvtt.webm similarity index 100% rename from media/test/data/bear-vp8-webvtt.webm rename to packager/media/test/data/bear-vp8-webvtt.webm diff --git a/media/test/data/bear-vp8a.webm b/packager/media/test/data/bear-vp8a.webm similarity index 100% rename from media/test/data/bear-vp8a.webm rename to packager/media/test/data/bear-vp8a.webm diff --git a/media/test/data/bear-vp9-opus.webm b/packager/media/test/data/bear-vp9-opus.webm similarity index 100% rename from media/test/data/bear-vp9-opus.webm rename to packager/media/test/data/bear-vp9-opus.webm diff --git a/media/test/data/bear-vp9.webm b/packager/media/test/data/bear-vp9.webm similarity index 100% rename from media/test/data/bear-vp9.webm rename to packager/media/test/data/bear-vp9.webm diff --git a/media/test/data/bear.ac3 b/packager/media/test/data/bear.ac3 similarity index 100% rename from media/test/data/bear.ac3 rename to packager/media/test/data/bear.ac3 diff --git a/media/test/data/bear.adts b/packager/media/test/data/bear.adts similarity index 100% rename from media/test/data/bear.adts rename to packager/media/test/data/bear.adts diff --git a/media/test/data/bear.aiff b/packager/media/test/data/bear.aiff similarity index 100% rename from media/test/data/bear.aiff rename to packager/media/test/data/bear.aiff diff --git a/media/test/data/bear.asf b/packager/media/test/data/bear.asf similarity index 100% rename from media/test/data/bear.asf rename to packager/media/test/data/bear.asf diff --git a/media/test/data/bear.avi b/packager/media/test/data/bear.avi similarity index 100% rename from media/test/data/bear.avi rename to packager/media/test/data/bear.avi diff --git a/media/test/data/bear.eac3 b/packager/media/test/data/bear.eac3 similarity index 100% rename from media/test/data/bear.eac3 rename to packager/media/test/data/bear.eac3 diff --git a/media/test/data/bear.flac b/packager/media/test/data/bear.flac similarity index 100% rename from media/test/data/bear.flac rename to packager/media/test/data/bear.flac diff --git a/media/test/data/bear.flv b/packager/media/test/data/bear.flv similarity index 100% rename from media/test/data/bear.flv rename to packager/media/test/data/bear.flv diff --git a/media/test/data/bear.h261 b/packager/media/test/data/bear.h261 similarity index 100% rename from media/test/data/bear.h261 rename to packager/media/test/data/bear.h261 diff --git a/media/test/data/bear.h263 b/packager/media/test/data/bear.h263 similarity index 100% rename from media/test/data/bear.h263 rename to packager/media/test/data/bear.h263 diff --git a/media/test/data/bear.h264 b/packager/media/test/data/bear.h264 similarity index 100% rename from media/test/data/bear.h264 rename to packager/media/test/data/bear.h264 diff --git a/media/test/data/bear.m2ts b/packager/media/test/data/bear.m2ts similarity index 100% rename from media/test/data/bear.m2ts rename to packager/media/test/data/bear.m2ts diff --git a/media/test/data/bear.mjpeg b/packager/media/test/data/bear.mjpeg similarity index 100% rename from media/test/data/bear.mjpeg rename to packager/media/test/data/bear.mjpeg diff --git a/media/test/data/bear.mpeg b/packager/media/test/data/bear.mpeg similarity index 100% rename from media/test/data/bear.mpeg rename to packager/media/test/data/bear.mpeg diff --git a/media/test/data/bear.ogv b/packager/media/test/data/bear.ogv similarity index 100% rename from media/test/data/bear.ogv rename to packager/media/test/data/bear.ogv diff --git a/media/test/data/bear.rm b/packager/media/test/data/bear.rm similarity index 100% rename from media/test/data/bear.rm rename to packager/media/test/data/bear.rm diff --git a/media/test/data/bear.swf b/packager/media/test/data/bear.swf similarity index 100% rename from media/test/data/bear.swf rename to packager/media/test/data/bear.swf diff --git a/media/test/data/bear_no_iframe_start.h264 b/packager/media/test/data/bear_no_iframe_start.h264 similarity index 100% rename from media/test/data/bear_no_iframe_start.h264 rename to packager/media/test/data/bear_no_iframe_start.h264 diff --git a/media/test/data/fake_prng_data.bin b/packager/media/test/data/fake_prng_data.bin similarity index 100% rename from media/test/data/fake_prng_data.bin rename to packager/media/test/data/fake_prng_data.bin diff --git a/media/test/data/hb2_4stream_clear.wvm b/packager/media/test/data/hb2_4stream_clear.wvm similarity index 100% rename from media/test/data/hb2_4stream_clear.wvm rename to packager/media/test/data/hb2_4stream_clear.wvm diff --git a/media/test/data/hb2_4stream_encrypted.wvm b/packager/media/test/data/hb2_4stream_encrypted.wvm similarity index 100% rename from media/test/data/hb2_4stream_encrypted.wvm rename to packager/media/test/data/hb2_4stream_encrypted.wvm diff --git a/media/test/data/id3_png_test.mp3 b/packager/media/test/data/id3_png_test.mp3 similarity index 100% rename from media/test/data/id3_png_test.mp3 rename to packager/media/test/data/id3_png_test.mp3 diff --git a/media/test/data/id3_test.mp3 b/packager/media/test/data/id3_test.mp3 similarity index 100% rename from media/test/data/id3_test.mp3 rename to packager/media/test/data/id3_test.mp3 diff --git a/media/test/data/midstream_config_change.mp3 b/packager/media/test/data/midstream_config_change.mp3 similarity index 100% rename from media/test/data/midstream_config_change.mp3 rename to packager/media/test/data/midstream_config_change.mp3 diff --git a/media/test/data/no_audio_video.webm b/packager/media/test/data/no_audio_video.webm similarity index 100% rename from media/test/data/no_audio_video.webm rename to packager/media/test/data/no_audio_video.webm diff --git a/media/test/data/no_streams.webm b/packager/media/test/data/no_streams.webm similarity index 100% rename from media/test/data/no_streams.webm rename to packager/media/test/data/no_streams.webm diff --git a/media/test/data/nonzero-start-time.webm b/packager/media/test/data/nonzero-start-time.webm similarity index 100% rename from media/test/data/nonzero-start-time.webm rename to packager/media/test/data/nonzero-start-time.webm diff --git a/media/test/data/rapid_video_change_test.html b/packager/media/test/data/rapid_video_change_test.html similarity index 100% rename from media/test/data/rapid_video_change_test.html rename to packager/media/test/data/rapid_video_change_test.html diff --git a/media/test/data/sfx.m4a b/packager/media/test/data/sfx.m4a similarity index 100% rename from media/test/data/sfx.m4a rename to packager/media/test/data/sfx.m4a diff --git a/media/test/data/sfx.mp3 b/packager/media/test/data/sfx.mp3 similarity index 100% rename from media/test/data/sfx.mp3 rename to packager/media/test/data/sfx.mp3 diff --git a/media/test/data/sfx.ogg b/packager/media/test/data/sfx.ogg similarity index 100% rename from media/test/data/sfx.ogg rename to packager/media/test/data/sfx.ogg diff --git a/media/test/data/sfx_f32le.wav b/packager/media/test/data/sfx_f32le.wav similarity index 100% rename from media/test/data/sfx_f32le.wav rename to packager/media/test/data/sfx_f32le.wav diff --git a/media/test/data/sfx_s16le.wav b/packager/media/test/data/sfx_s16le.wav similarity index 100% rename from media/test/data/sfx_s16le.wav rename to packager/media/test/data/sfx_s16le.wav diff --git a/media/test/data/sfx_s24le.wav b/packager/media/test/data/sfx_s24le.wav similarity index 100% rename from media/test/data/sfx_s24le.wav rename to packager/media/test/data/sfx_s24le.wav diff --git a/media/test/data/sfx_u8.wav b/packager/media/test/data/sfx_u8.wav similarity index 100% rename from media/test/data/sfx_u8.wav rename to packager/media/test/data/sfx_u8.wav diff --git a/media/test/data/speech_16b_mono_44kHz.raw b/packager/media/test/data/speech_16b_mono_44kHz.raw similarity index 100% rename from media/test/data/speech_16b_mono_44kHz.raw rename to packager/media/test/data/speech_16b_mono_44kHz.raw diff --git a/media/test/data/speech_16b_mono_48kHz.raw b/packager/media/test/data/speech_16b_mono_48kHz.raw similarity index 100% rename from media/test/data/speech_16b_mono_48kHz.raw rename to packager/media/test/data/speech_16b_mono_48kHz.raw diff --git a/media/test/data/speech_16b_stereo_44kHz.raw b/packager/media/test/data/speech_16b_stereo_44kHz.raw similarity index 100% rename from media/test/data/speech_16b_stereo_44kHz.raw rename to packager/media/test/data/speech_16b_stereo_44kHz.raw diff --git a/media/test/data/speech_16b_stereo_48kHz.raw b/packager/media/test/data/speech_16b_stereo_48kHz.raw similarity index 100% rename from media/test/data/speech_16b_stereo_48kHz.raw rename to packager/media/test/data/speech_16b_stereo_48kHz.raw diff --git a/media/test/data/speex_audio_vorbis_video.ogv b/packager/media/test/data/speex_audio_vorbis_video.ogv similarity index 100% rename from media/test/data/speex_audio_vorbis_video.ogv rename to packager/media/test/data/speex_audio_vorbis_video.ogv diff --git a/media/test/data/sweep02_16b_mono_16KHz.raw b/packager/media/test/data/sweep02_16b_mono_16KHz.raw similarity index 100% rename from media/test/data/sweep02_16b_mono_16KHz.raw rename to packager/media/test/data/sweep02_16b_mono_16KHz.raw diff --git a/media/test/data/ten_byte_file b/packager/media/test/data/ten_byte_file similarity index 100% rename from media/test/data/ten_byte_file rename to packager/media/test/data/ten_byte_file diff --git a/media/test/data/test-25fps.h264 b/packager/media/test/data/test-25fps.h264 similarity index 100% rename from media/test/data/test-25fps.h264 rename to packager/media/test/data/test-25fps.h264 diff --git a/media/test/data/vorbis-extradata b/packager/media/test/data/vorbis-extradata similarity index 100% rename from media/test/data/vorbis-extradata rename to packager/media/test/data/vorbis-extradata diff --git a/media/test/data/vorbis-packet-0 b/packager/media/test/data/vorbis-packet-0 similarity index 100% rename from media/test/data/vorbis-packet-0 rename to packager/media/test/data/vorbis-packet-0 diff --git a/media/test/data/vorbis-packet-1 b/packager/media/test/data/vorbis-packet-1 similarity index 100% rename from media/test/data/vorbis-packet-1 rename to packager/media/test/data/vorbis-packet-1 diff --git a/media/test/data/vorbis-packet-2 b/packager/media/test/data/vorbis-packet-2 similarity index 100% rename from media/test/data/vorbis-packet-2 rename to packager/media/test/data/vorbis-packet-2 diff --git a/media/test/data/vorbis-packet-3 b/packager/media/test/data/vorbis-packet-3 similarity index 100% rename from media/test/data/vorbis-packet-3 rename to packager/media/test/data/vorbis-packet-3 diff --git a/media/test/data/vorbis_audio_wmv_video.mkv b/packager/media/test/data/vorbis_audio_wmv_video.mkv similarity index 100% rename from media/test/data/vorbis_audio_wmv_video.mkv rename to packager/media/test/data/vorbis_audio_wmv_video.mkv diff --git a/media/test/data/vp8-I-frame-160x240 b/packager/media/test/data/vp8-I-frame-160x240 similarity index 100% rename from media/test/data/vp8-I-frame-160x240 rename to packager/media/test/data/vp8-I-frame-160x240 diff --git a/media/test/data/vp8-I-frame-320x120 b/packager/media/test/data/vp8-I-frame-320x120 similarity index 100% rename from media/test/data/vp8-I-frame-320x120 rename to packager/media/test/data/vp8-I-frame-320x120 diff --git a/media/test/data/vp8-I-frame-320x240 b/packager/media/test/data/vp8-I-frame-320x240 similarity index 100% rename from media/test/data/vp8-I-frame-320x240 rename to packager/media/test/data/vp8-I-frame-320x240 diff --git a/media/test/data/vp8-I-frame-320x480 b/packager/media/test/data/vp8-I-frame-320x480 similarity index 100% rename from media/test/data/vp8-I-frame-320x480 rename to packager/media/test/data/vp8-I-frame-320x480 diff --git a/media/test/data/vp8-I-frame-640x240 b/packager/media/test/data/vp8-I-frame-640x240 similarity index 100% rename from media/test/data/vp8-I-frame-640x240 rename to packager/media/test/data/vp8-I-frame-640x240 diff --git a/media/test/data/vp8-corrupt-I-frame b/packager/media/test/data/vp8-corrupt-I-frame similarity index 100% rename from media/test/data/vp8-corrupt-I-frame rename to packager/media/test/data/vp8-corrupt-I-frame diff --git a/media/test/data/webm_content_encodings b/packager/media/test/data/webm_content_encodings similarity index 100% rename from media/test/data/webm_content_encodings rename to packager/media/test/data/webm_content_encodings diff --git a/media/test/data/webm_ebml_element b/packager/media/test/data/webm_ebml_element similarity index 100% rename from media/test/data/webm_ebml_element rename to packager/media/test/data/webm_ebml_element diff --git a/media/test/data/webm_info_element b/packager/media/test/data/webm_info_element similarity index 100% rename from media/test/data/webm_info_element rename to packager/media/test/data/webm_info_element diff --git a/media/test/data/webm_vorbis_track_entry b/packager/media/test/data/webm_vorbis_track_entry similarity index 100% rename from media/test/data/webm_vorbis_track_entry rename to packager/media/test/data/webm_vorbis_track_entry diff --git a/media/test/data/webm_vp8_track_entry b/packager/media/test/data/webm_vp8_track_entry similarity index 100% rename from media/test/data/webm_vp8_track_entry rename to packager/media/test/data/webm_vp8_track_entry diff --git a/media/test/media_test.gyp b/packager/media/test/media_test.gyp similarity index 100% rename from media/test/media_test.gyp rename to packager/media/test/media_test.gyp diff --git a/media/test/packager_test.cc b/packager/media/test/packager_test.cc similarity index 100% rename from media/test/packager_test.cc rename to packager/media/test/packager_test.cc diff --git a/media/test/run_tests_with_atexit_manager.cc b/packager/media/test/run_tests_with_atexit_manager.cc similarity index 100% rename from media/test/run_tests_with_atexit_manager.cc rename to packager/media/test/run_tests_with_atexit_manager.cc diff --git a/media/test/test_data_util.cc b/packager/media/test/test_data_util.cc similarity index 88% rename from media/test/test_data_util.cc rename to packager/media/test/test_data_util.cc index b23863f9f6..eaa1b0a4e1 100644 --- a/media/test/test_data_util.cc +++ b/packager/media/test/test_data_util.cc @@ -15,7 +15,8 @@ base::FilePath GetTestDataFilePath(const std::string& name) { base::FilePath file_path; CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path)); - file_path = file_path.Append(FILE_PATH_LITERAL("media")) + file_path = file_path.Append(FILE_PATH_LITERAL("packager")) + .Append(FILE_PATH_LITERAL("media")) .Append(FILE_PATH_LITERAL("test")) .Append(FILE_PATH_LITERAL("data")) .AppendASCII(name); diff --git a/media/test/test_data_util.h b/packager/media/test/test_data_util.h similarity index 100% rename from media/test/test_data_util.h rename to packager/media/test/test_data_util.h diff --git a/mpd/base/bandwidth_estimator.cc b/packager/mpd/base/bandwidth_estimator.cc similarity index 100% rename from mpd/base/bandwidth_estimator.cc rename to packager/mpd/base/bandwidth_estimator.cc diff --git a/mpd/base/bandwidth_estimator.h b/packager/mpd/base/bandwidth_estimator.h similarity index 100% rename from mpd/base/bandwidth_estimator.h rename to packager/mpd/base/bandwidth_estimator.h diff --git a/mpd/base/bandwidth_estimator_test.cc b/packager/mpd/base/bandwidth_estimator_test.cc similarity index 100% rename from mpd/base/bandwidth_estimator_test.cc rename to packager/mpd/base/bandwidth_estimator_test.cc diff --git a/mpd/base/content_protection_element.cc b/packager/mpd/base/content_protection_element.cc similarity index 100% rename from mpd/base/content_protection_element.cc rename to packager/mpd/base/content_protection_element.cc diff --git a/mpd/base/content_protection_element.h b/packager/mpd/base/content_protection_element.h similarity index 100% rename from mpd/base/content_protection_element.h rename to packager/mpd/base/content_protection_element.h diff --git a/mpd/base/media_info.proto b/packager/mpd/base/media_info.proto similarity index 100% rename from mpd/base/media_info.proto rename to packager/mpd/base/media_info.proto diff --git a/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc similarity index 100% rename from mpd/base/mpd_builder.cc rename to packager/mpd/base/mpd_builder.cc diff --git a/mpd/base/mpd_builder.h b/packager/mpd/base/mpd_builder.h similarity index 100% rename from mpd/base/mpd_builder.h rename to packager/mpd/base/mpd_builder.h diff --git a/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc similarity index 100% rename from mpd/base/mpd_builder_unittest.cc rename to packager/mpd/base/mpd_builder_unittest.cc diff --git a/mpd/base/mpd_notifier.h b/packager/mpd/base/mpd_notifier.h similarity index 100% rename from mpd/base/mpd_notifier.h rename to packager/mpd/base/mpd_notifier.h diff --git a/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc similarity index 100% rename from mpd/base/mpd_utils.cc rename to packager/mpd/base/mpd_utils.cc diff --git a/mpd/base/mpd_utils.h b/packager/mpd/base/mpd_utils.h similarity index 100% rename from mpd/base/mpd_utils.h rename to packager/mpd/base/mpd_utils.h diff --git a/mpd/base/segment_info.h b/packager/mpd/base/segment_info.h similarity index 100% rename from mpd/base/segment_info.h rename to packager/mpd/base/segment_info.h diff --git a/mpd/base/simple_mpd_notifier.cc b/packager/mpd/base/simple_mpd_notifier.cc similarity index 100% rename from mpd/base/simple_mpd_notifier.cc rename to packager/mpd/base/simple_mpd_notifier.cc diff --git a/mpd/base/simple_mpd_notifier.h b/packager/mpd/base/simple_mpd_notifier.h similarity index 100% rename from mpd/base/simple_mpd_notifier.h rename to packager/mpd/base/simple_mpd_notifier.h diff --git a/mpd/base/simple_vod_mpd_notifier.cc b/packager/mpd/base/simple_vod_mpd_notifier.cc similarity index 100% rename from mpd/base/simple_vod_mpd_notifier.cc rename to packager/mpd/base/simple_vod_mpd_notifier.cc diff --git a/mpd/base/simple_vod_mpd_notifier.h b/packager/mpd/base/simple_vod_mpd_notifier.h similarity index 100% rename from mpd/base/simple_vod_mpd_notifier.h rename to packager/mpd/base/simple_vod_mpd_notifier.h diff --git a/mpd/base/xml/scoped_xml_ptr.h b/packager/mpd/base/xml/scoped_xml_ptr.h similarity index 100% rename from mpd/base/xml/scoped_xml_ptr.h rename to packager/mpd/base/xml/scoped_xml_ptr.h diff --git a/mpd/base/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc similarity index 100% rename from mpd/base/xml/xml_node.cc rename to packager/mpd/base/xml/xml_node.cc diff --git a/mpd/base/xml/xml_node.h b/packager/mpd/base/xml/xml_node.h similarity index 100% rename from mpd/base/xml/xml_node.h rename to packager/mpd/base/xml/xml_node.h diff --git a/mpd/base/xml/xml_node_unittest.cc b/packager/mpd/base/xml/xml_node_unittest.cc similarity index 100% rename from mpd/base/xml/xml_node_unittest.cc rename to packager/mpd/base/xml/xml_node_unittest.cc diff --git a/mpd/mpd.gyp b/packager/mpd/mpd.gyp similarity index 100% rename from mpd/mpd.gyp rename to packager/mpd/mpd.gyp diff --git a/mpd/test/data/audio_media_info1.txt b/packager/mpd/test/data/audio_media_info1.txt similarity index 100% rename from mpd/test/data/audio_media_info1.txt rename to packager/mpd/test/data/audio_media_info1.txt diff --git a/mpd/test/data/audio_media_info1_expected_mpd_output.txt b/packager/mpd/test/data/audio_media_info1_expected_mpd_output.txt similarity index 100% rename from mpd/test/data/audio_media_info1_expected_mpd_output.txt rename to packager/mpd/test/data/audio_media_info1_expected_mpd_output.txt diff --git a/mpd/test/data/audio_media_info1_video_media_info1_expected_mpd_output.txt b/packager/mpd/test/data/audio_media_info1_video_media_info1_expected_mpd_output.txt similarity index 100% rename from mpd/test/data/audio_media_info1_video_media_info1_expected_mpd_output.txt rename to packager/mpd/test/data/audio_media_info1_video_media_info1_expected_mpd_output.txt diff --git a/mpd/test/data/dynamic_normal_mpd.txt b/packager/mpd/test/data/dynamic_normal_mpd.txt similarity index 100% rename from mpd/test/data/dynamic_normal_mpd.txt rename to packager/mpd/test/data/dynamic_normal_mpd.txt diff --git a/mpd/test/data/encrypted_audio_media_info.txt b/packager/mpd/test/data/encrypted_audio_media_info.txt similarity index 100% rename from mpd/test/data/encrypted_audio_media_info.txt rename to packager/mpd/test/data/encrypted_audio_media_info.txt diff --git a/mpd/test/data/encrypted_audio_media_info_expected_output.txt b/packager/mpd/test/data/encrypted_audio_media_info_expected_output.txt similarity index 100% rename from mpd/test/data/encrypted_audio_media_info_expected_output.txt rename to packager/mpd/test/data/encrypted_audio_media_info_expected_output.txt diff --git a/mpd/test/data/video_media_info1.txt b/packager/mpd/test/data/video_media_info1.txt similarity index 100% rename from mpd/test/data/video_media_info1.txt rename to packager/mpd/test/data/video_media_info1.txt diff --git a/mpd/test/data/video_media_info1_expected_mpd_output.txt b/packager/mpd/test/data/video_media_info1_expected_mpd_output.txt similarity index 100% rename from mpd/test/data/video_media_info1_expected_mpd_output.txt rename to packager/mpd/test/data/video_media_info1_expected_mpd_output.txt diff --git a/mpd/test/data/video_media_info1and2_expected_mpd_output.txt b/packager/mpd/test/data/video_media_info1and2_expected_mpd_output.txt similarity index 100% rename from mpd/test/data/video_media_info1and2_expected_mpd_output.txt rename to packager/mpd/test/data/video_media_info1and2_expected_mpd_output.txt diff --git a/mpd/test/data/video_media_info2.txt b/packager/mpd/test/data/video_media_info2.txt similarity index 100% rename from mpd/test/data/video_media_info2.txt rename to packager/mpd/test/data/video_media_info2.txt diff --git a/mpd/test/mpd_builder_test_helper.cc b/packager/mpd/test/mpd_builder_test_helper.cc similarity index 94% rename from mpd/test/mpd_builder_test_helper.cc rename to packager/mpd/test/mpd_builder_test_helper.cc index 34abd38343..80b7bf3f4b 100644 --- a/mpd/test/mpd_builder_test_helper.cc +++ b/packager/mpd/test/mpd_builder_test_helper.cc @@ -22,7 +22,8 @@ base::FilePath GetTestDataFilePath(const std::string& file_name) { base::FilePath file_path; CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path)); - file_path = file_path.Append(FILE_PATH_LITERAL("mpd")) + file_path = file_path.Append(FILE_PATH_LITERAL("packager")) + .Append(FILE_PATH_LITERAL("mpd")) .Append(FILE_PATH_LITERAL("test")) .Append(FILE_PATH_LITERAL("data")) .AppendASCII(file_name); @@ -33,7 +34,8 @@ base::FilePath GetSchemaPath() { base::FilePath file_path; CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path)); - file_path = file_path.Append(FILE_PATH_LITERAL("mpd")) + file_path = file_path.Append(FILE_PATH_LITERAL("packager")) + .Append(FILE_PATH_LITERAL("mpd")) .Append(FILE_PATH_LITERAL("test")) .Append(FILE_PATH_LITERAL("schema")) .Append(FILE_PATH_LITERAL("DASH-MPD.xsd")); diff --git a/mpd/test/mpd_builder_test_helper.h b/packager/mpd/test/mpd_builder_test_helper.h similarity index 100% rename from mpd/test/mpd_builder_test_helper.h rename to packager/mpd/test/mpd_builder_test_helper.h diff --git a/mpd/test/schema/DASH-MPD.xsd b/packager/mpd/test/schema/DASH-MPD.xsd similarity index 100% rename from mpd/test/schema/DASH-MPD.xsd rename to packager/mpd/test/schema/DASH-MPD.xsd diff --git a/mpd/test/schema/xlink.xsd b/packager/mpd/test/schema/xlink.xsd similarity index 100% rename from mpd/test/schema/xlink.xsd rename to packager/mpd/test/schema/xlink.xsd diff --git a/mpd/test/schema/xml.xsd b/packager/mpd/test/schema/xml.xsd similarity index 100% rename from mpd/test/schema/xml.xsd rename to packager/mpd/test/schema/xml.xsd diff --git a/mpd/test/xml_compare.cc b/packager/mpd/test/xml_compare.cc similarity index 100% rename from mpd/test/xml_compare.cc rename to packager/mpd/test/xml_compare.cc diff --git a/mpd/test/xml_compare.h b/packager/mpd/test/xml_compare.h similarity index 100% rename from mpd/test/xml_compare.h rename to packager/mpd/test/xml_compare.h diff --git a/mpd/util/mpd_writer.cc b/packager/mpd/util/mpd_writer.cc similarity index 100% rename from mpd/util/mpd_writer.cc rename to packager/mpd/util/mpd_writer.cc diff --git a/mpd/util/mpd_writer.h b/packager/mpd/util/mpd_writer.h similarity index 100% rename from mpd/util/mpd_writer.h rename to packager/mpd/util/mpd_writer.h diff --git a/mpd/util/mpd_writer_unittest.cc b/packager/mpd/util/mpd_writer_unittest.cc similarity index 100% rename from mpd/util/mpd_writer_unittest.cc rename to packager/mpd/util/mpd_writer_unittest.cc diff --git a/packager.gyp b/packager/packager.gyp similarity index 100% rename from packager.gyp rename to packager/packager.gyp diff --git a/third_party/curl/README.packager b/packager/third_party/curl/README.packager similarity index 100% rename from third_party/curl/README.packager rename to packager/third_party/curl/README.packager diff --git a/third_party/curl/config/curl/curlbuild.h b/packager/third_party/curl/config/curl/curlbuild.h similarity index 100% rename from third_party/curl/config/curl/curlbuild.h rename to packager/third_party/curl/config/curl/curlbuild.h diff --git a/third_party/curl/config/dummy_tool_hugehelp.c b/packager/third_party/curl/config/dummy_tool_hugehelp.c similarity index 100% rename from third_party/curl/config/dummy_tool_hugehelp.c rename to packager/third_party/curl/config/dummy_tool_hugehelp.c diff --git a/third_party/curl/config/linux/curl_config.h b/packager/third_party/curl/config/linux/curl_config.h similarity index 100% rename from third_party/curl/config/linux/curl_config.h rename to packager/third_party/curl/config/linux/curl_config.h diff --git a/third_party/curl/curl.gyp b/packager/third_party/curl/curl.gyp similarity index 100% rename from third_party/curl/curl.gyp rename to packager/third_party/curl/curl.gyp diff --git a/tools/doxygen/packager.config b/packager/tools/doxygen/packager.config similarity index 100% rename from tools/doxygen/packager.config rename to packager/tools/doxygen/packager.config