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

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc

Issue 2483273002: Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (Closed)
Patch Set: Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
diff --git a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
similarity index 97%
rename from webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc
rename to webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
index 31c8baf167206404264192621c4721aae64c1472..18820d3ded799a5a5c3d57d9025f83b95b1342b8 100644
--- a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc
+++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
@@ -9,7 +9,9 @@
*
*/
-#include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h"
+#include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h"
+
+#if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
#include <memory>
@@ -20,7 +22,7 @@
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/common_video/include/corevideo_frame_buffer.h"
-#include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.h"
+#include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.h"
#include "webrtc/video_frame.h"
namespace internal {
@@ -275,3 +277,5 @@ const char* H264VideoToolboxDecoder::ImplementationName() const {
}
} // namespace webrtc
+
+#endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)

Powered by Google App Engine
This is Rietveld 408576698