Revert of Deliver video frames on Android, on the decode thread.

webrtc/modules/video_coding/codec_database.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 89 matching lines @@
 
   // Returns a decoder specified by |payload_type|. The decoded frame callback
   // of the encoder is set to |decoded_frame_callback|. If no such decoder
   // already exists an instance will be created and initialized.
   // NULL is returned if no encoder with the specified payload type was found
   // and the function failed to create one.
   VCMGenericDecoder* GetDecoder(
       const VCMEncodedFrame& frame,
       VCMDecodedFrameCallback* decoded_frame_callback);
 
-  // Returns the current decoder (i.e. the same value as was last returned from
-  // GetDecoder();
-  VCMGenericDecoder* GetCurrentDecoder();
+  // Deletes the memory of the decoder instance |decoder|. Used to delete
+  // deep copies returned by CreateDecoderCopy().
+  void ReleaseDecoder(VCMGenericDecoder* decoder) const;
 
   // Returns true if the currently active decoder prefer to decode frames late.
   // That means that frames must be decoded near the render times stamp.
   bool PrefersLateDecoding() const;
 
   bool MatchesCurrentResolution(int width, int height) const;
 
  private:
   typedef std::map<uint8_t, VCMDecoderMapItem*> DecoderMap;
   typedef std::map<uint8_t, VCMExtDecoderMapItem*> ExternalDecoderMap;
 
-  std::unique_ptr<VCMGenericDecoder> CreateAndInitDecoder(
-      const VCMEncodedFrame& frame,
-      VideoCodec* new_codec) const;
+  VCMGenericDecoder* CreateAndInitDecoder(const VCMEncodedFrame& frame,
+                                          VideoCodec* new_codec) const;
 
   // Determines whether a new codec has to be created or not.
   // Checks every setting apart from maxFramerate and startBitrate.
   bool RequiresEncoderReset(const VideoCodec& send_codec);
 
   void DeleteEncoder();
 
+  // Create an internal Decoder given a codec type
+  VCMGenericDecoder* CreateDecoder(VideoCodecType type) const;
+
   const VCMDecoderMapItem* FindDecoderItem(uint8_t payload_type) const;
 
   const VCMExtDecoderMapItem* FindExternalDecoderItem(
       uint8_t payload_type) const;
 
   int number_of_cores_;
   size_t max_payload_size_;
   bool periodic_key_frames_;
   bool pending_encoder_reset_;
   VideoCodec send_codec_;
   VideoCodec receive_codec_;
   uint8_t encoder_payload_type_;
   VideoEncoder* external_encoder_;
   bool internal_source_;
   VCMEncodedFrameCallback* const encoded_frame_callback_;
   std::unique_ptr<VCMGenericEncoder> ptr_encoder_;
-  std::unique_ptr<VCMGenericDecoder> ptr_decoder_;
+  VCMGenericDecoder* ptr_decoder_;
   DecoderMap dec_map_;
   ExternalDecoderMap dec_external_map_;
 };  // VCMCodecDataBase
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_