Reorganize bitstream converter classes.

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 3e5c24b70fbd0c25b3ee930d5eb06819c9f67ba2..54bca0a0515ffe672304ff9cdab4472c4d5b4340 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -167,8 +167,6 @@
         'base/filter_host.h',
         'base/filters.cc',
         'base/filters.h',
-        'base/h264_bitstream_converter.cc',
-        'base/h264_bitstream_converter.h',
         'base/media.h',
         'base/media_android.cc',
         'base/media_export.h',
@@ -220,8 +218,6 @@
         'filters/audio_renderer_algorithm.h',
         'filters/audio_renderer_impl.cc',
         'filters/audio_renderer_impl.h',
-        'filters/bitstream_converter.cc',
-        'filters/bitstream_converter.h',
         'filters/chunk_demuxer.cc',
         'filters/chunk_demuxer.h',
         'filters/chunk_demuxer_client.h',
@@ -231,16 +227,18 @@
         'filters/ffmpeg_audio_decoder.h',
         'filters/ffmpeg_demuxer.cc',
         'filters/ffmpeg_demuxer.h',
-        'filters/ffmpeg_h264_bitstream_converter.cc',
-        'filters/ffmpeg_h264_bitstream_converter.h',
         'filters/ffmpeg_glue.cc',
         'filters/ffmpeg_glue.h',
+        'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
+        'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
         'filters/ffmpeg_video_decoder.cc',
         'filters/ffmpeg_video_decoder.h',
         'filters/file_data_source.cc',
         'filters/file_data_source.h',
         'filters/gpu_video_decoder.cc',
         'filters/gpu_video_decoder.h',
+        'filters/h264_to_annex_b_bitstream_converter.cc',
+        'filters/h264_to_annex_b_bitstream_converter.h',
         'filters/in_memory_url_protocol.cc',
         'filters/in_memory_url_protocol.h',
         'filters/source_buffer_stream.cc',
@@ -317,8 +315,6 @@
             'ffmpeg/file_protocol.h',
             'filters/audio_file_reader.cc',
             'filters/audio_file_reader.h',
-            'filters/bitstream_converter.cc',
-            'filters/bitstream_converter.h',
             'filters/chunk_demuxer.cc',
             'filters/chunk_demuxer.h',
             'filters/chunk_demuxer_client.h',
@@ -326,10 +322,10 @@
             'filters/ffmpeg_audio_decoder.h',
             'filters/ffmpeg_demuxer.cc',
             'filters/ffmpeg_demuxer.h',
-            'filters/ffmpeg_h264_bitstream_converter.cc',
-            'filters/ffmpeg_h264_bitstream_converter.h',
             'filters/ffmpeg_glue.cc',
             'filters/ffmpeg_glue.h',
+            'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
+            'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
             'filters/ffmpeg_video_decoder.cc',
             'filters/ffmpeg_video_decoder.h',
             'filters/gpu_video_decoder.cc',
@@ -685,7 +681,6 @@
         'base/fake_audio_render_callback.cc',
         'base/fake_audio_render_callback.h',
         'base/filter_collection_unittest.cc',
-        'base/h264_bitstream_converter_unittest.cc',
         'base/multi_channel_resampler_unittest.cc',
         'base/pipeline_unittest.cc',
         'base/ranges_unittest.cc',
@@ -702,15 +697,15 @@
         'ffmpeg/ffmpeg_common_unittest.cc',
         'filters/audio_renderer_algorithm_unittest.cc',
         'filters/audio_renderer_impl_unittest.cc',
-        'filters/bitstream_converter_unittest.cc',
         'filters/chunk_demuxer_unittest.cc',
         'filters/ffmpeg_audio_decoder_unittest.cc',
         'filters/ffmpeg_decoder_unittest.h',
         'filters/ffmpeg_demuxer_unittest.cc',
         'filters/ffmpeg_glue_unittest.cc',
-        'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
+        'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
         'filters/ffmpeg_video_decoder_unittest.cc',
         'filters/file_data_source_unittest.cc',
+        'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
         'filters/pipeline_integration_test.cc',
         'filters/pipeline_integration_test_base.cc',
         'filters/source_buffer_stream_unittest.cc',
@@ -744,11 +739,10 @@
             'base/test_data_util.h',
             'ffmpeg/ffmpeg_common_unittest.cc',
             'filters/ffmpeg_audio_decoder_unittest.cc',
-            'filters/bitstream_converter_unittest.cc',
             'filters/chunk_demuxer_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
-            'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
+            'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
             'filters/pipeline_integration_test.cc',
             'filters/pipeline_integration_test_base.cc',