Added aac bitstream converter

media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h

Index: media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
diff --git a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
index 1ad0a4890d169a0422ab089a54a1a795310badc3..e4e43f99a766e5601c5c435b45b8c98c7d4bd6fc 100644
--- a/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
+++ b/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h
@@ -6,6 +6,7 @@
 #define MEDIA_FILTERS_FFMPEG_H264_TO_ANNEX_B_BITSTREAM_CONVERTER_H_
 
 #include "base/basictypes.h"
+#include "media/filters/ffmpeg_bitstream_converter.h"
 #include "media/filters/h264_to_annex_b_bitstream_converter.h"
 
 // Forward declarations for FFmpeg datatypes used.
@@ -16,13 +17,16 @@ namespace media {
 
 // Bitstream converter that converts H.264 bitstream based FFmpeg packets into
 // H.264 Annex B bytestream format.
-class MEDIA_EXPORT FFmpegH264ToAnnexBBitstreamConverter {
+class MEDIA_EXPORT FFmpegH264ToAnnexBBitstreamConverter
+    : public FFmpegBitstreamConverter {
  public:
-  // The |stream_context| will be used during conversion and should be the
+  // The |stream_codec_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.
-  explicit FFmpegH264ToAnnexBBitstreamConverter(AVCodecContext* stream_context);
-  ~FFmpegH264ToAnnexBBitstreamConverter();
+  // |stream_codec_context| is retained, so it must outlive this class.
+  explicit FFmpegH264ToAnnexBBitstreamConverter(
+      AVCodecContext* stream_codec_context);
+
+  ~FFmpegH264ToAnnexBBitstreamConverter() override;
 
   // Converts |packet| to H.264 Annex B bytestream format. This conversion is

[xhwang, 2014/11/06 04:35:28]

// FFmpegBitstreamConverter implementation.

[kjoswiak, 2014/11/07 02:14:38]

Done.

   // on single NAL unit basis which is contained within the |packet| with the
@@ -42,7 +46,7 @@ class MEDIA_EXPORT FFmpegH264ToAnnexBBitstreamConverter {
   //
   // Returns false if conversion failed. In this case, the |packet| will not
   // be changed.
-  bool ConvertPacket(AVPacket* packet);
+  bool ConvertPacket(AVPacket* packet) override;
 
  private:
   // Actual converter class.
@@ -53,7 +57,7 @@ class MEDIA_EXPORT FFmpegH264ToAnnexBBitstreamConverter {
 
   // Variable to hold a pointer to memory where we can access the global
   // data from the FFmpeg file format's global headers.
-  AVCodecContext* stream_context_;
+  AVCodecContext* stream_codec_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegH264ToAnnexBBitstreamConverter);
 };