remove omx_sink and buffer merge

media/omx/omx_codec.h

 // Copyright (c) 2010 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.
 
 // TODO(ajwong): Generalize this class (fix comments, API, and extract
 // implemntation) so that it can be used for encoding & decoding of both
 // Video and Audio.
 //
 // An object that works with an OpenMAX component for video decoding.
 // Operations on this object are all asynchronous and this object
 // requires a message loop that it works on.
 //
 // OWNERSHIP
 //
-// The OmxCodec works with two external objects, they are:
-// 1. OmxConfigurator
+// The OmxCodec works with external objects
+// OmxConfigurator
 //    This object is given to OmxCodec to perform port configuration.
-// 2. OmxOutputSink
-//    This object is given to OmxCodec to perform output buffer negotiation.
-//
-// These two external objects are provided and destroyed externally. Their
-// references are given to OmxCodec and client application is responsible
-// for cleaning them.
+//    This object is provided and destroyed externally. Its references
+//    are given to OmxCodec and client application is responsible
+//    for cleaning them.
 //
 // INTERACTION WITH EXTERNAL OBJECTS
 //
 //         ................                    ............
 //        |  Configurator  |  <-------------  |  OmxCodec  |
 //         ................                    ............
 //                   Read / Feed  -----------'     '
 //                   .-----------'                 v Buffer Allocation
 //         ..........                         ...............
 //        |  Client  |  ------------------>  |  OutputSink   |
@@ skipping 12 matching lines @@
 //
 // // Initialization.
 // MessageLoop message_loop;
 // OmxCodec* decoder = new OmxCodec(&message_loop);
 //
 // OmxConfigurator::MediaFormat input_format, output_format;
 // input_format.codec = OmxCodec::kCodecH264;
 // output_format.codec = OmxCodec::kCodecRaw;
 // scoped_ptr<OmxConfigurator> configurator(
 //     new OmxDecoderConfigurator(input_format, output_format));
-// scoped_ptr<OmxOutputSink> output_sink(new CustomOutputSink());
 //
-// decoder->Setup(configurator.get(), output_sink.get());
+// decoder->Setup(configurator.get());
 // decoder->SetErrorCallback(NewCallback(this, &Client::ErrorCallback));
 // decoder->SetFormatCallback(NewCallback(this, &Client::FormatCallback));
 //
 // // Start is asynchronous. We don't need to wait for it to proceed.
 // decoder->Start();
 //
 // // We can start giving buffer to the decoder right after start. It will
 // // queue the input buffers and output requests and process them until
 // // the decoder can actually process them.
 // for (int i = 0; i < kInitialBuffers; ++i) {
@@ skipping 66 matching lines @@
 
 #ifndef MEDIA_OMX_OMX_CODEC_H_
 #define MEDIA_OMX_OMX_CODEC_H_
 
 #include <queue>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/scoped_ptr.h"
 #include "media/omx/omx_configurator.h"
-#include "media/omx/omx_output_sink.h"
 #include "third_party/openmax/il/OMX_Component.h"
 #include "third_party/openmax/il/OMX_Core.h"
 #include "third_party/openmax/il/OMX_Video.h"
 
 class MessageLoop;
 
 namespace media {
 
 class Buffer;
 
 class OmxCodec : public base::RefCountedThreadSafe<OmxCodec> {
  public:
   // TODO(jiesun): remove callback parameters.
   typedef Callback2<
       const OmxConfigurator::MediaFormat&,
       const OmxConfigurator::MediaFormat&>::Type FormatCallback;
   typedef Callback1<Buffer*>::Type FeedCallback;
-  typedef Callback2<int,
-      OmxOutputSink::BufferUsedCallback*>::Type ReadCallback;
+  typedef Callback1<OMX_BUFFERHEADERTYPE*>::Type ReadCallback;
   typedef Callback0::Type Callback;
 
   // Initialize an OmxCodec object that runs on |message_loop|. It is
   // guaranteed that callbacks are executed on this message loop.
   explicit OmxCodec(MessageLoop* message_loop);
   virtual ~OmxCodec();
 
   // Setup OmxCodec using |configurator|. |configurator| and |output_sink|
   // are not owned by this class and should be cleaned up externally.
-  void Setup(OmxConfigurator* configurator, OmxOutputSink* output_sink);
+  void Setup(OmxConfigurator* configurator);
 
   // Set the error callback. In case of error the callback will be called.
   void SetErrorCallback(Callback* callback);
 
   // Set the format change callback. In case of input stream changes.
   void SetFormatCallback(FormatCallback* callback);
 
   // Start the decoder, this will start the initialization asynchronously.
   // Client can start feeding to and reading from the decoder.
   void Start();
@@ skipping 181 matching lines @@
   // |next_state_| is the next state that this machine will transition
   // to. After a state transition is completed and the state becomes
   // stable then |next_state_| equals |state_|. Inequality can be
   // used to detect a state transition.
   // These two members are read and written only on |message_loop_|.
   State state_;
   State next_state_;
 
   OMX_COMPONENTTYPE* component_handle_;
   OmxConfigurator* configurator_;
-  OmxOutputSink* output_sink_;
   MessageLoop* message_loop_;
 
   scoped_ptr<FormatCallback> format_callback_;
   scoped_ptr<Callback> stop_callback_;
   scoped_ptr<Callback> error_callback_;
 
   typedef std::pair<scoped_refptr<Buffer>, FeedCallback*> InputUnit;
 
   // Input queue for encoded data.
   // The input buffers will be sent to OMX component via OMX_EmptyThisBuffer()
@@ skipping 10 matching lines @@
 
   // Available input OpenMAX buffers that we can use to issue
   // OMX_EmptyThisBuffer() call.
   std::queue<OMX_BUFFERHEADERTYPE*> available_input_buffers_;
 
   // A queue of buffers that carries decoded video frames. They are
   // ready to return to client.
   // TOOD(hclam): extract it to a separate class.
   std::queue<int> output_buffers_ready_;
 
-  // A set of buffers that are currently in use by the client.
-  // TODO(hclam): extract it to a separate class.
-  typedef std::vector<int> OutputBuffersInUseSet;
-  OutputBuffersInUseSet output_buffers_in_use_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(OmxCodec);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_OMX_OMX_CODEC_H_