summaryrefslogtreecommitdiff
path: root/libavdevice/dshow.c
Commit message (Collapse)AuthorAge
* dshow: call CoUninitialize() on dshow_read_close()Ramiro Polla2012-12-17
| | | | | | Every call to CoInitialize should have a matching CoUnititalize. Based on patch by Don Moir <donmoir@comcast.net>.
* dshow: handle events in graphRamiro Polla2012-12-17
| | | | | | | | Handling DirectShow events prevents infinite loops when there is an error in the graph, such as a device being disconnected. This makes it possible for dshow to return an error to the caller and run the cleanup code. Based on patch by Don Moir <donmoir@comcast.net>.
* lavd/dshow: rename dshow class namerogerdpack2012-12-15
| | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: fix return code when opening deviceRamiro Polla2012-12-08
| | | | | | | | | Successfully opening a device altered the ret variable, making the function not cleanup properly and return an incorrect value for errors that happened afterwards. Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavu/opt: allow to set sample and pixel format with av_opt_set_int()Stefano Sabatini2012-12-01
| | | | | | | | | | | This change requires the user to specify min and max value, and makes possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if forbidden. Add required ifdeffery in case of mixed libraries, when libavutil is updated but not the other libraries. This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.
* lavu/opt: change the way default pixel and sample format value is setStefano Sabatini2012-11-30
| | | | | | | | | | | | | | | | | Use the i64 field rather than the string value. Using a string to set a default sample/pixel format is weird, also the new interface is more consistent with the rest of the API. This is technically an API break, but hopefully there are no applications using this feature outside of FFmpeg. In order to save backward compatibility with mixed libraries in case libavutil is updated but not the other libraries, some ifdeffery hacks are added. Note that the version check is only performed when class->version != 0, since if it is not defined then we assume that no version was defined and the class is not affected by the change. We will luckily get rid of the hack at the next major bump.
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: enhance error messagerogerdpack2012-09-29
| | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/dshow: use AV_OPT_TYPE_IMAGE_SIZERamiro Polla2012-09-07
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavd/dshow: support video codec and pixel format selectionRamiro Polla2012-09-07
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-05
| | | | | | | | | | | | | | | | | | | | * commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: allow user to specify audio buffer sizeRamiro Polla2012-08-29
| | | | | | | Based on patch by rogerdpack <rogerpack2005@gmail.com> Tested-by: Roger Pack <rogerdpack2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow:protect access to curbufsize to promote consistencyrogerdpack2012-08-20
| | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: avoid integer overflow when using curbufsizerogerdpack2012-08-20
| | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: protect access to curbufsizerogerdpack2012-08-19
| | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: cleanup referencerogerdpack2012-08-19
| | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rename missed CodecID to AVCodecIDMichael Niedermayer2012-08-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: rename dshow.h to avoid conflict with system header of equal nameKyle2012-05-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: use DirectShow information to set time_baseRamiro Polla2012-02-03
| | | | | | Fixes build after removal of AVFormatParameters. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: fix AVInputFormat declaration after ABI breakageRamiro Polla2012-02-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().Clément Bœsch2011-12-03
|
* dshow: support BI_BITFIELDS compression typeRamiro Polla2011-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: don't print min/max values for fps the wrong way aroundRamiro Polla2011-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: save opened device reference so it may be properly closedRamiro Polla2011-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: release filter reference obtained from enumerationRamiro Polla2011-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: indentRamiro Polla2011-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: support choosing between devices with same nameRamiro Polla2011-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Replace remaining av_new_stream() with avformat_new_stream().Clément Bœsch2011-11-05
|
* AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.Clément Bœsch2011-10-17
|
* dshow: remove filters from graph before releasing themRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: reset list for each filter removedRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: invert condition to avoid leaking objectsRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: indentRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: add option to list audio/video optionsRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: add audio/video optionsRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: initialize variable to prevent releasing random dataRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: factorise cycling through pinsRamiro Polla2011-09-16
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* dshow: indentRamiro Polla2011-09-12
| | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* dshow: add option to list devicesRamiro Polla2011-09-12
| | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* dshow: factorise cycling through devicesRamiro Polla2011-09-12
| | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* dshow: properly disconnect and remove filters from graphRamiro Polla2011-09-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dshow: remove some unused codeRamiro Polla2011-09-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.hStefano Sabatini2011-05-27
|
* DirectShow capture: Fix buildRamiro Polla2011-05-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* DirectShow capture supportRamiro Polla2011-05-21
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>