Reorganize bitstream converter classes.

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the PulseAudio library.
     'use_pulseaudio%': 0,
     # Override to dynamically link the cras (ChromeOS audio) library.
@@ skipping 149 matching lines @@
         'base/demuxer.h',
         'base/demuxer_stream.cc',
         'base/demuxer_stream.h',
         'base/djb2.cc',
         'base/djb2.h',
         'base/filter_collection.cc',
         'base/filter_collection.h',
         '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',
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
         'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
         'base/media_win.cc',
@@ skipping 27 matching lines @@
         'ffmpeg/ffmpeg_common.cc',
         'ffmpeg/ffmpeg_common.h',
         'ffmpeg/file_protocol.cc',
         'ffmpeg/file_protocol.h',
         'filters/audio_file_reader.cc',
         'filters/audio_file_reader.h',
         'filters/audio_renderer_algorithm.cc',
         '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',
         'filters/dummy_demuxer.cc',
         'filters/dummy_demuxer.h',
         'filters/ffmpeg_audio_decoder.cc',
         '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',
         'filters/source_buffer_stream.h',
         'filters/video_frame_generator.cc',
         'filters/video_frame_generator.h',
         'filters/video_renderer_base.cc',
         'filters/video_renderer_base.h',
         'video/capture/fake_video_capture_device.cc',
         'video/capture/fake_video_capture_device.h',
@@ skipping 56 matching lines @@
         }],
         ['OS == "android"', {
           'sources!': [
             'base/media_posix.cc',
             'ffmpeg/ffmpeg_common.cc',
             'ffmpeg/ffmpeg_common.h',
             'ffmpeg/file_protocol.cc',
             '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',
             'filters/ffmpeg_audio_decoder.cc',
             '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',
             'filters/gpu_video_decoder.h',
             'webm/webm_cluster_parser.cc',
             'webm/webm_cluster_parser.h',
             'webm/webm_stream_parser.cc',
             'webm/webm_stream_parser.h',
           ],
         }],
@@ skipping 335 matching lines @@
         'base/bit_reader_unittest.cc',
         'base/buffers_unittest.cc',
         'base/clock_unittest.cc',
         'base/composite_filter_unittest.cc',
         'base/data_buffer_unittest.cc',
         'base/decoder_buffer_unittest.cc',
         'base/djb2_unittest.cc',
         'base/fake_audio_render_callback.cc',
         'base/fake_audio_render_callback.h',
         'base/filter_collection_unittest.cc',
-        'base/h264_bitstream_converter_unittest.cc',
         'base/pipeline_unittest.cc',
         'base/ranges_unittest.cc',
         'base/run_all_unittests.cc',
         'base/seekable_buffer_unittest.cc',
         'base/state_matrix_unittest.cc',
         'base/test_data_util.cc',
         'base/test_data_util.h',
         'base/video_frame_unittest.cc',
         'base/video_util_unittest.cc',
         'base/yuv_convert_unittest.cc',
         'crypto/aes_decryptor_unittest.cc',
         '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',
         'filters/video_renderer_base_unittest.cc',
         'video/capture/video_capture_device_unittest.cc',
         'webm/cluster_builder.cc',
         'webm/cluster_builder.h',
         'webm/webm_cluster_parser_unittest.cc',
         'webm/webm_content_encodings_client_unittest.cc',
         'webm/webm_parser_unittest.cc',
@@ skipping 13 matching lines @@
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
         }],
         ['OS == "android"', {
           'sources!': [
             'audio/audio_input_volume_unittest.cc',
             'base/test_data_util.cc',
             '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',
             'mp4/mp4_stream_parser_unittest.cc',
             'webm/webm_cluster_parser_unittest.cc',
           ],
         }],
         ['OS == "linux"', {
           'conditions': [
             ['use_cras == 1', {
@@ skipping 349 matching lines @@
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
         },
       ],
     }]
   ],
 }