Reorganize bitstream converter classes.

media/filters/bitstream_converter.h

Index: media/filters/bitstream_converter.h
diff --git a/media/filters/bitstream_converter.h b/media/filters/bitstream_converter.h
deleted file mode 100644
index c08143e11b854616ff752b31b73a49a8863bb761..0000000000000000000000000000000000000000
--- a/media/filters/bitstream_converter.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2011 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.

[Ami GONE FROM CHROMIUM, 2012/07/11 22:33:17]

rietveld is showing this as a modification, not a delete.  Can you make sure
it's deleted?  
(ditto for .cc file)

[xhwang, 2012/07/12 00:21:45]

I don't know why it's shown as modified :\, it's not in my local folder and git
shows it's deleted:

diff --git a/media/filters/bitstream_converter.cc
b/media/filters/bitstream_converter.cc
deleted file mode 100644
index 8708f69..0000000
--- a/media/filters/bitstream_converter.cc
+++ /dev/null


diff --git a/media/filters/bitstream_converter.h
b/media/filters/bitstream_converter.h
deleted file mode 100644
index c08143e..0000000
--- a/media/filters/bitstream_converter.h
+++ /dev/null

-
-// Interface and some concrete classes for applying various transforms
-// to AVPackets.  FFmpegBitstreamConverter, in particular, can be used
-// to apply FFmpeg bitstream filters to the incoming AVPacket to transcode
-// the packet format.
-
-#ifndef MEDIA_FILTERS_BITSTREAM_CONVERTER_H_
-#define MEDIA_FILTERS_BITSTREAM_CONVERTER_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
-#include "media/base/media_export.h"
-
-// FFmpeg types.
-struct AVBitStreamFilterContext;
-struct AVCodecContext;
-struct AVPacket;
-
-namespace media {
-
-class MEDIA_EXPORT BitstreamConverter {
- public:
-  BitstreamConverter() {}
-  virtual ~BitstreamConverter() {}
-
-  // Initialize does any preparations needed before doing the actual
-  // conversion.
-  virtual bool Initialize() = 0;
-
-  // Attemps to convert the AVPacket from one format to another, based on the
-  // specific type of BitstreamConverter that was instantiated. Output will be
-  // stored into the |packet|, but user should be aware that conversion can free
-  // and reallocate the input buffer, if it needs to do so to fit it in.
-  virtual bool ConvertPacket(AVPacket* packet) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BitstreamConverter);
-};
-
-class IdentityBitstreamConverter : public BitstreamConverter {
- public:
-  IdentityBitstreamConverter() {}
-  virtual ~IdentityBitstreamConverter() {}
-
-  virtual bool Initialize() OVERRIDE;
-  virtual bool ConvertPacket(AVPacket* packet) OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(IdentityBitstreamConverter);
-};
-
-class MEDIA_EXPORT FFmpegBitstreamConverter : public BitstreamConverter {
- public:
-  // Creates FFmpegBitstreamConverter based on the FFmpeg bistream filter
-  // corresponding to |filter_name|.
-  //
-  // The |stream_context| will be used during conversion and should be the
-  // AVCodecContext for the stream sourcing these packets. A reference to
-  // |stream_context| is retained, so it must outlive this class.
-  FFmpegBitstreamConverter(const std::string& filter_name,
-                           AVCodecContext* stream_context);
-  virtual ~FFmpegBitstreamConverter();
-
-  virtual bool Initialize() OVERRIDE;
-  virtual bool ConvertPacket(AVPacket* packet) OVERRIDE;
-
- private:
-  std::string filter_name_;
-  AVBitStreamFilterContext* stream_filter_;
-  AVCodecContext* stream_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(FFmpegBitstreamConverter);
-};
-
-}  // namespace media
-
-#endif  // MEDIA_FILTERS_BITSTREAM_CONVERTER_H_