summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c389a804943095ebf078daec6b64690d2c97069c': libxvid: Add SSIM displaying through a libxvidcore plugin Conflicts: libavcodec/libxvid.c libavcodec/version.h See: 3b3c1ed0768af874c624cc555fbbd1fcea370200 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: Add SSIM displaying through a libxvidcore pluginTimothy Gu2014-04-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1': libxvid: add working lumimasking and variance AQ Conflicts: libavcodec/libxvid.c libavcodec/version.h See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: add working lumimasking and variance AQTimothy Gu2014-04-06
| | | | | | | | | | | | | | The old implementation is unusable due to changes in the Xvid API. Further fixes by Michael Niedermayer <michaelni@gmx.at>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | * commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332': aarch64: implement videodsp.prefetch Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: implement videodsp.prefetchJanne Grunau2014-04-06
| | | | | | | | 8% faster h264 decoding on Apple A7.
* | Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | * commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14': aarch64: add armv8 CPU flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: add armv8 CPU flagJanne Grunau2014-04-06
| |
* | lavc/cpia: use avpriv_report_missing_feature()Stephan Hilb2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/cpia: fix typo in log messageStephan Hilb2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-06
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Set Matroska private data when muxing Prores. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Set Matroska private data when muxing Prores.Carl Eugen Hoyos2014-04-06
| | | | | | | | | | | | The specification requires the mov code point to be written as "fourcc".
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-06
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: add tests for SANM and VIMA Conflicts: tests/fate/video.mak tests/ref/fate/sanm See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | fate: add tests for SANM and VIMAPaul B Mahol2014-04-06
| | | | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'Michael Niedermayer2014-04-06
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123': LucasArts SMUSH demuxer Conflicts: Changelog doc/general.texi libavformat/smush.c libavformat/version.h See: bef8fd7099edfac9c487e6eb75d7e6116ad80465 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * LucasArts SMUSH demuxerPaul B Mahol2014-04-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'Michael Niedermayer2014-04-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f273093e54cba130f3ffde3d6433e74baa4ad89': LucasArts SMUSH VIMA audio decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavcodec/vima.c This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition to the previously used name "vima" These changes are needed for compatibility with the renamed codec in libav See: b18357326ca1522d7fb7f4276ddebfccc29ce72c and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * LucasArts SMUSH VIMA audio decoderPaul B Mahol2014-04-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'Michael Niedermayer2014-04-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2': LucasArts SMUSH SANM video decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/sanm.c libavcodec/version.h See: 69254f46286099588514454f60fad12f6e51b2cd and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * LucasArts SMUSH SANM video decoderPaul B Mahol2014-04-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | rtspdec: check for strchr returning NULL.Reimar Döffinger2014-04-06
| | | | | | | | | | | | Fixes CID 732244. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | pulseaudio: move NULL check up before dereference.Reimar Döffinger2014-04-06
| | | | | | | | | | | | Fixes CID 1197068. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | dcadsp: fix SSE code to not use SSE2 instructions.Hendrik Leppkes2014-04-06
| | | | | | | | | | | | | | movq from SSE register to memory is an SSE2 instruction. Instead, use SSE movlps, which does the same thing. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec/ogg_read_packet(): factorize failure code pathMichael Niedermayer2014-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: check for av_packet_new_side_data() failureMichael Niedermayer2014-04-06
| | | | | | | | | | Fixes CID1197062 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp8: fix checking vp7_feature_value_sizeMichael Niedermayer2014-04-06
| | | | | | | | | | | | Fixes CID1197061 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: support for seeking on event playlistsVladlen Y. Koshelev2014-04-06
| | | | | | | | | | This allows clients to seek between first played segment and the last one in the live stream playlist with #EXT-X-PLAYLIST-TYPE:EVENT attribute.
* | avformat/hls: flush the subdemuxer when seekingAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | Since we are basically seeking the AVIOContext under the subdemuxer, we need to flush the subdemuxer to avoid old packets from being read from the packet queue after the seek. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: properly take stream_index into account when seekingAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly take stream_index into account so that a keyframe will be looked for in the specified stream_index only. Similarly, only check timestamp validity against the specified stream_index. Also remove code for stream_index == -1 case which does not actually happen as it is handled by generic code. This is based on an initial patch by James Deng. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: open playlists immediately when AVDISCARD_ALL is droppedAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to delay opening newly required playlists until a segment switch. Applications expect that newly selected undiscarded streams are available immediately, especially with alternative rendition streams (selectable audio/subtitle tracks). One might think that delaying variant stream switch until a segment switch would allow a "seamless" switch without us having to download a specific segment from two different variant playlists. However, that is not the case, since the application would have to keep the previous stream available (undiscarded) until the first packet of the newly selected stream arrives, but by that time the demuxer would have already downloaded the next segment of both variants. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: factor identical playlist allocations out of parse_playlistAnssi Hannula2014-04-06
| | | | | | | | Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: do not use sequence numbers for packet orderingAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per spec 3.4.3 ("A client MUST NOT assume that segments with the same sequence number in different Media Playlists contain matching content.") we cannot use sequence numbers for packet ordering. This can be seen e.g. in the subtitle streams of bipbop_16x9_variant.m3u8 that have considerably longer segments and therefore different numbering. Since the code now exclusively syncs using timestamps that may wrap, add some additional checking for that. According to the HLS spec all the timestamps should be in 33-bit MPEG format and synced together. v2: cleaner wrap detection v3: further wrap detection improvements Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: do not care about stream start timestampsAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While selecting a packet to return to caller in read_packet(), the code corrects the timestamps for starting timestamps. However, this is wrong, since for live streams the initial timestamps might differ just because of the time delay between the retrieval of the various Media Playlists. Fortunately, spec 6.2.4 mandates that all variant streams must have matching timestamps, so we do not need to correct for initial timestamps. Drop the correction code. Note that ID3 timestamps were previously ignored, so this code was previously actually needed. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: avoid unnecessary segment retrievalsAnssi Hannula2014-04-06
| | | | | | | | | | | | | | Check if the playlist is still needed just before requesting the next segment instead of after exhausting the previous segment. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: improve segment selection when restarting list receptionAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve selection of the segment sequence number when restarting the reception of a playlist after it was suspended due to being unneeded (due to discard flags). The current code assumes that each playlist contains matching data with the same sequence number, while spec 3.4.3 specifically says that that is not the case. Often subtitle playlists also have longer target durations as well, causing the selection to be completely wrong. Instead prefer using the playlist segment duration information for non-live playlists, and other means if that is not possible. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: track seeking on a per-playlist basisAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | Seeking needs to be tracked on a per-playlist basis, since the resyncing code in hls_read_packet() has to sync each playlist to the seek timestamp instead of stopping after the first playlist has reached it. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: parse ID3 timestamps for elementary audio streamsAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | HLS provides MPEG TS timestamps via ID3 tags in the beginning of each segment of elementary audio streams. v2: fix issues with streams that have multiple ID3 tags Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: split read_from_url() out of read_data()Anssi Hannula2014-04-06
| | | | | | | | | | | | Useful for ID3 parsing. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: add some logging messagesAnssi Hannula2014-04-06
| | | | | | | | Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: add support for byte-ranged segmentsAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | Add support for EXT-X-BYTERANGE added in HLS protocol v4. v2: Better comment explaining ffurl_seek call and fix cur_seg_offset not being updated. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: always return EOF for unneeded playlist streamsAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | Even if we returned AVERROR_EOF previously due to playlist no longer being needed, we may still be called again, and we do not want to trigger a segment download in that case. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avformat/hls: add support for alternative renditionsAnssi Hannula2014-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HLS protocol version 4 added alternative renditions to the specification (e.g. alternative audio tracks). The EXT-X-MEDIA tags can also contain metadata for "renditions" (i.e. tracks) of the main Media Playlist. Add support for those. Note that the same rendition (AVStream) may be associated with multiple variants (AVPrograms). Alternative subtitle tracks will require additional work and are therefore not enabled yet. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | configure: Add workaround for qtkit detection using ICC compiler.Thilo Borgmann2014-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/msrle: check return code for success before useMichael Niedermayer2014-04-06
| | | | | | | | | | | | | | | | | | The check is possibly redundant, but better to check for errors that dont occur than to skip the check and crash Fixes CID1197060 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: fix missing unlock on errorMichael Niedermayer2014-04-06
| | | | | | | | | | Fixes CID1197057 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Consider aspect ratio when writing tiff dpi.Carl Eugen Hoyos2014-04-06
| | | | | | | | TIFFTAG_YRESOLUTION gets now adjusted to sample_aspect_ratio.
* | avformat/oggparsevorbis: remove non functional null checkMichael Niedermayer2014-04-06
| | | | | | | | | | | | Fixes CID1197055 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | examples/avio_reading: fix null dereference on errorMichael Niedermayer2014-04-06
| | | | | | | | | | Fixed CID1197052 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cinedec: ask for sample when biBitCount isnt supportedMichael Niedermayer2014-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cinedec: remove redundant zero terminationMichael Niedermayer2014-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 13:26:49 +0000