From: Michael Niedermayer Date: Sat, 6 Sep 2014 18:20:44 +0000 (+0200) Subject: Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce' X-Git-Tag: android-x86-6.0-r1~3211 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f9bc65e399d1883da21ae03d07b09348a11a5f49;p=android-x86%2Fexternal-ffmpeg.git Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce' * commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce': avplay: Exit by default at the end of playback Conflicts: Changelog ffplay.c Changes to ffplay not merged as they would break -autoexit as a way to override -noautoexit, the change of the default will be implemented in the next commit Merged-by: Michael Niedermayer --- f9bc65e399d1883da21ae03d07b09348a11a5f49 diff --cc Changelog index c5185f7eec,bbbe9dc248..1ec2d8c41a --- a/Changelog +++ b/Changelog @@@ -2,302 -2,152 +2,303 @@@ Entries are sorted chronologically fro releases are sorted from youngest to oldest. version : -- aliases and defaults for Ogg subtypes (opus, spx) +- Icecast protocol +- ported lenscorrection filter from frei0r filter +- large optimizations in dctdnoiz to make it usable +- request Icecast metadata by default +- support for using metadata in stream specifiers in fftools +- LZMA compression support in TIFF decoder +- support for H.261 RTP payload format (RFC 4587) - HEVC/H.265 RTP payload format (draft v6) depacketizer -- avplay now exits by default at the end of playback +- added codecview filter to visualize information exported by some codecs +- Matroska 3D support thorugh side data +- HTML generation using texi2html is deprecated in favor of makeinfo/texi2any +- silenceremove filter ++- ffplay now exits by default at the end of playback -version 11: -- libx265 encoder +version 2.3: +- AC3 fixed-point decoding - shuffleplanes filter +- subfile protocol +- Phantom Cine demuxer - replaygain data export +- VP7 video decoder - Alias PIX image encoder and decoder -- BRender PIX image decoder -- Amazing Studio PAF playback support -- XBM decoder -- BMP standalone parser -- OpenEXR image decoder -- support encoding and decoding 4-channel SGI images +- Improvements to the BRender PIX image decoder +- Improvements to the XBM decoder +- QTKit input device +- improvements to OpenEXR image decoder - support decoding 16-bit RLE SGI images -- VP7 video decoder -- LucasArts SMUSH SANM video decoder -- LucasArts SMUSH VIMA audio decoder (ADPCM) -- LucasArts SMUSH demuxer -- MP2 encoding via TwoLAME -- asettb filter -- Silicon Graphics RLE 8-bit video decoder -- Silicon Graphics Motion Video Compressor 1 & 2 decoder -- Silicon Graphics Movie demuxer +- GDI screen grabbing for Windows +- alternative rendition support for HTTP Live Streaming +- AVFoundation input device +- Direct Stream Digital (DSD) decoder +- Magic Lantern Video (MLV) demuxer - On2 AVC (Audio for Video) decoder -- support for decoding through DXVA2 in avconv +- support for decoding through DXVA2 in ffmpeg - libbs2b-based stereo-to-binaural audio filter +- libx264 reference frames count limiting depending on level - native Opus decoder - display matrix export and rotation API -- drop avserver, it was unmaintained for years and largely broken -- Icecast protocol -- request Icecast metadata by default -- support for using metadata in stream specifiers in avtools -- Matroska 3D support +- WebVTT encoder +- showcqt multimedia filter +- zoompan filter +- signalstats filter +- hqx filter (hq2x, hq3x, hq4x) +- flanger filter +- Image format auto-detection +- LRC demuxer and muxer +- Samba protocol (via libsmbclient) +- WebM DASH Manifest muxer +- libfribidi support in drawtext -version 10: -- av_strnstr -- support ID3v2 tags in ASF files +version 2.2: + +- HNM version 4 demuxer and video decoder +- Live HDS muxer +- setsar/setdar filters now support variables in ratio expressions +- elbg filter +- string validation in ffprobe +- support for decoding through VDPAU in ffmpeg (the -hwaccel option) +- complete Voxware MetaSound decoder +- remove mp3_header_compress bitstream filter +- Windows resource files for shared libraries +- aeval filter +- stereoscopic 3d metadata handling +- WebP encoding via libwebp +- ATRAC3+ decoder +- VP8 in Ogg demuxing +- side & metadata support in NUT +- framepack filter +- XYZ12 rawvideo support in NUT +- Exif metadata support in WebP decoder +- OpenGL device +- Use metadata_header_padding to control padding in ID3 tags (currently used in + MP3, AIFF, and OMA files), FLAC header, and the AVI "junk" block. +- Mirillis FIC video decoder +- Support DNx444 +- libx265 encoder +- dejudder filter +- Autodetect VDA like all other hardware accelerations +- aliases and defaults for Ogg subtypes (opus, spx) + + +version 2.1: + +- aecho filter +- perspective filter ported from libmpcodecs +- ffprobe -show_programs option +- compand filter +- RTMP seek support +- when transcoding with ffmpeg (i.e. not streamcopying), -ss is now accurate + even when used as an input option. Previous behavior can be restored with + the -noaccurate_seek option. +- ffmpeg -t option can now be used for inputs, to limit the duration of + data read from an input file +- incomplete Voxware MetaSound decoder +- read EXIF metadata from JPEG +- DVB teletext decoder +- phase filter ported from libmpcodecs +- w3fdif filter +- Opus support in Matroska +- FFV1 version 1.3 is stable and no longer experimental +- FFV1: YUVA(444,422,420) 9, 10 and 16 bit support +- changed DTS stream id in lavf mpeg ps muxer from 0x8a to 0x88, to be + more consistent with other muxers. +- adelay filter +- pullup filter ported from libmpcodecs +- ffprobe -read_intervals option +- Lossless and alpha support for WebP decoder +- Error Resilient AAC syntax (ER AAC LC) decoding +- Low Delay AAC (ER AAC LD) decoding +- mux chapters in ASF files +- SFTP protocol (via libssh) +- libx264: add ability to encode in YUVJ422P and YUVJ444P +- Fraps: use BT.709 colorspace by default for yuv, as reference fraps decoder does +- make decoding alpha optional for prores, ffv1 and vp6 by setting + the skip_alpha flag. +- ladspa wrapper filter +- native VP9 decoder +- dpx parser +- max_error_rate parameter in ffmpeg +- PulseAudio output device +- ReplayGain scanner +- Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support) +- Linux framebuffer output device +- HEVC decoder +- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing +- mergeplanes filter + + +version 2.0: + +- curves filter - reference-counting for AVFrame and AVPacket data -- avconv now fails when input options are used for output file +- ffmpeg now fails when input options are used for output file or vice versa -- avconv options -filter_script and -filter_complex_script, which allow a +- support for Monkey's Audio versions from 3.93 +- perms and aperms filters +- audio filtering support in ffplay +- 10% faster aac encoding on x86 and MIPS +- sine audio filter source +- WebP demuxing and decoding support +- ffmpeg options -filter_script and -filter_complex_script, which allow a filtergraph description to be read from a file +- OpenCL support +- audio phaser filter +- separatefields filter +- libquvi demuxer - uniform options syntax across all filters +- telecine filter - interlace filter -- JPEG 2000 decoder -- asetpts filter (same as setpts, but for audio) +- smptehdbars source +- inverse telecine filters (fieldmatch and decimate) +- colorbalance filter +- colorchannelmixer filter +- The matroska demuxer can now output proper verbatim ASS packets. It will + become the default at the next libavformat major bump. +- decent native animated GIF encoding +- asetrate filter +- interleave filter +- timeline editing with filters +- vidstabdetect and vidstabtransform filters for video stabilization using + the vid.stab library +- astats filter - trim and atrim filters -- avconv -t and -ss (output-only) options are now sample-accurate when +- ffmpeg -t and -ss (output-only) options are now sample-accurate when transcoding audio - Matroska muxer can now put the index at the beginning of the file. -- avconv -deinterlace option removed, the yadif filter should be used instead +- extractplanes filter +- avectorscope filter +- ADPCM DTK decoder +- ADP demuxer +- RSD demuxer +- RedSpark demuxer +- ADPCM IMA Radical decoder +- zmq filters +- DCT denoiser filter (dctdnoiz) +- Wavelet denoiser filter ported from libmpcodecs as owdenoise (formerly "ow") - Apple Intermediate Codec decoder - Escape 130 video decoder +- FTP protocol support +- V4L2 output device +- 3D LUT filter (lut3d) +- SMPTE 302M audio encoder - support for slice multithreading in libavfilter +- Hald CLUT support (generation and filtering) - VC-1 interlaced B-frame support - support for WavPack muxing (raw and in Matroska) +- XVideo output device +- vignette filter +- True Audio (TTA) encoder - Go2Webinar decoder +- mcdeint filter ported from libmpcodecs +- sab filter ported from libmpcodecs +- ffprobe -show_chapters option - WavPack encoding through libwavpack -- Added the -n parameter to avconv -- RTMP seek support -- when transcoding with avconv (i.e. not streamcopying), -ss is now accurate - even when used as an input option. Previous behavior can be restored with - the -noaccurate_seek option. -- avconv -t option can now be used for inputs, to limit the duration of - data read from an input file -- Voxware MetaSound decoder -- WebP decoder -- Error Resilient AAC syntax (ER AAC LC) decoding -- Low Delay AAC (ER AAC LD) decoding -- mux chapters in ASF files -- Opus in Ogg demuxing -- Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support) -- F4V muxer -- HNM version 4 demuxer and video decoder -- HEVC decoder -- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing -- remove avplay -vismv option, which has not worked for a long time -- Live HDS muxer -- setsar/setdar filters now support variables in ratio expressions -- dar variable in the scale filter now returns the actual DAR (i.e. a * sar) -- VP9 decoder -- support for decoding through VDPAU in avconv (the -hwaccel option) -- remove mp3_header_(de)compress bitstream filters -- stereoscopic 3d metadata handling -- png standalone parser -- WebP encoding via libwebp -- ATRAC3+ decoder -- framepack filter -- Mirillis FIC video decoder -- Support DNx444 -- compand audio filter +- rotate filter +- spp filter ported from libmpcodecs +- libgme support +- psnr filter -version 9: -- av_basename and av_dirname -- adobe and limelight publisher authentication in RTMP +version 1.2: + - VDPAU hardware acceleration through normal hwaccel - SRTP support +- Error diffusion dither in Swscale +- Chained Ogg support +- Theora Midstream reconfiguration support +- EVRC decoder +- audio fade filter +- filtering audio with unknown channel layout +- allpass, bass, bandpass, bandreject, biquad, equalizer, highpass, lowpass + and treble audio filter +- improved showspectrum filter, with multichannel support and sox-like colors +- histogram filter +- tee muxer +- il filter ported from libmpcodecs +- support ID3v2 tags in ASF files +- encrypted TTA stream decoding support +- RF64 support in WAV muxer +- noise filter ported from libmpcodecs +- Subtitles character encoding conversion +- blend filter +- stereo3d filter ported from libmpcodecs -version 9_beta3: -- ashowinfo audio filter +version 1.1: + +- stream disposition information printing in ffprobe +- filter for loudness analysis following EBU R128 +- Opus encoder using libopus +- ffprobe -select_streams option +- Pinnacle TARGA CineWave YUV16 decoder +- TAK demuxer, decoder and parser +- DTS-HD demuxer +- remove -same_quant, it hasn't worked for years +- FFM2 support +- X-Face image encoder and decoder - 24-bit FLAC encoding -- audio volume filter -- deprecated the avconv -vol option. the volume filter is to be used instead. - multi-channel ALAC encoding up to 7.1 -- TAK demuxer, parser, and decoder -- adaptive frame-level multithreading for H.264 - - -version 9_beta2: - metadata (INFO tag) support in WAV muxer +- subtitles raw text decoder - support for building DLLs using MSVC -- remove avserver daemon mode +- LVF demuxer +- ffescape tool +- metadata (info chunk) support in CAF muxer +- field filter ported from libmpcodecs +- AVR demuxer +- geq filter ported from libmpcodecs +- remove ffserver daemon mode +- AST muxer/demuxer +- new expansion syntax for drawtext +- BRender PIX image decoder +- ffprobe -show_entries option +- ffprobe -sections option +- ADPCM IMA Dialogic decoder +- BRSTM demuxer +- animated GIF decoder and demuxer +- PVF demuxer +- subtitles filter +- IRCAM muxer/demuxer +- Paris Audio File demuxer +- Virtual concatenation demuxer +- VobSub demuxer +- JSON captions for TED talks decoding support +- SOX Resampler support in libswresample +- aselect filter +- SGI RLE 8-bit / Silicon Graphics RLE 8-bit video decoder +- Silicon Graphics Motion Video Compressor 1 & 2 decoder +- Silicon Graphics Movie demuxer +- apad filter +- Resolution & pixel format change support with multithreading for H.264 +- documentation split into per-component manuals +- pp (postproc) filter ported from MPlayer +- NIST Sphere demuxer +- MPL2, VPlayer, MPlayer, AQTitle, PJS and SubViewer v1 subtitles demuxers and decoders +- Sony Wave64 muxer +- adobe and limelight publisher authentication in RTMP +- data: URI scheme - support building on the Plan 9 operating system -- ffv1: support version 1.3 +- kerndeint filter ported from MPlayer +- histeq filter ported from VirtualDub +- Megalux Frame demuxer +- 012v decoder +- Improved AVC Intra decoding support -version 9_beta1: +version 1.0: -- XWD encoder and decoder -- Support for fragmentation in the mov/mp4 muxer -- ISMV (Smooth Streaming) muxer -- CDXL demuxer and decoder -- Apple ProRes encoder -- Sun Rasterfile Encoder -- remove libpostproc -- ID3v2 attached pictures reading and writing -- WMA Lossless decoder -- XBM encoder -- RealAudio Lossless decoder -- ZeroCodec decoder -- drop support for avconv without libavfilter -- add libavresample audio conversion library -- audio filters support in libavfilter and avconv -- add fps filter -- audio split filter -- audio mix filter -- avprobe output is now standard INI or JSON. The old format can still - be used with -of old. +- INI and flat output in ffprobe +- Scene detection in libavfilter - Indeo Audio decoder - channelsplit audio filter +- setnsamples audio filter +- atempo filter +- ffprobe -show_data option - RTMPT protocol support - iLBC encoding/decoding via libilbc - Microsoft Screen 1 decoder diff --cc doc/ffplay.texi index 203085c16d,0000000000..4ce6ab3538 mode 100644,000000..100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@@ -1,293 -1,0 +1,293 @@@ +\input texinfo @c -*- texinfo -*- + +@settitle ffplay Documentation +@titlepage +@center @titlefont{ffplay Documentation} +@end titlepage + +@top + +@contents + +@chapter Synopsis + +ffplay [@var{options}] [@file{input_file}] + +@chapter Description +@c man begin DESCRIPTION + +FFplay is a very simple and portable media player using the FFmpeg +libraries and the SDL library. It is mostly used as a testbed for the +various FFmpeg APIs. +@c man end + +@chapter Options +@c man begin OPTIONS + +@include fftools-common-opts.texi + +@section Main options + +@table @option +@item -x @var{width} +Force displayed width. +@item -y @var{height} +Force displayed height. +@item -s @var{size} +Set frame size (WxH or abbreviation), needed for videos which do +not contain a header with the frame size like raw YUV. This option +has been deprecated in favor of private options, try -video_size. +@item -an +Disable audio. +@item -vn +Disable video. +@item -ss @var{pos} +Seek to a given position in seconds. +@item -t @var{duration} +play seconds of audio/video +@item -bytes +Seek by bytes. +@item -nodisp +Disable graphical display. +@item -f @var{fmt} +Force format. +@item -window_title @var{title} +Set window title (default is the input filename). +@item -loop @var{number} +Loops movie playback times. 0 means forever. +@item -showmode @var{mode} +Set the show mode to use. +Available values for @var{mode} are: +@table @samp +@item 0, video +show video +@item 1, waves +show audio waves +@item 2, rdft +show audio frequency band using RDFT ((Inverse) Real Discrete Fourier Transform) +@end table + +Default value is "video", if video is not present or cannot be played +"rdft" is automatically selected. + +You can interactively cycle through the available show modes by +pressing the key @key{w}. + +@item -vf @var{filtergraph} +Create the filtergraph specified by @var{filtergraph} and use it to +filter the video stream. + +@var{filtergraph} is a description of the filtergraph to apply to +the stream, and must have a single video input and a single video +output. In the filtergraph, the input is associated to the label +@code{in}, and the output to the label @code{out}. See the +ffmpeg-filters manual for more information about the filtergraph +syntax. + +You can specify this parameter multiple times and cycle through the specified +filtergraphs along with the show modes by pressing the key @key{w}. + +@item -af @var{filtergraph} +@var{filtergraph} is a description of the filtergraph to apply to +the input audio. +Use the option "-filters" to show all the available filters (including +sources and sinks). + +@item -i @var{input_file} +Read @var{input_file}. +@end table + +@section Advanced options +@table @option +@item -pix_fmt @var{format} +Set pixel format. +This option has been deprecated in favor of private options, try -pixel_format. + +@item -stats +Print several playback statistics, in particular show the stream +duration, the codec parameters, the current position in the stream and +the audio/video synchronisation drift. It is on by default, to +explicitly disable it you need to specify @code{-nostats}. + +@item -bug +Work around bugs. +@item -fast +Non-spec-compliant optimizations. +@item -genpts +Generate pts. +@item -rtp_tcp +Force RTP/TCP protocol usage instead of RTP/UDP. It is only meaningful +if you are streaming with the RTSP protocol. +@item -sync @var{type} +Set the master clock to audio (@code{type=audio}), video +(@code{type=video}) or external (@code{type=ext}). Default is audio. The +master clock is used to control audio-video synchronization. Most media +players use audio as master clock, but in some cases (streaming or high +quality broadcast) it is necessary to change that. This option is mainly +used for debugging purposes. +@item -threads @var{count} +Set the thread count. +@item -ast @var{audio_stream_number} +Select the desired audio stream number, counting from 0. The number +refers to the list of all the input audio streams. If it is greater +than the number of audio streams minus one, then the last one is +selected, if it is negative the audio playback is disabled. +@item -vst @var{video_stream_number} +Select the desired video stream number, counting from 0. The number +refers to the list of all the input video streams. If it is greater +than the number of video streams minus one, then the last one is +selected, if it is negative the video playback is disabled. +@item -sst @var{subtitle_stream_number} +Select the desired subtitle stream number, counting from 0. The number +refers to the list of all the input subtitle streams. If it is greater +than the number of subtitle streams minus one, then the last one is +selected, if it is negative the subtitle rendering is disabled. - @item -autoexit - Exit when video is done playing. ++@item -noautoexit ++Do not exit after playback is finished. +@item -exitonkeydown +Exit if any key is pressed. +@item -exitonmousedown +Exit if any mouse button is pressed. + +@item -codec:@var{media_specifier} @var{codec_name} +Force a specific decoder implementation for the stream identified by +@var{media_specifier}, which can assume the values @code{a} (audio), +@code{v} (video), and @code{s} subtitle. + +@item -acodec @var{codec_name} +Force a specific audio decoder. + +@item -vcodec @var{codec_name} +Force a specific video decoder. + +@item -scodec @var{codec_name} +Force a specific subtitle decoder. + +@item -autorotate +Automatically rotate the video according to presentation metadata. Set by +default, use -noautorotate to disable. +@end table + +@section While playing + +@table @key +@item q, ESC +Quit. + +@item f +Toggle full screen. + +@item p, SPC +Pause. + +@item a +Cycle audio channel in the current program. + +@item v +Cycle video channel. + +@item t +Cycle subtitle channel in the current program. + +@item c +Cycle program. + +@item w +Cycle video filters or show modes. + +@item s +Step to the next frame. + +Pause if the stream is not already paused, step to the next video +frame, and pause. + +@item left/right +Seek backward/forward 10 seconds. + +@item down/up +Seek backward/forward 1 minute. + +@item page down/page up +Seek to the previous/next chapter. +or if there are no chapters +Seek backward/forward 10 minutes. + +@item mouse click +Seek to percentage in file corresponding to fraction of width. + +@end table + +@c man end + +@include config.texi +@ifset config-all +@set config-readonly +@ifset config-avutil +@include utils.texi +@end ifset +@ifset config-avcodec +@include codecs.texi +@include bitstream_filters.texi +@end ifset +@ifset config-avformat +@include formats.texi +@include protocols.texi +@end ifset +@ifset config-avdevice +@include devices.texi +@end ifset +@ifset config-swresample +@include resampler.texi +@end ifset +@ifset config-swscale +@include scaler.texi +@end ifset +@ifset config-avfilter +@include filters.texi +@end ifset +@end ifset + +@chapter See Also + +@ifhtml +@ifset config-all +@url{ffplay.html,ffplay}, +@end ifset +@ifset config-not-all +@url{ffplay-all.html,ffmpeg-all}, +@end ifset +@url{ffmpeg.html,ffmpeg}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver}, +@url{ffmpeg-utils.html,ffmpeg-utils}, +@url{ffmpeg-scaler.html,ffmpeg-scaler}, +@url{ffmpeg-resampler.html,ffmpeg-resampler}, +@url{ffmpeg-codecs.html,ffmpeg-codecs}, +@url{ffmpeg-bitstream-filters.html,ffmpeg-bitstream-filters}, +@url{ffmpeg-formats.html,ffmpeg-formats}, +@url{ffmpeg-devices.html,ffmpeg-devices}, +@url{ffmpeg-protocols.html,ffmpeg-protocols}, +@url{ffmpeg-filters.html,ffmpeg-filters} +@end ifhtml + +@ifnothtml +@ifset config-all +ffplay(1), +@end ifset +@ifset config-not-all +ffplay-all(1), +@end ifset +ffmpeg(1), ffprobe(1), ffserver(1), +ffmpeg-utils(1), ffmpeg-scaler(1), ffmpeg-resampler(1), +ffmpeg-codecs(1), ffmpeg-bitstream-filters(1), ffmpeg-formats(1), +ffmpeg-devices(1), ffmpeg-protocols(1), ffmpeg-filters(1) +@end ifnothtml + +@include authors.texi + +@ignore + +@setfilename ffplay +@settitle FFplay media player + +@end ignore + +@bye