Moved mp4 code to new "formats" directory to match Chromium source tree.

(second attempt due to conflicts).

Change-Id: I2143921bcacdbaa6cfcaf59602713294b4b1f6ee

app/packager_main.cc

@@ -24,7 +24,7 @@
 #include "media/event/vod_media_info_dump_muxer_listener.h"
 #include "media/file/file.h"
 #include "media/file/file_closer.h"
-#include "media/mp4/mp4_muxer.h"
+#include "media/formats/mp4/mp4_muxer.h"
 
 DEFINE_bool(dump_stream_info, false, "Dump demuxed stream info.");
 

media/base/demuxer.cc

@@ -15,7 +15,7 @@
 #include "media/base/media_stream.h"
 #include "media/base/stream_info.h"
 #include "media/file/file.h"
-#include "media/mp4/mp4_media_parser.h"
+#include "media/formats/mp4/mp4_media_parser.h"
 
 namespace {
 const size_t kBufSize = 0x40000;  // 256KB.

media/formats/mp4/aac_audio_specific_config.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/aac_audio_specific_config.h"
+#include "media/formats/mp4/aac_audio_specific_config.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 

media/formats/mp4/aac_audio_specific_config.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_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#ifndef MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
-#define MEDIA_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#define MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
 
 #include <vector>
 
@@ -91,4 +91,4 @@ class AACAudioSpecificConfig {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#endif  // MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_

media/formats/mp4/aac_audio_specific_config_unittest.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/mp4/aac_audio_specific_config.h"
+#include "media/formats/mp4/aac_audio_specific_config.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 

media/formats/mp4/box.cc

@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/box.h"
+#include "media/formats/mp4/box.h"
 
 #include "base/logging.h"
-#include "media/mp4/box_buffer.h"
+#include "media/formats/mp4/box_buffer.h"
 
 namespace media {
 namespace mp4 {

media/formats/mp4/box.h

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_BOX_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_H_
-#define MEDIA_MP4_BOX_H_
+#define MEDIA_FORMATS_MP4_BOX_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/fourccs.h"
 
 namespace media {
 
@@ -68,4 +68,4 @@ struct FullBox : Box {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_H_

media/formats/mp4/box_buffer.h

@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_BOX_BUFFER_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_BUFFER_H_
-#define MEDIA_MP4_BOX_BUFFER_H_
+#define MEDIA_FORMATS_MP4_BOX_BUFFER_H_
 
 #include "base/compiler_specific.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/box.h"
+#include "media/formats/mp4/box.h"
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box_reader.h"
 
 namespace media {
 namespace mp4 {
@@ -186,4 +186,4 @@ class BoxBuffer {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_BUFFER_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_BUFFER_H_

media/formats/mp4/box_definitions.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp4/box_buffer.h"
+#include "media/formats/mp4/box_buffer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 const uint32 kFourCCSize = 4;

media/formats/mp4/box_definitions.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_BOX_DEFINITIONS_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
-#define MEDIA_MP4_BOX_DEFINITIONS_H_
+#define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
 
 #include <string>
 #include <vector>
 
-#include "media/mp4/aac_audio_specific_config.h"
+#include "media/formats/mp4/aac_audio_specific_config.h"
-#include "media/mp4/box.h"
+#include "media/formats/mp4/box.h"
-#include "media/mp4/es_descriptor.h"
+#include "media/formats/mp4/es_descriptor.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/fourccs.h"
 
 namespace media {
 
@@ -595,4 +595,4 @@ struct MediaData {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_DEFINITIONS_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_

media/formats/mp4/box_definitions_comparison.h

@@ -6,10 +6,10 @@
 //
 // Overloads operator== for mp4 boxes, mainly used for testing.
 
-#ifndef MEDIA_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
-#define MEDIA_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -362,4 +362,4 @@ inline bool operator==(const SegmentIndex& lhs, const SegmentIndex& rhs) {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_

media/formats/mp4/box_definitions_unittest.cc

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/box_definitions_comparison.h"
+#include "media/formats/mp4/box_definitions_comparison.h"
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box_reader.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

media/formats/mp4/box_reader.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box_reader.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box.h"
+#include "media/formats/mp4/box.h"
 
 namespace media {
 namespace mp4 {

media/formats/mp4/box_reader.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_MP4_BOX_READER_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_READER_H_
-#define MEDIA_MP4_BOX_READER_H_
+#define MEDIA_FORMATS_MP4_BOX_READER_H_
 
 #include <map>
 #include <vector>
@@ -11,8 +11,8 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "media/base/buffer_reader.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/fourccs.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
@@ -181,4 +181,4 @@ bool BoxReader::ReadAllChildren(std::vector<T>* children) {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_READER_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_READER_H_

media/formats/mp4/box_reader_unittest.cc

@@ -7,8 +7,8 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_buffer.h"
+#include "media/formats/mp4/box_buffer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {

media/formats/mp4/cenc.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/cenc.h"
+#include "media/formats/mp4/cenc.h"
 
 #include <cstring>
 
 #include "media/base/buffer_reader.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 // According to ISO/IEC FDIS 23001-7: CENC spec, IV should be either

media/formats/mp4/cenc.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_MP4_CENC_H_
+#ifndef MEDIA_FORMATS_MP4_CENC_H_
-#define MEDIA_MP4_CENC_H_
+#define MEDIA_FORMATS_MP4_CENC_H_
 
 #include <vector>
 
@@ -46,4 +46,4 @@ class FrameCENCInfo {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_CENC_H_
+#endif  // MEDIA_FORMATS_MP4_CENC_H_

media/formats/mp4/chunk_info_iterator.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/chunk_info_iterator.h"
+#include "media/formats/mp4/chunk_info_iterator.h"
 
 #include <algorithm>
 #include <limits>

media/formats/mp4/chunk_info_iterator.h

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_CHUNK_INFO_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
-#define MEDIA_MP4_CHUNK_INFO_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -67,4 +67,4 @@ class ChunkInfoIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_CHUNK_INFO_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_

media/formats/mp4/chunk_info_iterator_unittest.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/chunk_info_iterator.h"
+#include "media/formats/mp4/chunk_info_iterator.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"

media/formats/mp4/composition_offset_iterator.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/composition_offset_iterator.h"
+#include "media/formats/mp4/composition_offset_iterator.h"
 
 #include "base/logging.h"
 

media/formats/mp4/composition_offset_iterator.h

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
-#define MEDIA_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -52,4 +52,4 @@ class CompositionOffsetIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_

media/formats/mp4/composition_offset_iterator_unittest.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/composition_offset_iterator.h"
+#include "media/formats/mp4/composition_offset_iterator.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"

media/formats/mp4/decoding_time_iterator.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/decoding_time_iterator.h"
+#include "media/formats/mp4/decoding_time_iterator.h"
 
 #include <algorithm>
 

media/formats/mp4/decoding_time_iterator.h

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_DECODING_TIME_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
-#define MEDIA_MP4_DECODING_TIME_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -52,4 +52,4 @@ class DecodingTimeIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_DECODING_TIME_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_

media/formats/mp4/decoding_time_iterator_unittest.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/decoding_time_iterator.h"
+#include "media/formats/mp4/decoding_time_iterator.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"

media/formats/mp4/es_descriptor.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/es_descriptor.h"
+#include "media/formats/mp4/es_descriptor.h"
 
 #include "media/base/bit_reader.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 

media/formats/mp4/es_descriptor.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_MP4_ES_DESCRIPTOR_H_
+#ifndef MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_
-#define MEDIA_MP4_ES_DESCRIPTOR_H_
+#define MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_
 
 #include <vector>
 
@@ -76,4 +76,4 @@ class ESDescriptor {
 
 }  // namespace media
 
-#endif  // MEDIA_MP4_ES_DESCRIPTOR_H_
+#endif  // MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_

media/formats/mp4/es_descriptor_unittest.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/mp4/es_descriptor.h"
+#include "media/formats/mp4/es_descriptor.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 

media/formats/mp4/fourccs.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_MP4_FOURCCS_H_
+#ifndef MEDIA_FORMATS_MP4_FOURCCS_H_
-#define MEDIA_MP4_FOURCCS_H_
+#define MEDIA_FORMATS_MP4_FOURCCS_H_
 
 #include <string>
 
@@ -107,4 +107,4 @@ const inline std::string FourCCToString(FourCC fourcc) {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_FOURCCS_H_
+#endif  // MEDIA_FORMATS_MP4_FOURCCS_H_

media/formats/mp4/fragmenter.cc

@@ -4,14 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/fragmenter.h"
+#include "media/formats/mp4/fragmenter.h"
 
 #include "media/base/aes_encryptor.h"
 #include "media/base/buffer_reader.h"
 #include "media/base/buffer_writer.h"
 #include "media/base/media_sample.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
-#include "media/mp4/cenc.h"
+#include "media/formats/mp4/cenc.h"
 
 namespace {
 const int64 kInvalidTime = kint64max;

media/formats/mp4/fragmenter.h

@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_FRAGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_FRAGMENTER_H_
-#define MEDIA_MP4_FRAGMENTER_H_
+#define MEDIA_FORMATS_MP4_FRAGMENTER_H_
 
 #include <vector>
 
@@ -103,4 +103,4 @@ class Fragmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_FRAGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_FRAGMENTER_H_

media/formats/mp4/mp4.gyp

@@ -11,7 +11,7 @@
   },
   'target_defaults': {
     'include_dirs': [
-      '../..',
+      '../../..',
     ],
   },
   'targets': [
@@ -61,7 +61,7 @@
         'track_run_iterator.h',
       ],
       'dependencies': [
-        '../base/media_base.gyp:base',
+        '../../base/media_base.gyp:base',
       ],
     },
     {
@@ -81,9 +81,9 @@
         'track_run_iterator_unittest.cc',
       ],
       'dependencies': [
-        '../../testing/gtest.gyp:gtest',
+        '../../../testing/gtest.gyp:gtest',
-        '../../testing/gmock.gyp:gmock',
+        '../../../testing/gmock.gyp:gmock',
-        '../test/media_test.gyp:media_test_support',
+        '../../test/media_test.gyp:media_test_support',
         'mp4',
       ]
     },

media/formats/mp4/mp4_media_parser.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/mp4/mp4_media_parser.h"
+#include "media/formats/mp4/mp4_media_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ -11,11 +11,11 @@
 #include "media/base/audio_stream_info.h"
 #include "media/base/media_sample.h"
 #include "media/base/video_stream_info.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box_reader.h"
-#include "media/mp4/es_descriptor.h"
+#include "media/formats/mp4/es_descriptor.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
-#include "media/mp4/track_run_iterator.h"
+#include "media/formats/mp4/track_run_iterator.h"
 
 namespace {
 

media/formats/mp4/mp4_media_parser.h

@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_MP4_MEDIA_PARSER_H_
+#ifndef MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
-#define MEDIA_MP4_MP4_MEDIA_PARSER_H_
+#define MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
 
 #include <vector>
 
@@ -14,7 +14,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_parser.h"
-#include "media/mp4/offset_byte_queue.h"
+#include "media/formats/mp4/offset_byte_queue.h"
 
 namespace media {
 
@@ -95,4 +95,4 @@ class MP4MediaParser : public MediaParser {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_MP4_MEDIA_PARSER_H_
+#endif  // MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_

media/formats/mp4/mp4_media_parser_unittest.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/mp4_media_parser.h"
+#include "media/formats/mp4/mp4_media_parser.h"
 
 #include "base/bind.h"
 #include "base/logging.h"

media/formats/mp4/mp4_muxer.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/mp4_muxer.h"
+#include "media/formats/mp4/mp4_muxer.h"
 
 #include "base/time/clock.h"
 #include "base/time/time.h"
@@ -16,11 +16,11 @@
 #include "media/base/video_stream_info.h"
 #include "media/event/muxer_listener.h"
 #include "media/file/file.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
-#include "media/mp4/es_descriptor.h"
+#include "media/formats/mp4/es_descriptor.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/fourccs.h"
-#include "media/mp4/multi_segment_segmenter.h"
+#include "media/formats/mp4/multi_segment_segmenter.h"
-#include "media/mp4/single_segment_segmenter.h"
+#include "media/formats/mp4/single_segment_segmenter.h"
 
 namespace {
 // The version of cenc implemented here. CENC 4.

media/formats/mp4/mp4_muxer.h

@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_MP4_MUXER_H_
+#ifndef MEDIA_FORMATS_MP4_MP4_MUXER_H_
-#define MEDIA_MP4_MP4_MUXER_H_
+#define MEDIA_FORMATS_MP4_MP4_MUXER_H_
 
 #include <vector>
 
 #include "media/base/muxer.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/fourccs.h"
 
 namespace media {
 
@@ -85,4 +85,4 @@ class MP4Muxer : public Muxer {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_MP4_MUXER_H_
+#endif  // MEDIA_FORMATS_MP4_MP4_MUXER_H_

media/formats/mp4/multi_segment_segmenter.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/multi_segment_segmenter.h"
+#include "media/formats/mp4/multi_segment_segmenter.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ -12,7 +12,7 @@
 #include "media/base/media_stream.h"
 #include "media/base/muxer_options.h"
 #include "media/file/file.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {

media/formats/mp4/multi_segment_segmenter.h

@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
-#define MEDIA_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#define MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
 
-#include "media/mp4/segmenter.h"
+#include "media/formats/mp4/segmenter.h"
 
 namespace media {
 namespace mp4 {
@@ -60,4 +60,4 @@ class MultiSegmentSegmenter : public Segmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_

media/formats/mp4/offset_byte_queue.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/mp4/offset_byte_queue.h"
+#include "media/formats/mp4/offset_byte_queue.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"

media/formats/mp4/offset_byte_queue.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_MP4_OFFSET_BYTE_QUEUE_H_
+#ifndef MEDIA_FORMATS_MP4_OFFSET_BYTE_QUEUE_H_
-#define MEDIA_MP4_OFFSET_BYTE_QUEUE_H_
+#define MEDIA_FORMATS_MP4_OFFSET_BYTE_QUEUE_H_
 
 #include "base/basictypes.h"
 #include "media/base/byte_queue.h"
@@ -66,4 +66,4 @@ class OffsetByteQueue {
 
 }  // namespace media
 
-#endif  // MEDIA_MP4_OFFSET_BYTE_QUEUE_H_
+#endif  // MEDIA_FORMATS_MP4_OFFSET_BYTE_QUEUE_H_

media/formats/mp4/offset_byte_queue_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/offset_byte_queue.h"
+#include "media/formats/mp4/offset_byte_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {

media/formats/mp4/rcheck.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_MP4_RCHECK_H_
+#ifndef MEDIA_FORMATS_MP4_RCHECK_H_
-#define MEDIA_MP4_RCHECK_H_
+#define MEDIA_FORMATS_MP4_RCHECK_H_
 
 #include "base/logging.h"
 
@@ -15,4 +15,4 @@
     }                                                       \
   } while (0)
 
-#endif  // MEDIA_MP4_RCHECK_H_
+#endif  // MEDIA_FORMATS_MP4_RCHECK_H_

media/formats/mp4/segmenter.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/segmenter.h"
+#include "media/formats/mp4/segmenter.h"
 
 #include <algorithm>
 
@@ -15,8 +15,8 @@
 #include "media/base/media_stream.h"
 #include "media/base/muxer_options.h"
 #include "media/base/video_stream_info.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
-#include "media/mp4/fragmenter.h"
+#include "media/formats/mp4/fragmenter.h"
 
 namespace {
 uint64 Rescale(uint64 time_in_old_scale, uint32 old_scale, uint32 new_scale) {

media/formats/mp4/segmenter.h

@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_SEGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_SEGMENTER_H_
-#define MEDIA_MP4_SEGMENTER_H_
+#define MEDIA_FORMATS_MP4_SEGMENTER_H_
 
 #include <map>
 #include <vector>
@@ -106,4 +106,4 @@ class Segmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_SEGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_SEGMENTER_H_

media/formats/mp4/single_segment_segmenter.cc

@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/single_segment_segmenter.h"
+#include "media/formats/mp4/single_segment_segmenter.h"
 
 #include "media/base/buffer_writer.h"
 #include "media/base/media_stream.h"
 #include "media/base/muxer_options.h"
 #include "media/file/file.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {

media/formats/mp4/single_segment_segmenter.h

@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
-#define MEDIA_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#define MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
 
 #include "media/file/file_closer.h"
-#include "media/mp4/segmenter.h"
+#include "media/formats/mp4/segmenter.h"
 
 namespace media {
 namespace mp4 {
@@ -55,4 +55,4 @@ class SingleSegmentSegmenter : public Segmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_

media/formats/mp4/sync_sample_iterator.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/sync_sample_iterator.h"
+#include "media/formats/mp4/sync_sample_iterator.h"
 
 #include <algorithm>
 

media/formats/mp4/sync_sample_iterator.h

@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_SYNC_SAMPLE_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
-#define MEDIA_MP4_SYNC_SAMPLE_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -44,4 +44,4 @@ class SyncSampleIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_SYNC_SAMPLE_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_

media/formats/mp4/sync_sample_iterator_unittest.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/sync_sample_iterator.h"
+#include "media/formats/mp4/sync_sample_iterator.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 

media/formats/mp4/track_run_iterator.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/track_run_iterator.h"
+#include "media/formats/mp4/track_run_iterator.h"
 
 #include <algorithm>
 
 #include "media/base/buffer_reader.h"
-#include "media/mp4/chunk_info_iterator.h"
+#include "media/formats/mp4/chunk_info_iterator.h"
-#include "media/mp4/composition_offset_iterator.h"
+#include "media/formats/mp4/composition_offset_iterator.h"
-#include "media/mp4/decoding_time_iterator.h"
+#include "media/formats/mp4/decoding_time_iterator.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
-#include "media/mp4/sync_sample_iterator.h"
+#include "media/formats/mp4/sync_sample_iterator.h"
 
 namespace media {
 namespace mp4 {

media/formats/mp4/track_run_iterator.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_TRACK_RUN_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
-#define MEDIA_MP4_TRACK_RUN_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
-#include "media/mp4/cenc.h"
+#include "media/formats/mp4/cenc.h"
 
 namespace media {
 
@@ -121,4 +121,4 @@ class TrackRunIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_TRACK_RUN_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_

media/formats/mp4/track_run_iterator_unittest.cc

@@ -5,9 +5,9 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
-#include "media/mp4/track_run_iterator.h"
+#include "media/formats/mp4/track_run_iterator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The sum of the elements in a vector initialized with SumAscending,

media/test/packager_test.cc

@@ -14,7 +14,7 @@
 #include "media/base/muxer.h"
 #include "media/base/status_test_util.h"
 #include "media/base/stream_info.h"
-#include "media/mp4/mp4_muxer.h"
+#include "media/formats/mp4/mp4_muxer.h"
 #include "media/test/test_data_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

packager.gyp

@@ -27,7 +27,7 @@
       'dependencies': [
         'media/event/media_event.gyp:media_event',
         'media/file/file.gyp:file',
-        'media/mp4/mp4.gyp:mp4',
+        'media/formats/mp4/mp4.gyp:mp4',
         'third_party/gflags/gflags.gyp:gflags',
       ],
     },
@@ -52,7 +52,7 @@
       ],
       'dependencies': [
         'media/file/file.gyp:file',
-        'media/mp4/mp4.gyp:mp4',
+        'media/formats/mp4/mp4.gyp:mp4',
         'media/test/media_test.gyp:media_test_support',
         'testing/gtest.gyp:gtest',
       ],
@@ -64,7 +64,7 @@
         'media/base/media_base.gyp:*',
         'media/event/media_event.gyp:*',
         'media/file/file.gyp:*',
-        'media/mp4/mp4.gyp:*',
+        'media/formats/mp4/mp4.gyp:*',
         'mpd/mpd.gyp:*',
       ],
     },
@@ -75,7 +75,7 @@
         'media/base/media_base.gyp:media_base_unittest',
         'media/event/media_event.gyp:media_event_unittest',
         'media/file/file.gyp:file_unittest',
-        'media/mp4/mp4.gyp:mp4_unittest',
+        'media/formats/mp4/mp4.gyp:mp4_unittest',
         'mpd/mpd.gyp:mpd_unittest',
         'packager_test',
       ],