Title: [187898] trunk/Source/WebCore
- Revision
- 187898
- Author
- mdai...@apple.com
- Date
- 2015-08-04 15:45:04 -0700 (Tue, 04 Aug 2015)
Log Message
Added buffer to AVMediaCaptureSource
https://bugs.webkit.org/show_bug.cgi?id=147454
<rdar://problem/22079502>
Reviewed by Jer Noble.
* platform/mediastream/mac/AVMediaCaptureSource.h:
(WebCore::AVMediaCaptureSource::buffer):
(WebCore::AVMediaCaptureSource::setBuffer):
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::captureOutputDidOutputSampleBufferFromConnection):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187897 => 187898)
--- trunk/Source/WebCore/ChangeLog 2015-08-04 22:40:23 UTC (rev 187897)
+++ trunk/Source/WebCore/ChangeLog 2015-08-04 22:45:04 UTC (rev 187898)
@@ -1,5 +1,19 @@
2015-08-04 Matthew Daiter <mdai...@apple.com>
+ Added buffer to AVMediaCaptureSource
+ https://bugs.webkit.org/show_bug.cgi?id=147454
+ <rdar://problem/22079502>
+
+ Reviewed by Jer Noble.
+
+ * platform/mediastream/mac/AVMediaCaptureSource.h:
+ (WebCore::AVMediaCaptureSource::buffer):
+ (WebCore::AVMediaCaptureSource::setBuffer):
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::captureOutputDidOutputSampleBufferFromConnection):
+
+2015-08-04 Matthew Daiter <mdai...@apple.com>
+
Needless assignment of usingDot
https://bugs.webkit.org/show_bug.cgi?id=147514
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h (187897 => 187898)
--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2015-08-04 22:40:23 UTC (rev 187897)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2015-08-04 22:45:04 UTC (rev 187898)
@@ -67,9 +67,12 @@
AVCaptureDevice *device() const { return m_device.get(); }
RealtimeMediaSourceStates* currentStates() { return &m_currentStates; }
MediaConstraints* constraints() { return m_constraints.get(); }
+ CMSampleBufferRef buffer() const { return m_buffer.get(); }
void setVideoSampleBufferDelegate(AVCaptureVideoDataOutput*);
void setAudioSampleBufferDelegate(AVCaptureAudioDataOutput*);
+
+ void setBuffer(CMSampleBufferRef buffer) { m_buffer = buffer; }
private:
void setupSession();
@@ -79,6 +82,7 @@
RealtimeMediaSourceStates m_currentStates;
RetainPtr<AVCaptureSession> m_session;
RetainPtr<AVCaptureDevice> m_device;
+ RetainPtr<CMSampleBufferRef> m_buffer;
bool m_isRunning;
};
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (187897 => 187898)
--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-08-04 22:40:23 UTC (rev 187897)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-08-04 22:45:04 UTC (rev 187898)
@@ -254,6 +254,8 @@
CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions(formatDescription);
m_width = dimensions.width;
m_height = dimensions.height;
+
+ setBuffer(sampleBuffer);
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
