iOS HW H264 support.

webrtc/modules/video_coding/main/source/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.
  */
 
 #include "webrtc/modules/video_coding/main/source/codec_database.h"
 
 #include <assert.h>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/engine_configurations.h"
+#ifdef VIDEOCODEC_H264
+#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
+#endif
 #ifdef VIDEOCODEC_I420
 #include "webrtc/modules/video_coding/codecs/i420/main/interface/i420.h"
 #endif
 #ifdef VIDEOCODEC_VP8
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #endif
 #ifdef VIDEOCODEC_VP9
 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
 #endif
 #include "webrtc/modules/video_coding/main/source/internal_defines.h"
@@ skipping 627 matching lines @@
 #ifdef VIDEOCODEC_VP9
     case kVideoCodecVP9:
       return new VCMGenericEncoder(VP9Encoder::Create(), encoder_rate_observer_,
                                    false);
 #endif
 #ifdef VIDEOCODEC_I420
     case kVideoCodecI420:
       return new VCMGenericEncoder(new I420Encoder(), encoder_rate_observer_,
                                    false);
 #endif
+#ifdef VIDEOCODEC_H264
+    case kVideoCodecH264:
+      if (IsH264CodecSupported()) {

[pbos-webrtc, 2015/06/25 20:20:14]

H264Encoder::IsSupported()

[tkchin_webrtc, 2015/06/25 21:37:49]

Done.

+        return new VCMGenericEncoder(H264Encoder::Create(),
+                                     encoder_rate_observer_,
+                                     false);
+      }
+      break;
+#endif
     default:
-      LOG(LS_WARNING) << "No internal encoder of this type exists.";
-      return NULL;
+      break;
   }
+  LOG(LS_WARNING) << "No internal encoder of this type exists.";
+  return NULL;
 }
 
 void VCMCodecDataBase::DeleteEncoder() {
   if (ptr_encoder_) {
     ptr_encoder_->Release();
     if (!current_enc_is_external_)
       delete ptr_encoder_->encoder_;
     delete ptr_encoder_;
     ptr_encoder_ = NULL;
   }
 }
 
 VCMGenericDecoder* VCMCodecDataBase::CreateDecoder(VideoCodecType type) const {
   switch (type) {
 #ifdef VIDEOCODEC_VP8
     case kVideoCodecVP8:
       return new VCMGenericDecoder(*(VP8Decoder::Create()));
 #endif
 #ifdef VIDEOCODEC_VP9
     case kVideoCodecVP9:
       return new VCMGenericDecoder(*(VP9Decoder::Create()));
 #endif
 #ifdef VIDEOCODEC_I420
     case kVideoCodecI420:
       return new VCMGenericDecoder(*(new I420Decoder));
 #endif
+#ifdef VIDEOCODEC_H264
+    case kVideoCodecH264:
+      if (IsH264CodecSupported()) {

[pbos-webrtc, 2015/06/25 20:20:14]

H264Decoder::IsSupported()

[tkchin_webrtc, 2015/06/25 21:37:49]

Done.

+        return new VCMGenericDecoder(*(H264Decoder::Create()));
+      }
+      break;
+#endif
     default:
-      LOG(LS_WARNING) << "No internal decoder of this type exists.";
-      return NULL;
+      break;
   }
+  LOG(LS_WARNING) << "No internal decoder of this type exists.";
+  return NULL;
 }
 
 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;
 }
 
 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;
 }
 }  // namespace webrtc