[FFmpeg-devel] dshow patches

Michael Niedermayer michaelni at gmx.at
Fri Mar 28 00:38:22 CET 2014


On Thu, Mar 27, 2014 at 01:59:04PM -0600, Roger Pack wrote:
> On 3/25/14, Michael Niedermayer <michaelni at gmx.at> wrote:
> > On Tue, Mar 25, 2014 at 10:30:35AM -0600, Roger Pack wrote:
> >> And one more, adding a log message (and continue) if unable to set
> >> audio buffer on a pin.
> >>
> >> On 3/21/14, Michael Niedermayer <michaelni at gmx.at> wrote:
> >> > On Fri, Mar 21, 2014 at 06:01:35PM -0600, Roger Pack wrote:
> >> >> These are pretty trivial, but I think useful.
> >> >> The first causes it to *not* drop audio packets as frequently (which
> >> >> I've seen people complain about before).  The second is to have better
> >> >> default latency for mic's, as per msdn's suggested default.
> >> >> Thank you.
> >> >> -roger-
> >> >
> >> >>  dshow.c |   18 +++++++++---------
> >> >>  1 file changed, 9 insertions(+), 9 deletions(-)
> >> >> 62f3a9f206df4d98e9986c14ff0aade65f0919f6
> >> >> 0001-dshow-use-distinct-buffers-per-stream.-Basically-som.patch
> >> >> From e6ff24d390f085e5daee79e10a074c1ef0878636 Mon Sep 17 00:00:00 2001
> >> >> From: rogerdpack <rogerpack2005 at gmail.com>
> >> >> Date: Fri, 21 Mar 2014 16:27:01 -0600
> >> >> Subject: [PATCH 1/4] dshow: use distinct buffers per stream.
> >> >> Basically
> >> >>  sometimes if you start dropping video packets, you also
> >> >>  drop audio packets.  Now they each have separate
> >> >>  buffers to avoid this unexpected behavior.
> >> >
> >> > applied
> >> >
> >> > [...]
> >> >>
> >> >> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> >> >> index 51693be..5d600c1 100644
> >> >> --- a/libavdevice/dshow.c
> >> >> +++ b/libavdevice/dshow.c
> >> >> @@ -1073,7 +1073,7 @@ static const AVOption options[] = {
> >> >>      { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC,
> >> >> "list_options" },
> >> >>      { "video_device_number", "set video device number for devices
> >> >> with
> >> >> same name (starts at 0)", OFFSET(video_device_number),
> >> >> AV_OPT_TYPE_INT,
> >> >> {.i64 = 0}, 0, INT_MAX, DEC },
> >> >>      { "audio_device_number", "set audio device number for devices
> >> >> with
> >> >> same name (starts at 0)", OFFSET(audio_device_number),
> >> >> AV_OPT_TYPE_INT,
> >> >> {.i64 = 0}, 0, INT_MAX, DEC },
> >> >> -    { "audio_buffer_size", "set audio device buffer latency size in
> >> >> milliseconds (default is the device's default)",
> >> >> OFFSET(audio_buffer_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX,
> >> >> DEC
> >> >> },
> >> >> +    { "audio_buffer_size", "set audio device buffer latency size in
> >> >> milliseconds (default is 80ms)", OFFSET(audio_buffer_size),
> >> >> AV_OPT_TYPE_INT, {.i64 = 0}, 80, INT_MAX, DEC },
> >> >
> >> > this looks like it chnages the minimum and not the default
> >> >
> >> > [...]
> >> >
> >> > --
> >> > Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
> >> >
> >> > If you think the mosad wants you dead since a long time then you are
> >> > either
> >> > wrong or dead since a long time.
> >> >
> >
> >>  dshow.c |    5 +++--
> >>  1 file changed, 3 insertions(+), 2 deletions(-)
> >> bc13c214ac048c8fd25766d1560a47528b9f2227
> >> 0001-dshow-log-error-and-continue-if-unable-to-set-audio-.patch
> >> From e4d0d08b81fd50b775e4d08bb1d38ca776e638ba Mon Sep 17 00:00:00 2001
> >> From: rogerdpack <rogerpack2005 at gmail.com>
> >> Date: Tue, 25 Mar 2014 10:08:49 -0600
> >> Subject: [PATCH] dshow: log error and continue if unable to set audio
> >> buffer
> >>
> >> Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
> >> ---
> >>  libavdevice/dshow.c |    5 +++--
> >>  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > applied
> 
> Thanks.  And here's the next one, making the log output message better.
> Thanks!
> -roger-

>  dshow.c         |    8 ++++----
>  dshow_capture.h |    2 +-
>  dshow_pin.c     |    2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 19f7fe31317d67361cc83ea9cfbfdfd8422696f5  0001-dshow-show-device-name-when-outputting-buffer-overfl.patch
> From 3ea90e317f16887a8d9a854a09bbf557c371f407 Mon Sep 17 00:00:00 2001
> From: rogerdpack <rogerpack2005 at gmail.com>
> Date: Thu, 27 Mar 2014 13:44:20 -0600
> Subject: [PATCH] dshow: show device name when outputting buffer overflow log
>  message

applied

btw as you seem to do alot of work on dshow, maybe it would be
easier for you to push to some repo and ask me to pull that ?

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire
-------------- 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/20140328/e41fdca6/attachment.asc>


More information about the ffmpeg-devel mailing list