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

Unified Diff: media/base/mac/video_frame_mac.cc

Issue 2529493002: mac: Remove more media/base/mac glue unneeded now that we target 10.9 (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
« no previous file with comments | « media/base/mac/corevideo_glue.h ('k') | media/base/mac/video_frame_mac_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mac/video_frame_mac.cc
diff --git a/media/base/mac/video_frame_mac.cc b/media/base/mac/video_frame_mac.cc
index e3af1f000de0732f32df1d8fc36919a997c2cbf6..2f06aabbbaac85c0c5d1b5d90ac77ae93c79f21b 100644
--- a/media/base/mac/video_frame_mac.cc
+++ b/media/base/mac/video_frame_mac.cc
@@ -9,7 +9,6 @@
#include <algorithm>
-#include "media/base/mac/corevideo_glue.h"
#include "media/base/video_frame.h"
namespace media {
@@ -51,7 +50,7 @@ WrapVideoFrameInCVPixelBuffer(const VideoFrame& frame) {
if (video_frame_format == PIXEL_FORMAT_I420) {
cv_format = kCVPixelFormatType_420YpCbCr8Planar;
} else if (video_frame_format == PIXEL_FORMAT_NV12) {
- cv_format = CoreVideoGlue::kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+ cv_format = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
} else {
DLOG(ERROR) << " unsupported frame format: " << video_frame_format;
return pixel_buffer;
@@ -77,10 +76,9 @@ WrapVideoFrameInCVPixelBuffer(const VideoFrame& frame) {
// CVPixelBufferCreateWithPlanarBytes needs a dummy plane descriptor or the
// release callback will not execute. The descriptor is freed in the callback.
- void* descriptor = calloc(
- 1,
- std::max(sizeof(CVPlanarPixelBufferInfo_YCbCrPlanar),
- sizeof(CoreVideoGlue::CVPlanarPixelBufferInfo_YCbCrBiPlanar)));
+ void* descriptor =
+ calloc(1, std::max(sizeof(CVPlanarPixelBufferInfo_YCbCrPlanar),
+ sizeof(CVPlanarPixelBufferInfo_YCbCrBiPlanar)));
// Wrap the frame's data in a CVPixelBuffer. Because this is a C API, we can't
// give it a smart pointer to the frame, so instead pass a raw pointer and
« no previous file with comments | « media/base/mac/corevideo_glue.h ('k') | media/base/mac/video_frame_mac_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698