[FFmpeg-devel] [PATCH] More DirectShow patches
Stefano Sabatini
stefasab at gmail.com
Fri Sep 7 09:46:19 CEST 2012
On date Thursday 2012-09-06 20:53:32 -0300, Ramiro Polla encoded:
> On Thu, Sep 6, 2012 at 8:52 PM, Ramiro Polla <ramiro.polla at gmail.com> wrote:
[...]
> From 6bd1c8a8a649bb9f49bd2c9e41f7e35df624f0f5 Mon Sep 17 00:00:00 2001
> From: Ramiro Polla <ramiro.polla at gmail.com>
> Date: Thu, 6 Sep 2012 20:41:19 -0300
> Subject: [PATCH 1/2] dshow: support video codec and pixel format selection
>
> ---
> doc/indevs.texi | 3 +++
> libavdevice/dshow.c | 38 +++++++++++++++++++++++++++++++++++++-
> 2 files changed, 40 insertions(+), 1 deletions(-)
>
> diff --git a/doc/indevs.texi b/doc/indevs.texi
> index 264dc58..82bb0f2 100644
> --- a/doc/indevs.texi
> +++ b/doc/indevs.texi
> @@ -112,6 +112,9 @@ defaults to 0).
> Set audio device number for devices with same name (starts at 0,
> defaults to 0).
>
> + at item pixel_format
> +Select pixel format to be used by DirectShow.
> +
> @item audio_buffer_size
> Set audio device buffer size in milliseconds (which can directly
> impact latency, depending on the device).
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> index 43af028..301d55e 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -20,6 +20,7 @@
> */
>
> #include "libavutil/parseutils.h"
> +#include "libavutil/pixdesc.h"
> #include "libavutil/opt.h"
> #include "libavformat/internal.h"
> #include "avdevice.h"
> @@ -52,6 +53,8 @@ struct dshow_ctx {
>
> IMediaControl *control;
>
> + enum PixelFormat pixel_format;
> + enum AVCodecID video_codec_id;
> char *video_size;
> char *framerate;
>
> @@ -371,6 +374,18 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> goto next;
> }
> if (!pformat_set) {
> + enum PixelFormat pix_fmt = dshow_pixfmt(bih->biCompression, bih->biBitCount);
> + if (pix_fmt == PIX_FMT_NONE) {
> + enum AVCodecID codec_id = dshow_codecid(bih->biCompression);
> + AVCodec *codec = avcodec_find_decoder(codec_id);
> + if (codec_id == AV_CODEC_ID_NONE || !codec) {
> + av_log(avctx, AV_LOG_INFO, " unknown compression type");
> + } else {
> + av_log(avctx, AV_LOG_INFO, " vcodec=%s", codec->name);
> + }
> + } else {
> + av_log(avctx, AV_LOG_INFO, " pixel_format=%s", av_get_pix_fmt_name(pix_fmt));
> + }
> av_log(avctx, AV_LOG_INFO, " min s=%ldx%ld fps=%g max s=%ldx%ld fps=%g\n",
> vcaps->MinOutputSize.cx, vcaps->MinOutputSize.cy,
> 1e7 / vcaps->MaxFrameInterval,
> @@ -378,6 +393,14 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> 1e7 / vcaps->MinFrameInterval);
> continue;
> }
> + if (ctx->video_codec_id != AV_CODEC_ID_RAWVIDEO) {
> + if (ctx->video_codec_id != dshow_codecid(bih->biCompression))
> + goto next;
> + }
> + if (ctx->pixel_format != PIX_FMT_NONE &&
> + ctx->pixel_format != dshow_pixfmt(bih->biCompression, bih->biBitCount)) {
> + goto next;
> + }
> if (ctx->framerate) {
> int64_t framerate = ((int64_t) ctx->requested_framerate.den*10000000)
> / ctx->requested_framerate.num;
> @@ -511,7 +534,9 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
> const GUID *mediatype[2] = { &MEDIATYPE_Video, &MEDIATYPE_Audio };
> const char *devtypename = (devtype == VideoDevice) ? "video" : "audio";
>
> - int set_format = (devtype == VideoDevice && (ctx->video_size || ctx->framerate))
> + int set_format = (devtype == VideoDevice && (ctx->video_size || ctx->framerate ||
> + ctx->pixel_format != PIX_FMT_NONE ||
> + ctx->video_codec_id != AV_CODEC_ID_RAWVIDEO))
> || (devtype == AudioDevice && (ctx->channels || ctx->sample_rate));
> int format_set = 0;
>
> @@ -851,6 +876,16 @@ static int dshow_read_header(AVFormatContext *avctx)
> goto error;
> }
>
> + ctx->video_codec_id = avctx->video_codec_id ? avctx->video_codec_id
> + : AV_CODEC_ID_RAWVIDEO;
> + if (ctx->pixel_format != PIX_FMT_NONE) {
> + if (ctx->video_codec_id != AV_CODEC_ID_RAWVIDEO) {
> + av_log(avctx, AV_LOG_ERROR, "Pixel format may only be set when "
> + "video codec is not set or set to rawvideo.\n");
Nit+: inconsistent trailing dot
> + ret = AVERROR(EINVAL);
> + goto error;
> + }
> + }
> if (ctx->video_size) {
> r = av_parse_video_size(&ctx->requested_width, &ctx->requested_height, ctx->video_size);
> if (r < 0) {
> @@ -990,6 +1025,7 @@ static int dshow_read_packet(AVFormatContext *s, AVPacket *pkt)
> #define DEC AV_OPT_FLAG_DECODING_PARAM
> static const AVOption options[] = {
> { "video_size", "set video size given a string such as 640x480 or hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
> + { "pixel_format", "set video pixel format", OFFSET(pixel_format), AV_OPT_TYPE_PIXEL_FMT, {0}, 0, 0, DEC },
Nit++: {.str = NULL} for internal consistency
> { "framerate", "set video frame rate", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
> { "sample_rate", "set audio sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
> { "sample_size", "set audio sample size", OFFSET(sample_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 16, DEC },
> --
> 1.7.4.1
Looks good otherwise, I'll apply it soon with the nits addressed.
> From 53299bfc8a20f02d61717346861a632a5f61100e Mon Sep 17 00:00:00 2001
> From: Ramiro Polla <ramiro.polla at gmail.com>
> Date: Thu, 6 Sep 2012 20:50:06 -0300
> Subject: [PATCH 2/2] dshow: use AV_OPT_TYPE_IMAGE_SIZE
>
> ---
> libavdevice/dshow.c | 15 ++++-----------
> 1 files changed, 4 insertions(+), 11 deletions(-)
[...]
Looks good.
--
FFmpeg = Fast & Fantastic Moronic Pitiful Ecumenical Game
More information about the ffmpeg-devel
mailing list