This commit adds basic support for video devices under OSX.
Device is opened based on currently active format, and pixel format is chosen
arbitrarily.
---
libavdevice/avfoundation_dec.m | 334 ++++++++++++++++++++++++++++++++++-------
1 file changed, 280 insertions(+), 54 deletions(-)
diff --git a/libavdevice/avfoundation_dec.m b/libavdevice/avfoundation_dec.m
index 0c1bfb5..b9ed6c1 100644
--- a/libavdevice/avfoundation_dec.m
+++ b/libavdevice/avfoundation_dec.m
@@ -1,6 +1,7 @@
/*
* AVFoundation input device
* Copyright (c) 2015 Luca Barbato
+ * Alexandre Lision
*
* This file is part of Libav.
*
@@ -20,18 +21,34 @@
*/
#import <AVFoundation/AVFoundation.h>
+#include <pthread.h>
#include "libavformat/avformat.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "libavformat/internal.h"
+#include "libavutil/time.h"
+#include "libavutil/mathematics.h"
#include "avdevice.h"
-
typedef struct AVFoundationCaptureContext {
- AVClass *class;
- int list_devices;
- CFTypeRef session;
+ AVClass *class;
+ int list_devices;
+
+ int video_stream_index;
+
+ int64_t first_pts;
+ int frames_captured;
+ pthread_mutex_t frame_lock;
+ pthread_cond_t frame_wait_cond;
+
+ CFTypeRef session; /** AVCaptureSession*/
+ CFTypeRef video_delegate; /** AVFFrameReceiver */
+ CFTypeRef video_output; /** AVCaptureVideoDataOutput */
+ CVImageBufferRef current_frame; /** CVImageBufferRef */
+
} AVFoundationCaptureContext;
#define AUDIO_DEVICES 1
@@ -79,10 +96,69 @@ static int
avfoundation_list_capture_devices(AVFormatContext *s)
return AVERROR_EXIT;
}
-NSString *pat = @"(\\[[^\\]]+\\])";
+static void lock_frames(AVFoundationCaptureContext* ctx)
+{
+ pthread_mutex_lock(&ctx->frame_lock);
+}
+
+static void unlock_frames(AVFoundationCaptureContext* ctx)
+{
+ pthread_mutex_unlock(&ctx->frame_lock);
+}
+
+/** FrameReceiver class - delegate for AVCaptureSession
+ */
+@interface AVFFrameReceiver : NSObject
<AVCaptureVideoDataOutputSampleBufferDelegate>
+{
+ AVFoundationCaptureContext* _context;
+}
+
+- (id)initWithContext:(AVFoundationCaptureContext*)context;
+
+- (void) captureOutput:(AVCaptureOutput *)captureOutput
+ didOutputSampleBuffer:(CMSampleBufferRef)videoFrame
+ fromConnection:(AVCaptureConnection *)connection;
+
+@end
+
+@implementation AVFFrameReceiver
+
+- (id)initWithContext:(AVFoundationCaptureContext*)context
+{
+ if (self = [super init]) {
+ _context = context;
+ }
+ return self;
+}
+
+- (void) captureOutput:(AVCaptureOutput *)captureOutput
+ didOutputSampleBuffer:(CMSampleBufferRef)videoFrame
+ fromConnection:(AVCaptureConnection *)connection
+{
+ lock_frames(_context);
+
+ if (_context->current_frame != nil) {
+ CFRelease(_context->current_frame);
+ }
+
+ _context->current_frame =
CFRetain(CMSampleBufferGetImageBuffer(videoFrame));
+
+ pthread_cond_signal(&_context->frame_wait_cond);
+
+ unlock_frames(_context);
+
+ ++_context->frames_captured;
+}
+
+@end
+
+// Remove '[]' from the device name
+NSString *pat = @"(?<=\\[).*?(?=\\])";
static int setup_stream(AVFormatContext *s, AVCaptureDevice *device)
{
+ NSLog(@"setting up stream for device %@ ID\n", [device uniqueID]);
+
AVFoundationCaptureContext *ctx = s->priv_data;
NSError *__autoreleasing error = nil;
AVCaptureDeviceInput *input;
@@ -96,33 +172,121 @@ static int setup_stream(AVFormatContext *s,
AVCaptureDevice *device)
return AVERROR_UNKNOWN;
}
- [session addInput:input];
+ if ([session canAddInput:input]) {
+ [session addInput:input];
+ } else {
+ av_log(s, AV_LOG_ERROR, "can't add video input to capture session\n");
+ return -1;
+ }
// add the output devices
if ([device hasMediaType:AVMediaTypeVideo]) {
- AVCaptureVideoDataOutput *out =
- [[AVCaptureVideoDataOutput alloc] init];
- out.videoSettings = nil;
- [session addOutput:out];
+ AVCaptureVideoDataOutput* out = [[AVCaptureVideoDataOutput alloc]
init];
+ if (!out) {
+ av_log(s, AV_LOG_ERROR, "Failed to init AV video output\n");
+ return -1;
+ }
+
+ [out setAlwaysDiscardsLateVideoFrames:YES];
+ out.videoSettings = @{(id)kCVPixelBufferPixelFormatTypeKey:
@(kCVPixelFormatType_32BGRA)};
+
+ //[out setVideoSettings:nil];
+
+ AVFFrameReceiver* delegate = [[AVFFrameReceiver alloc]
initWithContext:ctx];
- NSLog(@"%@ %@", device, out.videoSettings);
+ dispatch_queue_t queue = dispatch_queue_create("avf_queue", NULL);
+ [out setSampleBufferDelegate:delegate queue:queue];
+
+ ctx->video_delegate = (__bridge_retained CFTypeRef) delegate;
+
+ if ([session canAddOutput:out]) {
+ [session addOutput:out];
+ ctx->video_output = (__bridge_retained CFTypeRef) out;
+ } else {
+ av_log(s, AV_LOG_ERROR, "can't add video output to capture
session\n");
+ return -1;
+ }
+ NSLog(@"%@", device);
}
- if ([device hasMediaType:AVMediaTypeAudio]) {
- AVCaptureAudioDataOutput *out =
- [[AVCaptureAudioDataOutput alloc] init];
- out.audioSettings = nil;
- [session addOutput:out];
+ return 0;
+}
- NSLog(@"%@ %@", device, out.audioSettings);
+static int get_video_config(AVFormatContext *s)
+{
+ AVFoundationCaptureContext *ctx =
(AVFoundationCaptureContext*)s->priv_data;
+ CVImageBufferRef image_buffer;
+ CGSize image_buffer_size;
+ AVStream* stream = avformat_new_stream(s, NULL);
+
+ if (!stream) {
+ av_log(s, AV_LOG_ERROR, "Failed to create AVStream\n");
+ return -1;
}
+ // Take stream info from the first frame.
+ while (ctx->frames_captured < 1) {
+ CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, YES);
+ }
+
+ lock_frames(ctx);
+
+ ctx->video_stream_index = stream->index;
+
+ avpriv_set_pts_info(stream, 64, 1, 1000000);
+
+ image_buffer = ctx->current_frame;
+ image_buffer_size = CVImageBufferGetEncodedSize(image_buffer);
+
+ av_log(s, AV_LOG_ERROR, "Update stream info...\n");
+ stream->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
+ stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ stream->codec->width = (int)image_buffer_size.width;
+ stream->codec->height = (int)image_buffer_size.height;
+ // No support for pixel formats for now using default one
+ stream->codec->pix_fmt = AV_PIX_FMT_BGR32;
+
+ CFRelease(ctx->current_frame);
+ ctx->current_frame = nil;
+
+ unlock_frames(ctx);
+
return 0;
}
+static void destroy_context(AVFoundationCaptureContext* ctx)
+{
+ NSLog(@"Destroying context");
+
+ AVCaptureSession *session = (__bridge AVCaptureSession*)ctx->session;
+ [session stopRunning];
+
+ ctx->session = NULL;
+
+ pthread_mutex_destroy(&ctx->frame_lock);
+ pthread_cond_destroy(&ctx->frame_wait_cond);
+
+ if (ctx->current_frame) {
+ CFRelease(ctx->current_frame);
+ }
+}
+
+static int setup_default_stream(AVFormatContext *s)
+{
+ AVCaptureDevice *device;
+ for (NSString *type in @[AVMediaTypeVideo]) {
+ device = [AVCaptureDevice defaultDeviceWithMediaType:type];
+ if (device)
+ return setup_stream(s, device);
+ }
+
+ return -1;
+}
+
static int setup_streams(AVFormatContext *s)
{
+ NSLog(@"setting streams");
AVFoundationCaptureContext *ctx = s->priv_data;
int ret;
NSError *__autoreleasing error = nil;
@@ -131,62 +295,124 @@ static int setup_streams(AVFormatContext *s)
AVCaptureDevice *device;
NSRegularExpression *exp;
+ pthread_mutex_init(&ctx->frame_lock, NULL);
+ pthread_cond_init(&ctx->frame_wait_cond, NULL);
+
+ ctx->session = (__bridge_retained CFTypeRef)[[AVCaptureSession alloc]
init];
+
if (s->filename[0] != '[') {
- for (NSString *type in @[AVMediaTypeAudio, AVMediaTypeVideo]) {
- device = [AVCaptureDevice defaultDeviceWithMediaType:type];
- if (device)
- setup_stream(s, device);
+ ret = setup_default_stream(s);
+ } else {
+ exp = [NSRegularExpression regularExpressionWithPattern:pat
+ options:0
+ error:&error];
+ if (!exp) {
+ av_log(s, AV_LOG_ERROR, "%s\n",
+ [[error localizedDescription] UTF8String]);
+ return AVERROR(ENOMEM);
}
- return AVERROR_EXIT;
- }
- exp = [NSRegularExpression regularExpressionWithPattern:pat
- options:0
- error:&error];
- if (!exp) {
- av_log(s, AV_LOG_ERROR, "%s\n",
- [[error localizedDescription] UTF8String]);
- return AVERROR(ENOMEM);
+ filename = [NSString stringWithFormat:@"%s", s->filename];
+ av_log(s, AV_LOG_INFO, "device name: %s\n",[filename UTF8String]);
+
+ matches = [exp matchesInString:filename options:0
+ range:NSMakeRange(0, [filename length])];
+
+ if (matches.count > 0) {
+ for (NSTextCheckingResult *match in matches) {
+ NSRange range = [match rangeAtIndex:0];
+ NSString *uniqueID = [filename substringWithRange:range];
+ av_log(s, AV_LOG_INFO, "opening device with ID:
%s\n",[uniqueID UTF8String]);
+ if (!(device = [AVCaptureDevice deviceWithUniqueID:uniqueID]))
{
+ // report error
+ av_log(s, AV_LOG_ERROR, "Device with name %s not
found",[filename UTF8String]);
+ return AVERROR(EINVAL);
+ }
+ ret = setup_stream(s, device);
+ if (ret < 0) {
+ // avfoundation_close
+ return ret;
+ }
+ }
+ } else {
+ av_log(s, AV_LOG_ERROR, "No matches for %s",[filename UTF8String]);
+ ret = setup_default_stream(s);
+ }
}
- filename = [NSString stringWithFormat:@"%s", s->filename];
-
- matches = [exp matchesInString:filename options:0
- range:NSMakeRange(0, [filename length])];
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "No device could be added");
+ return ret;
+ }
- ctx->session = (__bridge_retained CFTypeRef)[[AVCaptureSession alloc]
init];
+ av_log(s, AV_LOG_INFO, "Starting session!\n");
+ [(__bridge AVCaptureSession*)ctx->session startRunning];
- if (matches) {
- for (NSTextCheckingResult *match in matches) {
- NSRange range = [match rangeAtIndex:1];
- NSString *uniqueID = [filename substringWithRange:range];
- if (!(device = [AVCaptureDevice deviceWithUniqueID:uniqueID])) {
- // report error
- return AVERROR(EINVAL);
- }
- ret = setup_stream(s, device);
- if (ret < 0) {
- // avfoundation_close
- return ret;
- }
- }
- } else {
- return AVERROR(EINVAL);
+ av_log(s, AV_LOG_INFO, "Checking video config\n");
+ if (get_video_config(s)) {
+ destroy_context(ctx);
+ return AVERROR(EIO);
}
- return AVERROR_EXIT; //
+ return 0;
}
static int avfoundation_read_header(AVFormatContext *s)
{
AVFoundationCaptureContext *ctx = s->priv_data;
+ ctx->first_pts = av_gettime();
if (ctx->list_devices)
return avfoundation_list_capture_devices(s);
return setup_streams(s);
}
+static int avfoundation_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ AVFoundationCaptureContext* ctx =
(AVFoundationCaptureContext*)s->priv_data;
+
+ do {
+ lock_frames(ctx);
+
+ if (ctx->current_frame != nil) {
+ if (av_new_packet(pkt,
(int)CVPixelBufferGetDataSize(ctx->current_frame)) < 0) {
+ return AVERROR(EIO);
+ }
+
+ pkt->pts = pkt->dts = av_rescale_q(av_gettime() - ctx->first_pts,
+ AV_TIME_BASE_Q,
+ (AVRational){1, 1000000});
+ pkt->stream_index = ctx->video_stream_index;
+ pkt->flags |= AV_PKT_FLAG_KEY;
+
+ CVPixelBufferLockBaseAddress(ctx->current_frame, 0);
+
+ void* data = CVPixelBufferGetBaseAddress(ctx->current_frame);
+ memcpy(pkt->data, data, pkt->size);
+
+ CVPixelBufferUnlockBaseAddress(ctx->current_frame, 0);
+ CFRelease(ctx->current_frame);
+ ctx->current_frame = nil;
+ } else {
+ pkt->data = NULL;
+ pthread_cond_wait(&ctx->frame_wait_cond, &ctx->frame_lock);
+ }
+
+ unlock_frames(ctx);
+ } while (!pkt->data);
+
+ return 0;
+}
+
+static int avfoundation_read_close(AVFormatContext *s)
+{
+ NSLog(@"Closing session...");
+ AVFoundationCaptureContext *ctx = s->priv_data;
+ destroy_context(ctx);
+ return 0;
+}
+
static const AVClass avfoundation_class = {
.class_name = "AVFoundation AVCaptureDevice indev",
.item_name = av_default_item_name,
@@ -199,8 +425,8 @@ AVInputFormat ff_avfoundation_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("AVFoundation AVCaptureDevice
grab"),
.priv_data_size = sizeof(AVFoundationCaptureContext),
.read_header = avfoundation_read_header,
-// .read_packet = avfoundation_read_packet,
-// .read_close = avfoundation_read_close,
+ .read_packet = avfoundation_read_packet,
+ .read_close = avfoundation_read_close,
.flags = AVFMT_NOFILE,
.priv_class = &avfoundation_class,
};
--
2.6.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
