virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
104,953 Commits 37 Branches 400 Tags 464 MiB
35420ab7fd
Commit Graph

99 Commits

Author SHA1 Message Date
James Almer
b664df3ff4 avdevice/dshow: fix a unused variable warning 
Unused if DSHOWDEBUG is not set since commit
d9a9b4c877.

Signed-off-by: James Almer <jamrial@gmail.com>
 2021-11-13 11:38:01 -03:00
James Almer
47451d9267 avdevice/dshow: fix print format for some variables 
WAVEFORMATEX.nChannels and WAVEFORMATEX.wBitsPerSample are of type WORD, aka
unsigned short.

Signed-off-by: James Almer <jamrial@gmail.com>
 2021-11-13 11:38:01 -03:00
Brad Isbell
9d4989f2e1 avdevice/dshow: Fix missing PCM sample size option when it is used as the lone option for DirectShow audio capture 
Signed-off-by: Brad Isbell <brad@audiopump.co>
Reviewed-by: Roger Pack <rogerdpack2@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2021-11-05 22:58:43 +01:00
Brad Isbell
d9a9b4c877 avdevice/dshow: Use WAVEFORMATEX from AM_MEDIA_TYPE for describing device capabilities. (Fixes #9420) 
Signed-off-by: Brad Isbell <brad@audiopump.co>
Reviewed-by: Roger Pack <rogerdpack2@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2021-11-05 22:58:42 +01:00
Andreas Rheinhardt
d92f38c179 avdevice: Constify all devices 
This is possible now that the next-API is gone.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2021-04-27 11:48:05 -03:00
Andreas Rheinhardt
626535f6a1 avcodec/codec, allcodecs: Constify the AVCodec API 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2021-04-27 10:43:14 -03:00
James Almer
d422b2ed87 avcodec/packet_internal: make avpriv_packet_list_* functions use an internal struct 
The next pointer is kept at the end for backwards compatability until the
major bump, when it should ideally be moved at the front.

Signed-off-by: James Almer <jamrial@gmail.com>
 2021-03-17 14:12:17 -03:00
James Almer
911ba8417e avdevice/dshow: Add namespace prefix to the remaining global symbols 
Signed-off-by: James Almer <jamrial@gmail.com>
 2021-01-25 19:31:11 -03:00
Mark Thompson
c154aada45 lavd/dshow: Add namespace prefix to global functions 2021-01-21 20:02:23 -03:00
Oliver Collyer
bf96937a96 avdevice/dshow: Fixed some minor memory leaks 
Signed-off-by: James Almer <jamrial@gmail.com>
 2019-01-03 13:15:45 -03:00
Carl Eugen Hoyos
076558a9f4 Cosmetics: Reindent after last commit. 2018-09-19 18:14:40 +02:00
Carl Eugen Hoyos
1ba32a3c46 lavd/dshow: Interpret negative height as bottom-down frame. 
Fixes ticket #7436.
 2018-09-19 18:13:46 +02:00
Marton Balint
4bb0409820 avdevice: migrate to AVFormatContext->url 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2018-01-28 23:06:43 +01:00
rogerdpack
bfbffbd7d8 dshow: avoid duplicate NULL check before free 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-23 03:18:16 +02:00
rogerdpack
9e907c040d dshow: don't add two instances of same device to graphs 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-23 03:18:16 +02:00
Michael Niedermayer
e7f658be57 avdevice/dshow: Fix frame rate 
Fixes: Ticket5526

Tested-by: kgp700

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-07 02:32:13 +02:00
Derek Buitenhuis
6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 20:59:55 +01:00
FearThe1337
c33ffc7b21 libavdevice/dshow.c: Correct CoGetMalloc check 
Current if statement would always be false due to assigning the value of
S_OK which equals 0.

Signed-off-by: FearThe1337 <git@fearthe1337.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-13 22:57:26 +01:00
Hendrik Leppkes
c2f861ca42 Replace remaining occurances of av_free_packet with av_packet_unref 2015-10-27 14:35:30 +01:00
Clément Bœsch
a68d6cf5b4 avdevice/dshow: use AV_OPT_TYPE_BOOL 2015-09-08 22:39:21 +02:00
Michael Niedermayer
29d147c94d Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/4xm.c
	libavcodec/aac_adtstoasc_bsf.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.h
	libavcodec/asvenc.c
	libavcodec/avcodec.h
	libavcodec/avpacket.c
	libavcodec/dvdec.c
	libavcodec/ffv1enc.c
	libavcodec/g2meet.c
	libavcodec/gif.c
	libavcodec/h264.c
	libavcodec/h264_mp4toannexb_bsf.c
	libavcodec/huffyuvdec.c
	libavcodec/huffyuvenc.c
	libavcodec/jpeglsenc.c
	libavcodec/libxvid.c
	libavcodec/mdec.c
	libavcodec/motionpixels.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/noise_bsf.c
	libavcodec/nuv.c
	libavcodec/nvenc.c
	libavcodec/options.c
	libavcodec/parser.c
	libavcodec/pngenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/qsvdec.c
	libavcodec/svq1enc.c
	libavcodec/tiffenc.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/utvideoenc.c
	libavcodec/vc1dec.c
	libavcodec/wmalosslessdec.c
	libavformat/adxdec.c
	libavformat/aiffdec.c
	libavformat/apc.c
	libavformat/apetag.c
	libavformat/avidec.c
	libavformat/bink.c
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/id3v2.c
	libavformat/isom.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mpc.c
	libavformat/mpc8.c
	libavformat/mpegts.c
	libavformat/mvi.c
	libavformat/mxfdec.c
	libavformat/mxg.c
	libavformat/nutdec.c
	libavformat/oggdec.c
	libavformat/oggparsecelt.c
	libavformat/oggparseflac.c
	libavformat/oggparseopus.c
	libavformat/oggparsespeex.c
	libavformat/omadec.c
	libavformat/rawdec.c
	libavformat/riffdec.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_qdm2.c
	libavformat/rtpdec_svq3.c
	libavformat/sierravmd.c
	libavformat/smacker.c
	libavformat/smush.c
	libavformat/spdifenc.c
	libavformat/takdec.c
	libavformat/tta.c
	libavformat/utils.c
	libavformat/vqf.c
	libavformat/westwood_vqa.c
	libavformat/xmv.c
	libavformat/xwma.c
	libavformat/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 23:15:19 +02:00
Mate Sebok
4d98015dcf dshow: add capture device save and load 
Signed-off-by: Mate Sebok <smfinc.org@gmail.com>
Reviewed-by: Roger Pack <rogerdpack2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-22 20:12:36 +02:00
rogerdpack
61974c7dcc dshow: tweak logging 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 02:04:30 -07:00
rogerdpack
7c2e262701 dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 01:29:58 -07:00
rogerdpack
c55fa2f09b dshow: add properties dialog for tv tuners 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 00:28:26 -07:00
rogerdpack
a35da0920d dshow: some devices only list themselves under "Video sources" but 
actually have both video and audio output pins, so make the audio pins
accessible by video source name.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:54:48 -07:00
rogerdpack
5d72cf0f64 dshow: add options for allowing filter popup configuration dialogs to be presented to the user 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:49:37 -07:00
rogerdpack
ec81ad21c1 dshow: introduce support for crossbar [multiple input selectable] devices 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:35:16 -07:00
rogerdpack
8eb5b5ec6f dshow: use non deprecated api 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:07:24 -07:00
rogerdpack
e620eee88c dshow: miscellaneous tweaks 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 06:01:32 -07:00
rogerdpack
d01234419b dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 05:38:14 -07:00
Michael Niedermayer
9c3a8693a2 avdevice/dshow: Remove unneeded NULL checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 18:17:12 +01:00
Michael Niedermayer
a3f6e8c4d9 avdevice/dshow: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-28 18:16:37 +01:00
Michael Niedermayer
60420fa3dc avdevice/dshow: fix build, ensure that feature enable #defines are set before includes 
dshow_capture.h sets up various flags before including windows headers
this must occur before other headers (like os_support.h) include these
headers without the setup

This could be fixed differently but for now this fixes building on mingw

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-25 04:02:48 +01:00
James Almer
1fd880cef3 lavd/dshow: use av_codec_get_id() 
ff_codec_get_id() is a lavf internal function

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 13:03:17 +02:00
James Almer
0ab00a75e4 avcodec/raw: add avpriv_get_raw_pix_fmt_tags() 
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 12:52:38 +02:00
rogerdpack
773eb74bab dshow: show device name when outputting buffer overflow log message 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 00:22:55 +01:00
rogerdpack
10056bc964 dshow: log error and continue if unable to set audio buffer 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 17:32:39 +01:00
rogerdpack
6abc56e892 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.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 03:46:10 +01:00
Don Moir
24e2a82f75 Make 32bit RGB dshow input opaque. 2014-03-08 13:46:05 +01:00
Carl Eugen Hoyos
6208bb965d Set codec_tag in dshow device, needed to distinguish between YUV and YVU. 
Fixes ticket #3447.
 2014-03-08 13:42:47 +01:00
Lukasz Marek
f607767d93 lavd: add categories to device implementations 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-03 23:34:46 +01:00
Stefano Sabatini
3b8c7da7a3 lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value 
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.

INT_MAX is used here to denote the max allowed value for a pixel format.

The opt-test code is changed to provide a valid reference example.
 2013-12-26 11:35:27 +01:00
Michael Niedermayer
8862ed7340 avdevice/dshow: make constant arrays static 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 22:24:11 +02:00
Clément Bœsch
d4982b115d lavd/dshow: fix style and typo recently introduced. 2013-03-19 21:26:24 +01:00
rogerdpack
12c71f648c dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway. 
Also cleanup exported symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-15 00:08:12 +01:00
rogerdpack
c916389bd2 dshow: allow for more codec ID's 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-01-16 00:23:53 -07:00
rogerdpack
3b9166fc7e dshow: better error reporting 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-01-16 00:18:40 -07:00
rogerdpack
6d33026668 dshow: fix log message 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-01-16 00:11:15 -07:00
rogerdpack
47e88486b4 hdyc col 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-01-15 18:37:30 -07:00