[FFmpeg-devel] [PATCH 2/5] lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.

[Michael Niedermayer]

On Sun, Apr 20, 2014 at 12:59:44PM +0200, Thilo Borgmann wrote:
> 

>  avfoundation.m |  162 +++++++++++++++++++++++++++++++--------------------------
>  1 file changed, 89 insertions(+), 73 deletions(-)
> 6278d8a54271f4db9db58d67907f2b14c98497cb  0002-lavd-avfoundation-Split-adding-a-device-and-getting-.patch
> From ee86e85969fbbf71fce76f12c4f0615dd51f458e Mon Sep 17 00:00:00 2001
> From: Thilo Borgmann <thilo.borgmann at mail.de>
> Date: Sun, 20 Apr 2014 11:39:22 +0200
> Subject: [PATCH 2/5] lavd/avfoundation: Split adding a device and getting the
>  device configuration into separate functions.
> 
> ---
>  libavdevice/avfoundation.m | 162 +++++++++++++++++++++++++--------------------
>  1 file changed, 89 insertions(+), 73 deletions(-)
> 
> diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m
> index 2ac1b3c..cc3a07c 100644
> --- a/libavdevice/avfoundation.m
> +++ b/libavdevice/avfoundation.m
> @@ -137,6 +137,93 @@ static void destroy_context(AVFContext* ctx)
>      }
>  }
>  
> +static int add_video_device(AVFormatContext *s, AVCaptureDevice *video_device)
> +{
> +    AVFContext *ctx = (AVFContext*)s->priv_data;
> +    NSError *error  = nil;
> +    AVCaptureDeviceInput* capture_dev_input = [[[AVCaptureDeviceInput alloc] initWithDevice:video_device error:&error] autorelease];
> +
> +    if (!capture_dev_input) {
> +        av_log(s, AV_LOG_ERROR, "Failed to create AV capture input device: %s\n",
> +               [[error localizedDescription] UTF8String]);
> +        return 1;
> +    }
> +
> +    if ([ctx->capture_session canAddInput:capture_dev_input]) {
> +        [ctx->capture_session addInput:capture_dev_input];
> +    } else {
> +        av_log(s, AV_LOG_ERROR, "can't add video input to capture session\n");
> +        return 1;
> +    }
> +
> +    // Attaching output
> +    // FIXME: Allow for a user defined pixel format
> +    ctx->video_output = [[AVCaptureVideoDataOutput alloc] init];
> +
> +    if (!ctx->video_output) {
> +        av_log(s, AV_LOG_ERROR, "Failed to init AV video output\n");
> +        return 1;
> +    }
> +
> +    NSNumber     *pixel_format = [NSNumber numberWithUnsignedInt:kCVPixelFormatType_24RGB];
> +    NSDictionary *capture_dict = [NSDictionary dictionaryWithObject:pixel_format
> +                                               forKey:(id)kCVPixelBufferPixelFormatTypeKey];
> +
> +    [ctx->video_output setVideoSettings:capture_dict];
> +    [ctx->video_output setAlwaysDiscardsLateVideoFrames:YES];
> +
> +    ctx->avf_delegate = [[AVFFrameReceiver alloc] initWithContext:ctx];
> +
> +    dispatch_queue_t queue = dispatch_queue_create("avf_queue", NULL);
> +    [ctx->video_output setSampleBufferDelegate:ctx->avf_delegate queue:queue];
> +    dispatch_release(queue);
> +
> +    if ([ctx->capture_session canAddOutput:ctx->video_output]) {
> +        [ctx->capture_session addOutput:ctx->video_output];
> +    } else {
> +        av_log(s, AV_LOG_ERROR, "adding video output to capture session failed\n");
> +        return 1;
> +    }
> +
> +    return 0;
> +}
> +
> +static int get_video_config(AVFormatContext *s)
> +{
> +    AVFContext *ctx = (AVFContext*)s->priv_data;
> +
> +    // Take stream info from the first frame.
> +    while (ctx->frames_captured < 1) {
> +        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, YES);
> +    }
> +
> +    lock_frames(ctx);
> +
> +    AVStream* stream = avformat_new_stream(s, NULL);
> +
> +    if (!stream) {
> +        return 1;
> +    }
> +

> +    avpriv_set_pts_info(stream, 64, 1, avf_time_base);

i would suggest to use the same timebase as av_gettime() is using
also, i would suggest to use that timebase too for audio

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The greatest way to live with honor in this world is to be what we pretend
to be. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140423/9f8685b0/attachment.asc>