Motown: Ffmpeg video decoder

services/media/framework_ffmpeg/ffmpeg_audio_decoder.h

Index: services/media/framework_ffmpeg/ffmpeg_audio_decoder.h
diff --git a/services/media/framework_ffmpeg/ffmpeg_audio_decoder.h b/services/media/framework_ffmpeg/ffmpeg_audio_decoder.h
index 89589b74613d18aee80d83c8a1b2e40330ce28e7..1e908ca3e5b9539f312ba8335665f0dd9f82a45a 100644
--- a/services/media/framework_ffmpeg/ffmpeg_audio_decoder.h
+++ b/services/media/framework_ffmpeg/ffmpeg_audio_decoder.h
@@ -33,55 +33,6 @@ class FfmpegAudioDecoder : public FfmpegDecoderBase {
   PacketPtr CreateOutputEndOfStreamPacket() override;
 
  private:
-  // Used to control deallocation of buffers.
-  class AvBufferContext {
-   public:
-    AvBufferContext(size_t size, PayloadAllocator* allocator)
-        : size_(size), allocator_(allocator) {
-      DCHECK(allocator_);
-      if (size_ == 0) {
-        buffer_ = nullptr;
-      } else {
-        buffer_ =
-            static_cast<uint8_t*>(allocator_->AllocatePayloadBuffer(size_));
-      }
-    }
-
-    ~AvBufferContext() {
-      if (allocator_ == nullptr) {
-        // Previously released.
-        return;
-      }
-
-      if (size_ != 0) {
-        DCHECK(buffer_ != nullptr);
-        allocator_->ReleasePayloadBuffer(size_, buffer_);
-        return;
-      }
-
-      DCHECK(buffer_ == nullptr);
-    }
-
-    uint8_t* buffer() { return buffer_; }
-
-    size_t size() { return size_; }
-
-    // Releases ownership of the buffer.
-    uint8_t* Release() {
-      DCHECK(allocator_) << "AvBufferContext released twice";
-      uint8_t* result = buffer_;
-      buffer_ = nullptr;
-      size_ = 0;
-      allocator_ = nullptr;
-      return result;
-    }
-
-   private:
-    uint8_t* buffer_;
-    size_t size_;
-    PayloadAllocator* allocator_;
-  };
-
   // Align sample buffers on 32-byte boundaries. This is the value that Chromium
   // uses and is supposed to work for all processor architectures. Strangely, if
   // we were to tell ffmpeg to use the default (by passing 0), it aligns on 32