Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: talk/app/webrtc/objc/h264encoderfactory.cc

Issue 1187573004: iOS HW H264 support. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Unit tests Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/dtlsidentityservice.h" 28 #include "talk/app/webrtc/objc/h264encoderfactory.h"
29 29
30 #include "talk/app/webrtc/dtlsidentitystore.h" 30 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
31 #include "webrtc/base/logging.h" 31
32 static size_t const kMaxVideoSize = 1280;
33 static size_t const kMaxFps = 30;
32 34
33 namespace webrtc { 35 namespace webrtc {
34 36
35 bool DtlsIdentityService::RequestIdentity( 37 H264EncoderFactory::H264EncoderFactory() {
36 const std::string& identity_name, 38 // Check that encoder can be created.
37 const std::string& common_name, 39 // TODO(tkchin): Find better way to check that encoder is supported. e.g.
pbos-webrtc 2015/06/23 19:13:56 Yes, please do that now. bool H264Encoder::IsSuppo
tkchin_webrtc 2015/06/24 23:21:14 Done.
38 webrtc::DTLSIdentityRequestObserver* observer) { 40 // is iOS8 sufficient.
39 if (identity_name != DtlsIdentityStore::kIdentityName || 41 rtc::scoped_ptr<H264Encoder> encoder(H264Encoder::Create());
40 common_name != DtlsIdentityStore::kIdentityName) { 42 if (encoder) {
41 LOG(LS_WARNING) << "DtlsIdentityService::RequestIdentity called with " 43 webrtc::VideoCodec rtc_codec = {};
42 << "unsupported params, identity_name=" << identity_name 44 rtc_codec.codecType = webrtc::kVideoCodecH264;
43 << ", common_name=" << common_name; 45 rtc_codec.width = 640;
44 return false; 46 rtc_codec.height = 480;
47 rtc_codec.targetBitrate = 100;
48 bool h264_supported =
49 encoder->InitEncode(&rtc_codec, 0, 0) == WEBRTC_VIDEO_CODEC_OK;
50 if (h264_supported) {
51 h264_codec_or_empty_vector_.push_back(VideoCodec(
52 kVideoCodecH264, "H264", kMaxVideoSize, kMaxVideoSize, kMaxFps));
53 }
45 } 54 }
46 store_->RequestIdentity(observer); 55 }
47 return true; 56
57 VideoEncoder* H264EncoderFactory::CreateVideoEncoder(VideoCodecType type) {
58 for (const VideoCodec& codec : h264_codec_or_empty_vector_) {
59 if (codec.type == type) {
60 return H264Encoder::Create();
61 }
62 }
63 return nullptr;
64 }
65
66 const std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec>&
67 H264EncoderFactory::codecs() const {
68 return h264_codec_or_empty_vector_;
69 }
70
71 void H264EncoderFactory::DestroyVideoEncoder(VideoEncoder* encoder) {
72 delete encoder;
48 } 73 }
49 74
50 } // namespace webrtc 75 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698