Move H264Parser and H264BitReader to media/filters.

media/filters/h264_bit_reader.h

 // 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.
 //
 // This file contains an implementation of an H264 Annex-B video stream parser.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_H264_BIT_READER_H_
-#define CONTENT_COMMON_GPU_MEDIA_H264_BIT_READER_H_
+#ifndef MEDIA_FILTERS_H264_BIT_READER_H_
+#define MEDIA_FILTERS_H264_BIT_READER_H_
 
 #include <sys/types.h>
 
 #include "base/basictypes.h"
-#include "content/common/content_export.h"
+#include "media/base/media_export.h"
 
-namespace content {
+namespace media {
 
 // A class to provide bit-granularity reading of H.264 streams.
 // This is not a generic bit reader class, as it takes into account
 // H.264 stream-specific constraints, such as skipping emulation-prevention
 // bytes and stop bits. See spec for more details.
-class CONTENT_EXPORT H264BitReader {
+class MEDIA_EXPORT H264BitReader {
  public:
   H264BitReader();
   ~H264BitReader();
 
   // Initialize the reader to start reading at |data|, |size| being size
   // of |data| in bytes.
   // Return false on insufficient size of stream..
   // TODO(posciak,fischman): consider replacing Initialize() with
   // heap-allocating and creating bit readers on demand instead.
   bool Initialize(const uint8* data, off_t size);
 
   // Read |num_bits| next bits from stream and return in |*out|, first bit
   // from the stream starting at |num_bits| position in |*out|.
   // |num_bits| may be 1-32, inclusive.
   // Return false if the given number of bits cannot be read (not enough
   // bits in the stream), true otherwise.
-  bool ReadBits(int num_bits, int *out);
+  bool ReadBits(int num_bits, int* out);
 
   // Return the number of bits left in the stream.
   off_t NumBitsLeft();
 
   // See the definition of more_rbsp_data() in spec.
   bool HasMoreRBSPData();
 
   // Return the number of emulation prevention bytes already read.
   size_t NumEmulationPreventionBytesRead();
 
@@ skipping 18 matching lines @@
   // Used in emulation prevention three byte detection (see spec).
   // Initially set to 0xffff to accept all initial two-byte sequences.
   int prev_two_bytes_;
 
   // Number of emulation preventation bytes (0x000003) we met.
   size_t emulation_prevention_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(H264BitReader);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_H264_BIT_READER_H_
+#endif  // MEDIA_FILTERS_H264_BIT_READER_H_