Call InitDecode with proper resolution.

webrtc/modules/video_coding/codec_database.cc

 /*
  *  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 48 matching lines @@
   return vp9_settings;
 }
 
 VideoCodecH264 VideoEncoder::GetDefaultH264Settings() {
   VideoCodecH264 h264_settings;
   memset(&h264_settings, 0, sizeof(h264_settings));
 
   h264_settings.profile = kProfileBase;
   h264_settings.frameDroppingOn = true;
   h264_settings.keyFrameInterval = 3000;
-  h264_settings.spsData = NULL;
+  h264_settings.spsData = nullptr;
   h264_settings.spsLen = 0;
-  h264_settings.ppsData = NULL;
+  h264_settings.ppsData = nullptr;
   h264_settings.ppsLen = 0;
 
   return h264_settings;
 }
 
 VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings,
                                      int number_of_cores,
                                      bool require_key_frame)
     : settings(settings),
       number_of_cores(number_of_cores),
@@ skipping 13 matching lines @@
 VCMCodecDataBase::VCMCodecDataBase(
     VideoEncoderRateObserver* encoder_rate_observer,
     VCMEncodedFrameCallback* encoded_frame_callback)
     : number_of_cores_(0),
       max_payload_size_(kDefaultPayloadSize),
       periodic_key_frames_(false),
       pending_encoder_reset_(true),
       send_codec_(),
       receive_codec_(),
       encoder_payload_type_(0),
-      external_encoder_(NULL),
+      external_encoder_(nullptr),
       internal_source_(false),
       encoder_rate_observer_(encoder_rate_observer),
       encoded_frame_callback_(encoded_frame_callback),
-      ptr_decoder_(NULL),
+      ptr_decoder_(nullptr),
       dec_map_(),
       dec_external_map_() {}
 
 VCMCodecDataBase::~VCMCodecDataBase() {
   ResetSender();
   ResetReceiver();
 }
 
 void VCMCodecDataBase::Codec(VideoCodecType codec_type, VideoCodec* settings) {
   memset(settings, 0, sizeof(VideoCodec));
@@ skipping 173 matching lines @@
   if (encoder_payload_type_ != payload_type) {
     return false;
   }
   if (send_codec_.plType == payload_type) {
     // De-register as send codec if needed.
     DeleteEncoder();
     memset(&send_codec_, 0, sizeof(VideoCodec));
     *was_send_codec = true;
   }
   encoder_payload_type_ = 0;
-  external_encoder_ = NULL;
+  external_encoder_ = nullptr;
   internal_source_ = false;
   return true;
 }
 
 void VCMCodecDataBase::RegisterExternalEncoder(
     VideoEncoder* external_encoder,
     uint8_t payload_type,
     bool internal_source) {
   // Since only one encoder can be used at a given time, only one external
   // encoder can be registered/used.
   external_encoder_ = external_encoder;
   encoder_payload_type_ = payload_type;
   internal_source_ = internal_source;
   pending_encoder_reset_ = true;
 }
 
 bool VCMCodecDataBase::RequiresEncoderReset(const VideoCodec& new_send_codec) {
-  if (ptr_encoder_ == NULL) {
+  if (!ptr_encoder_)
     return true;
-  }
 
   // Does not check startBitrate or maxFramerate
   if (new_send_codec.codecType != send_codec_.codecType ||
       strcmp(new_send_codec.plName, send_codec_.plName) != 0 ||
       new_send_codec.plType != send_codec_.plType ||
       new_send_codec.width != send_codec_.width ||
       new_send_codec.height != send_codec_.height ||
       new_send_codec.maxBitrate != send_codec_.maxBitrate ||
       new_send_codec.minBitrate != send_codec_.minBitrate ||
       new_send_codec.qpMax != send_codec_.qpMax ||
@@ skipping 59 matching lines @@
 bool VCMCodecDataBase::SetPeriodicKeyFrames(bool enable) {
   periodic_key_frames_ = enable;
   if (ptr_encoder_) {
     return (ptr_encoder_->SetPeriodicKeyFrames(periodic_key_frames_) == 0);
   }
   return true;
 }
 
 void VCMCodecDataBase::ResetReceiver() {
   ReleaseDecoder(ptr_decoder_);
-  ptr_decoder_ = NULL;
+  ptr_decoder_ = nullptr;
   memset(&receive_codec_, 0, sizeof(VideoCodec));
   while (!dec_map_.empty()) {
     DecoderMap::iterator it = dec_map_.begin();
     delete (*it).second;
     dec_map_.erase(it);
   }
   while (!dec_external_map_.empty()) {
     ExternalDecoderMap::iterator external_it = dec_external_map_.begin();
     delete (*external_it).second;
     dec_external_map_.erase(external_it);
   }
 }
 
 bool VCMCodecDataBase::DeregisterExternalDecoder(uint8_t payload_type) {
   ExternalDecoderMap::iterator it = dec_external_map_.find(payload_type);
   if (it == dec_external_map_.end()) {
     // Not found
     return false;
   }
   // We can't use payload_type to check if the decoder is currently in use,
   // because payload type may be out of date (e.g. before we decode the first
   // frame after RegisterReceiveCodec)
-  if (ptr_decoder_ != NULL &&
+  if (ptr_decoder_ != nullptr &&
       &ptr_decoder_->_decoder == (*it).second->external_decoder_instance) {
     // Release it if it was registered and in use.
     ReleaseDecoder(ptr_decoder_);
-    ptr_decoder_ = NULL;
+    ptr_decoder_ = nullptr;
   }
   DeregisterReceiveCodec(payload_type);
   delete (*it).second;
   dec_external_map_.erase(it);
   return true;
 }
 
 // Add the external encoder object to the list of external decoders.
 // Won't be registered as a receive codec until RegisterReceiveCodec is called.
 bool VCMCodecDataBase::RegisterExternalDecoder(
@@ skipping 60 matching lines @@
 }
 
 VideoCodecType VCMCodecDataBase::ReceiveCodec() const {
   if (!ptr_decoder_) {
     return kVideoCodecUnknown;
   }
   return receive_codec_.codecType;
 }
 
 VCMGenericDecoder* VCMCodecDataBase::GetDecoder(
-    uint8_t payload_type, VCMDecodedFrameCallback* decoded_frame_callback) {
+    const VCMEncodedFrame& frame,
+    VCMDecodedFrameCallback* decoded_frame_callback) {
+  uint8_t payload_type = frame.PayloadType();
   if (payload_type == receive_codec_.plType || payload_type == 0) {
     return ptr_decoder_;
   }
   // Check for exisitng decoder, if exists - delete.
   if (ptr_decoder_) {
     ReleaseDecoder(ptr_decoder_);
-    ptr_decoder_ = NULL;
+    ptr_decoder_ = nullptr;
     memset(&receive_codec_, 0, sizeof(VideoCodec));
   }
-  ptr_decoder_ = CreateAndInitDecoder(payload_type, &receive_codec_);
+  ptr_decoder_ = CreateAndInitDecoder(frame, &receive_codec_);
   if (!ptr_decoder_) {
-    return NULL;
+    return nullptr;
   }
   VCMReceiveCallback* callback = decoded_frame_callback->UserReceiveCallback();
   if (callback) callback->OnIncomingPayloadType(receive_codec_.plType);
   if (ptr_decoder_->RegisterDecodeCompleteCallback(decoded_frame_callback)
       < 0) {
     ReleaseDecoder(ptr_decoder_);
-    ptr_decoder_ = NULL;
+    ptr_decoder_ = nullptr;
     memset(&receive_codec_, 0, sizeof(VideoCodec));
-    return NULL;
+    return nullptr;
   }
   return ptr_decoder_;
 }
 
 void VCMCodecDataBase::ReleaseDecoder(VCMGenericDecoder* decoder) const {
   if (decoder) {
     assert(&decoder->_decoder);
     decoder->Release();
     if (!decoder->External()) {
       delete &decoder->_decoder;
     }
     delete decoder;
   }
 }
 
 bool VCMCodecDataBase::SupportsRenderScheduling() const {
   const VCMExtDecoderMapItem* ext_item = FindExternalDecoderItem(
       receive_codec_.plType);
-  if (ext_item == nullptr)
+  if (!ext_item)
     return true;
   return ext_item->internal_render_timing;
 }
 
 bool VCMCodecDataBase::MatchesCurrentResolution(int width, int height) const {
   return send_codec_.width == width && send_codec_.height == height;
 }
 
 VCMGenericDecoder* VCMCodecDataBase::CreateAndInitDecoder(
-    uint8_t payload_type,
+    const VCMEncodedFrame& frame,
     VideoCodec* new_codec) const {
+  uint8_t payload_type = frame.PayloadType();
   assert(new_codec);
   const VCMDecoderMapItem* decoder_item = FindDecoderItem(payload_type);
   if (!decoder_item) {
     LOG(LS_ERROR) << "Can't find a decoder associated with payload type: "
                   << static_cast<int>(payload_type);
-    return NULL;
+    return nullptr;
   }
-  VCMGenericDecoder* ptr_decoder = NULL;
+  VCMGenericDecoder* ptr_decoder = nullptr;
   const VCMExtDecoderMapItem* external_dec_item =
       FindExternalDecoderItem(payload_type);
   if (external_dec_item) {
     // External codec.
     ptr_decoder = new VCMGenericDecoder(
         *external_dec_item->external_decoder_instance, true);
   } else {
     // Create decoder.
     ptr_decoder = CreateDecoder(decoder_item->settings->codecType);
   }
   if (!ptr_decoder)
-    return NULL;
+    return nullptr;
 
+  // Copy over input resolutions to prevent codec reinitialization due to
+  // the first frame being of a different resolution than the database values.
+  // This is best effort, since there's no guarantee that width/height have been
+  // parsed yet (and may be zero).
+  if (frame.EncodedImage()._encodedWidth > 0 &&
+      frame.EncodedImage()._encodedHeight > 0) {
+    decoder_item->settings->width = frame.EncodedImage()._encodedWidth;
+    decoder_item->settings->height = frame.EncodedImage()._encodedHeight;
+  }
   if (ptr_decoder->InitDecode(decoder_item->settings.get(),
                               decoder_item->number_of_cores) < 0) {
     ReleaseDecoder(ptr_decoder);
-    return NULL;
+    return nullptr;
   }
   memcpy(new_codec, decoder_item->settings.get(), sizeof(VideoCodec));
   return ptr_decoder;
 }
 
 void VCMCodecDataBase::DeleteEncoder() {
   if (!ptr_encoder_)
     return;
   ptr_encoder_->Release();
   ptr_encoder_.reset();
 }
 
 VCMGenericDecoder* VCMCodecDataBase::CreateDecoder(VideoCodecType type) const {
   switch (type) {
     case kVideoCodecVP8:
       return new VCMGenericDecoder(*(VP8Decoder::Create()));
     case kVideoCodecVP9:
       return new VCMGenericDecoder(*(VP9Decoder::Create()));
     case kVideoCodecI420:
       return new VCMGenericDecoder(*(new I420Decoder));
     case kVideoCodecH264:
       if (H264Decoder::IsSupported()) {
         return new VCMGenericDecoder(*(H264Decoder::Create()));
       }
       break;
     default:
       break;
   }
   LOG(LS_WARNING) << "No internal decoder of this type exists.";
-  return NULL;
+  return nullptr;
 }
 
 const VCMDecoderMapItem* VCMCodecDataBase::FindDecoderItem(
     uint8_t payload_type) const {
   DecoderMap::const_iterator it = dec_map_.find(payload_type);
   if (it != dec_map_.end()) {
     return (*it).second;
   }
-  return NULL;
+  return nullptr;
 }
 
 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem(
     uint8_t payload_type) const {
   ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type);
   if (it != dec_external_map_.end()) {
     return (*it).second;
   }
-  return NULL;
+  return nullptr;
 }
 }  // namespace webrtc