rename from media/libstagefright/binding/Adts.cpp
rename to dom/media/platforms/agnostic/mp4_demuxer/Adts.cpp

rename from media/libstagefright/binding/include/mp4_demuxer/Adts.h
rename to dom/media/platforms/agnostic/mp4_demuxer/Adts.h

rename from media/libstagefright/binding/AnnexB.cpp
rename to dom/media/platforms/agnostic/mp4_demuxer/AnnexB.cpp

rename from media/libstagefright/binding/include/mp4_demuxer/AnnexB.h
rename to dom/media/platforms/agnostic/mp4_demuxer/AnnexB.h

rename from media/libstagefright/binding/H264.cpp
rename to dom/media/platforms/agnostic/mp4_demuxer/H264.cpp

rename from media/libstagefright/binding/include/mp4_demuxer/H264.h
rename to dom/media/platforms/agnostic/mp4_demuxer/H264.h

--- a/dom/media/platforms/moz.build
+++ b/dom/media/platforms/moz.build
@@ -34,16 +34,17 @@ UNIFIED_SOURCES += [
     'PDMFactory.cpp',
     'wrappers/H264Converter.cpp',
     'wrappers/MediaDataDecoderProxy.cpp'
 ]
 
 DIRS += [
     'agnostic/eme',
     'agnostic/gmp',
+    'agnostic/mp4_demuxer',
     'omx'
 ]
 
 if CONFIG['MOZ_WMF']:
     DIRS += [ 'wmf' ];
 
 if CONFIG['MOZ_FFVPX'] or CONFIG['MOZ_FFMPEG']:
     # common code to either FFmpeg or FFVPX

--- a/media/libstagefright/moz.build
+++ b/media/libstagefright/moz.build
@@ -3,43 +3,37 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 EXPORTS.mp4_demuxer += [
-    'binding/include/mp4_demuxer/Adts.h',
-    'binding/include/mp4_demuxer/AnnexB.h',
     'binding/include/mp4_demuxer/Atom.h',
     'binding/include/mp4_demuxer/AtomType.h',
     'binding/include/mp4_demuxer/BufferStream.h',
     'binding/include/mp4_demuxer/DecoderData.h',
-    'binding/include/mp4_demuxer/H264.h',
     'binding/include/mp4_demuxer/Index.h',
     'binding/include/mp4_demuxer/Interval.h',
     'binding/include/mp4_demuxer/MoofParser.h',
     'binding/include/mp4_demuxer/MP4Metadata.h',
     'binding/include/mp4_demuxer/ResourceStream.h',
     'binding/include/mp4_demuxer/SinfParser.h',
     'binding/include/mp4_demuxer/Stream.h',
 ]
 
 EXPORTS.demuxer += [
     'binding/include/demuxer/TrackDemuxer.h',
 ]
 
 UNIFIED_SOURCES += [
-    'binding/Adts.cpp',
-    'binding/AnnexB.cpp',
     'binding/Box.cpp',
     'binding/BufferStream.cpp',
     'binding/DecoderData.cpp',
-    'binding/H264.cpp',
     'binding/Index.cpp',
     'binding/MoofParser.cpp',
     'binding/MP4Metadata.cpp',
     'binding/ResourceStream.cpp',
     'binding/SinfParser.cpp',
 ]
 
 LOCAL_INCLUDES += [